ef29ade04b
* lib/mes/__buffered_read.c: New file. * build-aux/configure-lib.sh (libc_SOURCES): Add it. Also add memmove.c. (libc_tcc_SOURCES): Remove memmove.c * lib/linux/close.c (close): Clear read buffer. * lib/linux/_open3.c (_open3): Likewise. * lib/linux/lseek.c (lseek): Correct for read buffer. * lib/stdio/fwrite.c (fwrite): Likewise. * lib/posix/read.c (read): Call __buffered_read. * lib/posix/write.c (write): Add FIXME note about buffered reads. * simple.sh: Update.
77 lines
1.9 KiB
C
77 lines
1.9 KiB
C
/* -*-comment-start: "//";comment-end:""-*-
|
|
* GNU Mes --- Maxwell Equations of Software
|
|
* Copyright © 2017,2018 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
|
|
*
|
|
* This file is part of GNU Mes.
|
|
*
|
|
* GNU Mes is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 3 of the License, or (at
|
|
* your option) any later version.
|
|
*
|
|
* GNU Mes 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 General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with GNU Mes. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include <mes/lib.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
|
|
int
|
|
__fungetc_p (FILE * stream)
|
|
{
|
|
return __ungetc_p ((int) (long) stream);
|
|
}
|
|
|
|
size_t
|
|
fread (void *data, size_t size, size_t count, FILE * stream)
|
|
{
|
|
if (!size || !count)
|
|
return 0;
|
|
|
|
size_t todo = size * count;
|
|
char *buf = (char *) data;
|
|
|
|
int bytes = 0;
|
|
while (__fungetc_p (stream) && todo-- && ++bytes)
|
|
*buf++ = fgetc (stream);
|
|
int filedes = (long) stream;
|
|
if (todo)
|
|
{
|
|
int r = read (filedes, buf, todo);
|
|
if (r < 0 && !bytes)
|
|
bytes = r;
|
|
else
|
|
bytes += r;
|
|
}
|
|
|
|
if (__mes_debug ())
|
|
{
|
|
static char debug_buf[4096];
|
|
eputs ("fread fd=");
|
|
eputs (itoa (filedes));
|
|
eputs (" bytes=");
|
|
eputs (itoa (bytes));
|
|
eputs ("\n");
|
|
if (bytes > 0 && bytes < sizeof (debug_buf))
|
|
{
|
|
strncpy (debug_buf, data, bytes);
|
|
buf[bytes] = 0;
|
|
eputs ("fread buf=");
|
|
eputs (debug_buf);
|
|
eputs ("\n");
|
|
}
|
|
}
|
|
|
|
if (bytes > 0)
|
|
return bytes / size;
|
|
|
|
return 0;
|
|
}
|