mirror of
https://github.com/MariaDB/server.git
synced 2025-01-23 23:34:34 +01:00
08b94f415b
added set_exec_stdout and set_exec_stderr to mysqlmanager to be able to redirect stdout and stderr added support for MY_FULL_IO to my_read, so we can tell it to read a number of bytes in as many chunks as it takes instead of one try BitKeeper/etc/ignore: Added client/mysqlmanager-pwgen to the ignore list client/Makefile.am: mysqlmanager-pwgen client/mysqlmanagerc.c: clean-up include/my_sys.h: added MY_FULL_IO mysql-test/mysql-test-run.sh: started on changes to use mysqlmanager mysys/my_read.c: added support for MY_FULL_IO tools/managertest1.nc: updated test case tools/mysqlmanager.c: added set_exec_stdout and set_exec_stderr
76 lines
2.4 KiB
C
76 lines
2.4 KiB
C
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
|
|
|
This library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2 of the License, or (at your option) any later version.
|
|
|
|
This library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with this library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
|
|
MA 02111-1307, USA */
|
|
|
|
#include "mysys_priv.h"
|
|
#include "mysys_err.h"
|
|
#include <errno.h>
|
|
|
|
|
|
/* Read a chunk of bytes from a file */
|
|
|
|
uint my_read(File Filedes, byte *Buffer, uint Count, myf MyFlags)
|
|
/* File descriptor */
|
|
/* Buffer must be at least count bytes */
|
|
/* Max number of bytes returnd */
|
|
/* Flags on what to do on error */
|
|
{
|
|
uint readbytes,save_count;
|
|
DBUG_ENTER("my_read");
|
|
DBUG_PRINT("my",("Fd: %d Buffer: %lx Count: %u MyFlags: %d",
|
|
Filedes, Buffer, Count, MyFlags));
|
|
save_count=Count;
|
|
|
|
for (;;)
|
|
{
|
|
errno=0; /* Linux doesn't reset this */
|
|
if ((readbytes = (uint) read(Filedes, Buffer, Count)) != Count)
|
|
{
|
|
my_errno=errno ? errno : -1;
|
|
DBUG_PRINT("warning",("Read only %ld bytes off %ld from %d, errno: %d",
|
|
readbytes,Count,Filedes,my_errno));
|
|
#ifdef THREAD
|
|
if (readbytes == 0 && errno == EINTR)
|
|
continue; /* Interrupted */
|
|
#endif
|
|
if (MyFlags & (MY_WME | MY_FAE | MY_FNABP))
|
|
{
|
|
if ((int) readbytes == -1)
|
|
my_error(EE_READ, MYF(ME_BELL+ME_WAITTANG),
|
|
my_filename(Filedes),my_errno);
|
|
else if (MyFlags & (MY_NABP | MY_FNABP))
|
|
my_error(EE_EOFERR, MYF(ME_BELL+ME_WAITTANG),
|
|
my_filename(Filedes),my_errno);
|
|
}
|
|
if ((int) readbytes == -1 ||
|
|
((MyFlags & (MY_FNABP | MY_NABP)) && !(MyFlags & MY_FULL_IO)))
|
|
DBUG_RETURN(MY_FILE_ERROR); /* Return with error */
|
|
if (readbytes > 0 && (MyFlags & MY_FULL_IO))
|
|
{
|
|
Buffer+=readbytes;
|
|
Count-=readbytes;
|
|
continue;
|
|
}
|
|
}
|
|
|
|
if (MyFlags & (MY_NABP | MY_FNABP))
|
|
readbytes=0; /* Ok on read */
|
|
else if (MyFlags & MY_FULL_IO)
|
|
readbytes=save_count;
|
|
break;
|
|
}
|
|
DBUG_RETURN(readbytes);
|
|
} /* my_read */
|