2004-11-24 08:45:41 +08:00
|
|
|
/*
|
|
|
|
* Code created by modifying iscanf.c which has following copyright.
|
|
|
|
*
|
|
|
|
* Copyright (c) 1990 The Regents of the University of California.
|
|
|
|
* All rights reserved.
|
|
|
|
*
|
|
|
|
* Redistribution and use in source and binary forms are permitted
|
|
|
|
* provided that the above copyright notice and this paragraph are
|
|
|
|
* duplicated in all such forms and that any documentation,
|
|
|
|
* advertising materials, and other materials related to such
|
|
|
|
* distribution and use acknowledge that the software was developed
|
|
|
|
* by the University of California, Berkeley. The name of the
|
|
|
|
* University may not be used to endorse or promote products derived
|
|
|
|
* from this software without specific prior written permission.
|
|
|
|
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
|
|
|
|
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
|
|
|
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <_ansi.h>
|
|
|
|
#include <reent.h>
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <string.h>
|
|
|
|
#ifdef _HAVE_STDC
|
|
|
|
#include <stdarg.h>
|
|
|
|
#else
|
|
|
|
#include <varargs.h>
|
|
|
|
#endif
|
|
|
|
#include "local.h"
|
|
|
|
|
|
|
|
static _READ_WRITE_RETURN_TYPE
|
Implement funopen, fopencookie.
* libc/include/sys/reent.h (struct __sFILE, struct __sFILE64):
Switch to reentrant callbacks.
* libc/include/stdio.h (funopen): Fix declaration.
(fopencookie): Declare.
* libc/stdio/local.h (__sread, __swrite, __sseek, __sclose)
(__sseek64, __swrite64): Fix prototypes.
[__SCLE]: Pull in setmode declaration.
* libc/stdio/stdio.c (__sread, __swrite, __sseek, __sclose): Fix
reentrancy.
* libc/stdio64/stdio64.c (__sseek64_r, __swrite64_r): Delete.
(__sseek64, __swrite64): Fix reentrancy.
* libc/stdio/fseek.c (_fseek_r): Account for overflow, and fix
reentrancy.
* libc/stdio/ftell.c (_ftell_r): Likewise.
* libc/stdio/flags.c (__sflags): Don't lose __SAPP on "a+".
* libc/stdio/fclose.c (_fclose_r): Fix reentrancy.
* libc/stdio/freopen.c (_freopen_r): Likewise.
* libc/stdio/fvwrite.c (__sfvwrite_r): Likewise.
* libc/stdio/refill.c (__srefill_r): Likewise.
* libc/stdio/siscanf.c (eofread): Likewise.
* libc/stdio/sscanf.c (eofread): Likewise.
* libc/stdio/vsiscanf.c (eofread1): Likewise.
* libc/stdio/vsscanf.c (eofread1): Likewise.
* libc/stdio64/freopen64.c (_freopen64_r): Likewise.
* libc/stdio64/fseeko64.c (_fseeko64_r): Likewise.
* libc/stdio64/ftello64.c (_ftello64_r): Likewise.
* libc/stdio/fflush.c (fflush): Improve reentrancy, although more
could be fixed.
* libc/stdio/fopencookie.c (_fopencookie_r, fopencookie): New file.
* libc/stdio/funopen.c (_funopen_r, funopen): New file.
* libc/stdio/Makefile.am (ELIX_4_SOURCES, CHEWOUT_FILES): Build
new files.
* libc/stdio/Makefile.in: Regenerate.
2007-06-05 02:10:17 +08:00
|
|
|
_DEFUN(eofread1, (ptr, cookie, buf, len),
|
|
|
|
struct _reent *ptr _AND
|
2004-11-24 08:45:41 +08:00
|
|
|
_PTR cookie _AND
|
|
|
|
char *buf _AND
|
|
|
|
int len)
|
|
|
|
{
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* vsiscanf
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef _REENT_ONLY
|
|
|
|
|
|
|
|
int
|
|
|
|
_DEFUN(vsiscanf, (str, fmt, ap),
|
|
|
|
_CONST char *str _AND
|
|
|
|
_CONST char *fmt _AND
|
|
|
|
va_list ap)
|
|
|
|
{
|
|
|
|
return _vsiscanf_r (_REENT, str, fmt, ap);
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif /* !_REENT_ONLY */
|
|
|
|
|
|
|
|
int
|
|
|
|
_DEFUN(_vsiscanf_r, (ptr, str, fmt, ap),
|
|
|
|
struct _reent *ptr _AND
|
|
|
|
_CONST char *str _AND
|
|
|
|
_CONST char *fmt _AND
|
|
|
|
va_list ap)
|
|
|
|
{
|
|
|
|
FILE f;
|
|
|
|
|
|
|
|
f._flags = __SRD | __SSTR;
|
|
|
|
f._bf._base = f._p = (unsigned char *) str;
|
|
|
|
f._bf._size = f._r = strlen (str);
|
|
|
|
f._read = eofread1;
|
|
|
|
f._ub._base = NULL;
|
|
|
|
f._lb._base = NULL;
|
|
|
|
f._file = -1; /* No file. */
|
2008-04-15 05:14:55 +08:00
|
|
|
return __ssvfiscanf_r (ptr, &f, fmt, ap);
|
2004-11-24 08:45:41 +08:00
|
|
|
}
|