+2006-09-26 Jeff Johnston <jjohnstn@redhat.com>
+
+ * libc/include/stdio.h[_REENT_SMALL]: Do not allow macros
+ for clearerr, feof, or fileno.
+ * libc/include/sys/reent.h[_REENT_SMALL](struct _reent): Change
+ the dummy std stream scheme to use pointers to const external
+ fake files, one for each standard stream.
+ * libc/stdio/local.h (CHECK_INIT): Change to take a file pointer
+ argument. For _REENT_SMALL, reset the file pointer if it
+ matches one of the fake std stream pointers.
+ * libc/stdio/clearerr.c: Fix CHECK_INIT macro to add file pointer
+ argument.
+ * libc/stdio/fclose.c: Ditto.
+ * libc/stdio/feof.c: Ditto.
+ * libc/stdio/ferror.c: Ditto.
+ * libc/stdio/fflush.c: Ditto.
+ * libc/stdio/fgetc.c: Ditto.
+ * libc/stdio/fgets.c: Ditto.
+ * libc/stdio/fileno.c: Ditto.
+ * libc/stdio/findfp.c: Ditto.
+ * libc/stdio/fputc.c: Ditto.
+ * libc/stdio/fputs.c: Ditto.
+ * libc/stdio/fread.c: Ditto.
+ * libc/stdio/freopen.c: Ditto.
+ * libc/stdio/fseek.c: Ditto.
+ * libc/stdio/ftell.c: Ditto.
+ * libc/stdio/fwrite.c: Ditto.
+ * libc/stdio/getc.c: Ditto.
+ * libc/stdio/getdelim.c: Ditto.
+ * libc/stdio/putc.c: Ditto.
+ * libc/stdio/refill.c: Ditto.
+ * libc/stdio/setvbuf.c: Ditto.
+ * libc/stdio/ungetc.c: Ditto.
+ * libc/stdio/vfprintf.c: Ditto.
+ * libc/stdio/vfscanf.c: Ditto.
+ * libc/stdio/wbuf.c: Ditto.: Ditto.
+ * libc/stdio/wsetup.c: Ditto.
+ * libc/stdio64/freopen64.c: Ditto.
+ * libc/stdio64/fseeko64.c: Ditto.
+ * libc/stdio64/ftello64.c: Ditto.
+ * libc/machine/powerpc/vfprintf.c: Ditto.
+ * libc/machine/powerpc/vfscanf.c: Ditto.
+
2006-09-22 Paul Brook <paul@codesourcery.com>
* libc/include/sys/reent.h: Define and use __reent_assert.
#define __sclearerr(p) ((void)((p)->_flags &= ~(__SERR|__SEOF)))
#define __sfileno(p) ((p)->_file)
+#ifndef _REENT_SMALL
#define feof(p) __sfeof(p)
#define ferror(p) __sferror(p)
#define clearerr(p) __sclearerr(p)
+#endif
#if 0 /*ndef __STRICT_ANSI__ - FIXME: must initialize stdio first, use fn */
#define fileno(p) __sfileno(p)
#include <_ansi.h>
#include <sys/_types.h>
+#define _NULL 0
+
#ifndef __Long
#if __LONG_MAX__ == 2147483647L
#define __Long long
struct _reent *_data;
};
-/* CHECK_INIT() comes from stdio/local.h; be sure to include that. */
-# define _REENT_SMALL_CHECK_INIT(ptr) CHECK_INIT(ptr)
+/* CHECK_STD_INIT() comes from stdio/local.h; be sure to include that. */
+# define _REENT_SMALL_CHECK_INIT(ptr) CHECK_STD_INIT(ptr)
#else
# define _REENT_SMALL_CHECK_INIT(ptr) /* nothing */
#endif
struct _glue __sglue; /* root of glue chain */
__FILE *__sf; /* file descriptors */
- struct __sFILE_fake __sf_fake; /* fake initial stdin/out/err */
struct _misc_reent *_misc; /* strtok, multibyte states */
char *_signal_buf; /* strsignal */
};
+extern const struct __sFILE_fake __sf_fake_stdin;
+extern const struct __sFILE_fake __sf_fake_stdout;
+extern const struct __sFILE_fake __sf_fake_stderr;
+
#define _REENT_INIT(var) \
- { (__FILE *)&var.__sf_fake, \
- (__FILE *)&var.__sf_fake, \
- (__FILE *)&var.__sf_fake, \
+ { (__FILE *)&__sf_fake_stdin, \
+ (__FILE *)&__sf_fake_stdout, \
+ (__FILE *)&__sf_fake_stderr, \
0, \
0, \
_NULL, \
{_NULL, 0, {_NULL}, _NULL}, \
{_NULL, 0, _NULL}, \
_NULL, \
- {_NULL, 0, 0, 0, 0, {_NULL, 0}, 0, _NULL}, \
_NULL, \
_NULL \
}
#define _REENT_INIT_PTR(var) \
- { var->_stdin = (__FILE *)&var->__sf_fake; \
- var->_stdout = (__FILE *)&var->__sf_fake; \
- var->_stderr = (__FILE *)&var->__sf_fake; \
+ { var->_stdin = (__FILE *)&__sf_fake_stdin; \
+ var->_stdout = (__FILE *)&__sf_fake_stdout; \
+ var->_stderr = (__FILE *)&__sf_fake_stderr; \
var->_errno = 0; \
var->_inc = 0; \
var->_emergency = _NULL; \
var->__sglue._niobs = 0; \
var->__sglue._iobs = _NULL; \
var->__sf = 0; \
- var->__sf_fake._p = _NULL; \
- var->__sf_fake._r = 0; \
- var->__sf_fake._w = 0; \
- var->__sf_fake._flags = 0; \
- var->__sf_fake._file = 0; \
- var->__sf_fake._bf._base = _NULL; \
- var->__sf_fake._bf._size = 0; \
- var->__sf_fake._lbfsize = 0; \
- var->__sf_fake._data = _NULL; \
var->_misc = _NULL; \
var->_signal_buf = _NULL; \
}
#endif /* !_REENT_SMALL */
-#define _NULL 0
-
/*
* All references to struct _reent are via this pointer.
* Internally, newlib routines that need to reference it should use _REENT.
_CONST char *fmt0 _AND
va_list ap)
{
- CHECK_INIT (_REENT);
+ CHECK_INIT (_REENT, fp);
return _VFPRINTF_R (_REENT, fp, fmt0, ap);
}
if (prec || flags & ALT)
size += prec + 1;
} else /* "0.X" */
- size = prec + 2;
+ size = (prec || flags & ALT)
+ ? prec + 2
+ : 1;
} else if (expt >= ndig) { /* fixed g fmt */
size = expt;
if (flags & ALT)
_CONST char *fmt _AND
va_list ap)
{
- CHECK_INIT(_REENT);
+ CHECK_INIT(_REENT, fp);
return __svfscanf_r (_REENT, fp, fmt, ap);
}
_DEFUN(clearerr, (fp),
FILE * fp)
{
- CHECK_INIT(_REENT);
+ CHECK_INIT(_REENT, fp);
_flockfile (fp);
__sclearerr (fp);
_funlockfile (fp);
__sfp_lock_acquire ();
- CHECK_INIT (rptr);
+ CHECK_INIT (rptr, fp);
_flockfile (fp);
FILE * fp)
{
int result;
- CHECK_INIT(_REENT);
+ CHECK_INIT(_REENT, fp);
_flockfile (fp);
result = __sfeof (fp);
_funlockfile (fp);
FILE * fp)
{
int result;
- CHECK_INIT(_REENT);
+ CHECK_INIT(_REENT, fp);
_flockfile (fp);
result = __sferror (fp);
_funlockfile (fp);
if (fp == NULL)
return _fwalk (_GLOBAL_REENT, fflush);
- CHECK_INIT (_REENT);
+ CHECK_INIT (_REENT, fp);
_flockfile (fp);
FILE * fp)
{
int result;
- CHECK_INIT(ptr);
+ CHECK_INIT(ptr, fp);
_flockfile (fp);
result = __sgetc_r (ptr, fp);
_funlockfile (fp);
{
#if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__)
int result;
- CHECK_INIT(_REENT);
+ CHECK_INIT(_REENT, fp);
_flockfile (fp);
result = __sgetc_r (_REENT, fp);
_funlockfile (fp);
s = buf;
- CHECK_INIT(ptr);
+ CHECK_INIT(ptr, fp);
_flockfile (fp);
#ifdef __SCLE
FILE * f)
{
int result;
- CHECK_INIT (_REENT);
+ CHECK_INIT (_REENT, f);
_flockfile (f);
result = __sfileno (f);
_funlockfile (f);
#include <sys/lock.h>
#include "local.h"
+#ifdef _REENT_SMALL
+const struct __sFILE_fake __sf_fake_stdin =
+ {_NULL, 0, 0, 0, 0, {_NULL, 0}, 0, _NULL};
+const struct __sFILE_fake __sf_fake_stdout =
+ {_NULL, 0, 0, 0, 0, {_NULL, 0}, 0, _NULL};
+const struct __sFILE_fake __sf_fake_stderr =
+ {_NULL, 0, 0, 0, 0, {_NULL, 0}, 0, _NULL};
+#endif
+
static _VOID
_DEFUN(std, (ptr, flags, file, data),
FILE *ptr _AND
FILE * file)
{
int result;
- CHECK_INIT(ptr);
+ CHECK_INIT(ptr, file);
_flockfile (file);
result = _putc_r (ptr, ch, file);
_funlockfile (file);
{
#if !defined(__OPTIMIZE_SIZE__) && !defined(PREFER_SIZE_OVER_SPEED)
int result;
- CHECK_INIT(_REENT);
+ CHECK_INIT(_REENT, file);
_flockfile (file);
result = _putc_r (_REENT, ch, file);
_funlockfile (file);
uio.uio_iov = &iov;
uio.uio_iovcnt = 1;
- CHECK_INIT(ptr);
+ CHECK_INIT(ptr, fp);
_flockfile (fp);
result = __sfvwrite_r (ptr, fp, &uio);
if ((resid = count * size) == 0)
return 0;
- CHECK_INIT(ptr);
+ CHECK_INIT(ptr, fp);
_flockfile (fp);
if (fp->_r < 0)
__sfp_lock_acquire ();
- CHECK_INIT (ptr);
+ CHECK_INIT (ptr, fp);
_flockfile (fp);
/* Make sure stdio is set up. */
- CHECK_INIT (ptr);
+ CHECK_INIT (ptr, fp);
_flockfile (fp);
/* Ensure stdio is set up. */
- CHECK_INIT (ptr);
+ CHECK_INIT (ptr, fp);
_flockfile (fp);
* generally slow and since this occurs whenever size==0.
*/
- CHECK_INIT(ptr);
+ CHECK_INIT(ptr, fp);
_flockfile (fp);
if (__sfvwrite_r (ptr, fp, &uio) == 0)
register FILE *fp)
{
int result;
- CHECK_INIT (ptr);
+ CHECK_INIT (ptr, fp);
_flockfile (fp);
result = __sgetc_r (ptr, fp);
_funlockfile (fp);
register FILE *fp)
{
int result;
- CHECK_INIT (_REENT);
+ CHECK_INIT (_REENT, fp);
_flockfile (fp);
result = __sgetc_r (_REENT, fp);
_funlockfile (fp);
*n = DEFAULT_LINE_SIZE;
}
- CHECK_INIT (_REENT);
+ CHECK_INIT (_REENT, fp);
_flockfile (fp);
/* Called by the main entry point fns to ensure stdio has been initialized. */
-#define CHECK_INIT(ptr) \
+#ifdef _REENT_SMALL
+#define CHECK_INIT(ptr, fp) \
+ do \
+ { \
+ if ((ptr) && !(ptr)->__sdidinit) \
+ __sinit (ptr); \
+ if ((fp) == (FILE *)&__sf_fake_stdin) \
+ (fp) = stdin; \
+ else if ((fp) == (FILE *)&__sf_fake_stdout) \
+ (fp) = stdout; \
+ else if ((fp) == (FILE *)&__sf_fake_stderr) \
+ (fp) = stderr; \
+ } \
+ while (0)
+#else /* !_REENT_SMALL */
+#define CHECK_INIT(ptr, fp) \
+ do \
+ { \
+ if ((ptr) && !(ptr)->__sdidinit) \
+ __sinit (ptr); \
+ } \
+ while (0)
+#endif /* !_REENT_SMALL */
+
+#define CHECK_STD_INIT(ptr) \
do \
{ \
if ((ptr) && !(ptr)->__sdidinit) \
register FILE *fp)
{
int result;
- CHECK_INIT (ptr);
+ CHECK_INIT (ptr, fp);
_flockfile (fp);
result = __sputc_r (ptr, c, fp);
_funlockfile (fp);
{
#if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__)
int result;
- CHECK_INIT (_REENT);
+ CHECK_INIT (_REENT, fp);
_flockfile (fp);
result = __sputc_r (_REENT, c, fp);
_funlockfile (fp);
{
/* make sure stdio is set up */
- CHECK_INIT (_REENT);
+ CHECK_INIT (_REENT, fp);
fp->_r = 0; /* largely a convenience for callers */
{
int ret = 0;
- CHECK_INIT (_REENT);
+ CHECK_INIT (_REENT, fp);
_flockfile (fp);
??? Might be able to remove this as some other stdio routine should
have already been called to get the char we are un-getting. */
- CHECK_INIT (rptr);
+ CHECK_INIT (rptr, fp);
_flockfile (fp);
(u_long)GET_ARG (N, ap, u_int))
#endif
- CHECK_INIT (data);
+ CHECK_INIT (data, fp);
_flockfile (fp);
/* sorry, fprintf(read_only_file, "") returns EOF, not 0 */
_CONST char *fmt _AND
va_list ap)
{
- CHECK_INIT(_REENT);
+ CHECK_INIT(_REENT, fp);
return __SVFSCANF_R (_REENT, fp, fmt, ap);
}
_CONST char *fmt _AND
va_list ap)
{
- CHECK_INIT(data);
+ CHECK_INIT(data, fp);
return __SVFSCANF_R (data, fp, fmt, ap);
}
/* Ensure stdio has been initialized. */
- CHECK_INIT (ptr);
+ CHECK_INIT (ptr, fp);
/*
* In case we cannot write, or longjmp takes us out early,
{
/* Make sure stdio is set up. */
- CHECK_INIT (_REENT);
+ CHECK_INIT (_REENT, fp);
/*
* If we are not writing, we had better be reading and writing.
__sfp_lock_acquire ();
- CHECK_INIT (ptr);
+ CHECK_INIT (ptr, fp);
_flockfile(fp);
/* Make sure stdio is set up. */
- CHECK_INIT (ptr);
+ CHECK_INIT (ptr, fp);
_flockfile(fp);
/* Ensure stdio is set up. */
- CHECK_INIT (ptr);
+ CHECK_INIT (ptr, fp);
_flockfile(fp);
git://sourceware.org / newlib-cygwin.git / commitdiff