* libc/stdio/local.h (cantwrite, FREEUB, FREELB): Make reentrant.
(__smakebuf): Rename...
(__smakebuf_r): to this.
* libc/stdio/fvwrite.h (__swsetup_r): Rename, from __swsetup.
* libc/stdio/makebuf.c (__smakebuf): Detect failed asprint
allocation, then rename...
(__smakebuf_r): ...to this and fix reentrancy.
* libc/stdio/wsetup.c (__swsetup): Detect failed asprintf
allocation, then rename...
(__swsetup_r): ...to this and fix reentrancy.
* libc/stdio/fseek.c (_fseek_r): Fix reentrancy.
* libc/stdio/refill.c (__srefill_r): Likewise.
* libc/stdio/fclose.c (_fclose_r): Likewise.
* libc/stdio/fread.c (_fread_r): Likewise.
* libc/stdio/freopen.c (_freopen_r): Likewise.
* libc/stdio/wbuf.c (__swbuf_r): Likewise.
* libc/stdio64/fseeko64.c (_fseeko64_r): Likewise.
* libc/stdio/fvwrite.c (__sfvwrite_r): Set errno properly on
failed asprintf allocation, and fix reentrancy.
* libc/stdio/snprintf.c (snprintf, _snprintf_r): Report overflow,
as required by POSIX.
* libc/stdio/sniprintf.c (sniprintf, _sniprintf_r): Likewise.
* libc/stdio/vsnprintf.c (vsnprintf, _vsnprintf_r): Likewise.
* libc/stdio/vsniprintf.c (vsniprintf, _vsniprintf_r): Likewise.
+2007-03-15 Eric Blake <ebb9@byu.net>
+
+ * libc/stdio/local.h (cantwrite, FREEUB, FREELB): Make reentrant.
+ (__smakebuf): Rename...
+ (__smakebuf_r): to this.
+ * libc/stdio/fvwrite.h (__swsetup_r): Rename, from __swsetup.
+ * libc/stdio/makebuf.c (__smakebuf): Detect failed asprint
+ allocation, then rename...
+ (__smakebuf_r): ...to this and fix reentrancy.
+ * libc/stdio/wsetup.c (__swsetup): Detect failed asprintf
+ allocation, then rename...
+ (__swsetup_r): ...to this and fix reentrancy.
+ * libc/stdio/fseek.c (_fseek_r): Fix reentrancy.
+ * libc/stdio/refill.c (__srefill_r): Likewise.
+ * libc/stdio/fclose.c (_fclose_r): Likewise.
+ * libc/stdio/fread.c (_fread_r): Likewise.
+ * libc/stdio/freopen.c (_freopen_r): Likewise.
+ * libc/stdio/wbuf.c (__swbuf_r): Likewise.
+ * libc/stdio64/fseeko64.c (_fseeko64_r): Likewise.
+ * libc/stdio/fvwrite.c (__sfvwrite_r): Set errno properly on
+ failed asprintf allocation, and fix reentrancy.
+ * libc/stdio/snprintf.c (snprintf, _snprintf_r): Report overflow,
+ as required by POSIX.
+ * libc/stdio/sniprintf.c (sniprintf, _sniprintf_r): Likewise.
+ * libc/stdio/vsnprintf.c (vsnprintf, _vsnprintf_r): Likewise.
+ * libc/stdio/vsniprintf.c (vsniprintf, _vsniprintf_r): Likewise.
+
2007-03-12 Eric Blake <ebb9@byu.net>
* libc/stdio/fvwrite.c (__sfvwrite_r): Fix reentrancy.
/*
- * Copyright (c) 1990 The Regents of the University of California.
+ * Copyright (c) 1990, 2007 The Regents of the University of California.
* All rights reserved.
*
* Redistribution and use in source and binary forms are permitted
if (fp->_flags & __SMBF)
_free_r (rptr, (char *) fp->_bf._base);
if (HASUB (fp))
- FREEUB (fp);
+ FREEUB (rptr, fp);
if (HASLB (fp))
- FREELB (fp);
+ FREELB (rptr, fp);
fp->_flags = 0; /* release this FILE for reuse */
_funlockfile (fp);
#ifndef __SINGLE_THREAD__
}
#endif
-
/*
- * Copyright (c) 1990 The Regents of the University of California.
+ * Copyright (c) 1990, 2007 The Regents of the University of California.
* All rights reserved.
*
* Redistribution and use in source and binary forms are permitted
/* If still more data needed, free any allocated ungetc buffer. */
if (HASUB (fp) && resid > 0)
- FREEUB (fp);
+ FREEUB (ptr, fp);
/* Finally read directly into user's buffer if needed. */
while (resid > 0)
/*
- * Copyright (c) 1990, 2006 The Regents of the University of California.
+ * Copyright (c) 1990, 2006, 2007 The Regents of the University of California.
* All rights reserved.
*
* Redistribution and use in source and binary forms are permitted
fp->_bf._size = 0;
fp->_lbfsize = 0;
if (HASUB (fp))
- FREEUB (fp);
+ FREEUB (ptr, fp);
fp->_ub._size = 0;
if (HASLB (fp))
- FREELB (fp);
+ FREELB (ptr, fp);
fp->_lb._size = 0;
if (f < 0)
/*
- * Copyright (c) 1990 The Regents of the University of California.
+ * Copyright (c) 1990, 2007 The Regents of the University of California.
* All rights reserved.
*
* Redistribution and use in source and binary forms are permitted
*/
if (fp->_bf._base == NULL)
- __smakebuf (fp);
+ __smakebuf_r (ptr, fp);
if (fp->_flags & (__SWR | __SRW | __SNBF | __SNPT))
goto dumb;
if ((fp->_flags & __SOPT) == 0)
fp->_p = fp->_bf._base + o;
fp->_r = n - o;
if (HASUB (fp))
- FREEUB (fp);
+ FREEUB (ptr, fp);
fp->_flags &= ~__SEOF;
_funlockfile (fp);
return 0;
fp->_r = 0;
fp->_p = fp->_bf._base;
if (HASUB (fp))
- FREEUB (fp);
+ FREEUB (ptr, fp);
fp->_flags &= ~__SEOF;
n = target - curoff;
if (n)
}
/* success: clear EOF indicator and discard ungetc() data */
if (HASUB (fp))
- FREEUB (fp);
+ FREEUB (ptr, fp);
fp->_p = fp->_bf._base;
fp->_r = 0;
/* fp->_w = 0; *//* unnecessary (I think...) */
return 0;
/* make sure we can write */
- if (cantwrite (fp))
+ if (cantwrite (ptr, fp))
{
fp->_flags |= __SERR;
ptr->_errno = EBADF;
{
/* Free buffer which is no longer used. */
_free_r (ptr, fp->_bf._base);
+ /* Ensure correct errno, even if free changed it. */
+ ptr->_errno = ENOMEM;
goto err;
}
fp->_bf._base = str;
/*
- * Copyright (c) 1990 The Regents of the University of California.
+ * Copyright (c) 1990, 2007 The Regents of the University of California.
* All rights reserved.
*
* Redistribution and use in source and binary forms are permitted
extern int _EXFUN(__sfvwrite_r,(struct _reent *, FILE *, struct __suio *));
-extern int _EXFUN(__swsetup,(FILE *));
-
-
+extern int _EXFUN(__swsetup_r,(struct _reent *, FILE *));
/*
- * Copyright (c) 1990 The Regents of the University of California.
+ * Copyright (c) 1990, 2007 The Regents of the University of California.
* All rights reserved.
*
* Redistribution and use in source and binary forms are permitted
extern int _EXFUN(__stextmode,(int));
extern _VOID _EXFUN(__sinit,(struct _reent *));
extern _VOID _EXFUN(_cleanup_r,(struct _reent *));
-extern _VOID _EXFUN(__smakebuf,(FILE *));
+extern _VOID _EXFUN(__smakebuf_r,(struct _reent *, FILE *));
extern int _EXFUN(_fwalk,(struct _reent *, int (*)(FILE *)));
extern int _EXFUN(_fwalk_reent,(struct _reent *, int (*)(struct _reent *, FILE *)));
struct _glue * _EXFUN(__sfmoreglue,(struct _reent *,int n));
/* Return true iff the given FILE cannot be written now. */
-#define cantwrite(fp) \
+#define cantwrite(ptr, fp) \
((((fp)->_flags & __SWR) == 0 || (fp)->_bf._base == NULL) && \
- __swsetup(fp))
+ __swsetup_r(ptr, fp))
/* Test whether the given stdio file has an active ungetc buffer;
release such a buffer, without restoring ordinary unread data. */
#define HASUB(fp) ((fp)->_ub._base != NULL)
-#define FREEUB(fp) { \
+#define FREEUB(ptr, fp) { \
if ((fp)->_ub._base != (fp)->_ubuf) \
- _free_r(_REENT, (char *)(fp)->_ub._base); \
+ _free_r(ptr, (char *)(fp)->_ub._base); \
(fp)->_ub._base = NULL; \
}
/* Test for an fgetline() buffer. */
#define HASLB(fp) ((fp)->_lb._base != NULL)
-#define FREELB(fp) { _free_r(_REENT,(char *)(fp)->_lb._base); (fp)->_lb._base = NULL; }
+#define FREELB(ptr, fp) { _free_r(ptr,(char *)(fp)->_lb._base); \
+ (fp)->_lb._base = NULL; }
/* WARNING: _dcvt is defined in the stdlib directory, not here! */
/*
- * Copyright (c) 1990 The Regents of the University of California.
+ * Copyright (c) 1990, 2007 The Regents of the University of California.
* All rights reserved.
*
* Redistribution and use in source and binary forms are permitted
*/
_VOID
-_DEFUN(__smakebuf, (fp),
+_DEFUN(__smakebuf_r, (ptr, fp),
+ struct _reent *ptr _AND
register FILE *fp)
{
register size_t size, couldbetty;
return;
}
#ifdef __USE_INTERNAL_STAT64
- if (fp->_file < 0 || _fstat64_r (_REENT, fp->_file, &st) < 0)
+ if (fp->_file < 0 || _fstat64_r (ptr, fp->_file, &st) < 0)
#else
- if (fp->_file < 0 || _fstat_r (_REENT, fp->_file, &st) < 0)
+ if (fp->_file < 0 || _fstat_r (ptr, fp->_file, &st) < 0)
#endif
{
couldbetty = 0;
else
fp->_flags |= __SNPT;
}
- if ((p = _malloc_r (_REENT, size)) == NULL)
+ if ((p = _malloc_r (ptr, size)) == NULL)
{
- fp->_flags |= __SNBF;
- fp->_bf._base = fp->_p = fp->_nbuf;
- fp->_bf._size = 1;
+ if (!(fp->_flags & __SSTR))
+ {
+ fp->_flags |= __SNBF;
+ fp->_bf._base = fp->_p = fp->_nbuf;
+ fp->_bf._size = 1;
+ }
}
else
{
- _REENT->__cleanup = _cleanup_r;
+ ptr->__cleanup = _cleanup_r;
fp->_flags |= __SMBF;
fp->_bf._base = fp->_p = (unsigned char *) p;
fp->_bf._size = size;
/*
- * Copyright (c) 1990 The Regents of the University of California.
+ * Copyright (c) 1990, 2007 The Regents of the University of California.
* All rights reserved.
*
* Redistribution and use in source and binary forms are permitted
{
/* make sure stdio is set up */
- CHECK_INIT (_REENT, fp);
+ CHECK_INIT (ptr, fp);
fp->_r = 0; /* largely a convenience for callers */
*/
if (HASUB (fp))
{
- FREEUB (fp);
+ FREEUB (ptr, fp);
if ((fp->_r = fp->_ur) != 0)
{
fp->_p = fp->_up;
}
if (fp->_bf._base == NULL)
- __smakebuf (fp);
+ __smakebuf_r (ptr, fp);
/*
* Before reading from a line buffered or unbuffered file,
/*
- * Copyright (c) 1990 The Regents of the University of California.
+ * Copyright (c) 1990, 2007 The Regents of the University of California.
* All rights reserved.
*
* Redistribution and use in source and binary forms are permitted
#include <varargs.h>
#endif
#include <limits.h>
+#include <errno.h>
#include "local.h"
int
va_list ap;
FILE f;
+ if (size > INT_MAX)
+ {
+ ptr->_errno = EOVERFLOW;
+ return EOF;
+ }
f._flags = __SWR | __SSTR;
f._bf._base = f._p = (unsigned char *) str;
f._bf._size = f._w = (size > 0 ? size - 1 : 0);
#endif
ret = _vfiprintf_r (ptr, &f, fmt, ap);
va_end (ap);
+ if (ret < EOF)
+ ptr->_errno = EOVERFLOW;
if (size > 0)
*f._p = 0;
return (ret);
int ret;
va_list ap;
FILE f;
+ struct _reent *ptr = _REENT;
+ if (size > INT_MAX)
+ {
+ ptr->_errno = EOVERFLOW;
+ return EOF;
+ }
f._flags = __SWR | __SSTR;
f._bf._base = f._p = (unsigned char *) str;
f._bf._size = f._w = (size > 0 ? size - 1 : 0);
#else
va_start (ap);
#endif
- ret = _vfiprintf_r (_REENT, &f, fmt, ap);
+ ret = _vfiprintf_r (ptr, &f, fmt, ap);
va_end (ap);
+ if (ret < EOF)
+ ptr->_errno = EOVERFLOW;
if (size > 0)
*f._p = 0;
return (ret);
/*
- * Copyright (c) 1990 The Regents of the University of California.
+ * Copyright (c) 1990, 2007 The Regents of the University of California.
* All rights reserved.
*
* Redistribution and use in source and binary forms are permitted
#include <varargs.h>
#endif
#include <limits.h>
+#include <errno.h>
#include "local.h"
int
va_list ap;
FILE f;
+ if (size > INT_MAX)
+ {
+ ptr->_errno = EOVERFLOW;
+ return EOF;
+ }
f._flags = __SWR | __SSTR;
f._bf._base = f._p = (unsigned char *) str;
f._bf._size = f._w = (size > 0 ? size - 1 : 0);
#endif
ret = _vfprintf_r (ptr, &f, fmt, ap);
va_end (ap);
+ if (ret < EOF)
+ ptr->_errno = EOVERFLOW;
if (size > 0)
*f._p = 0;
return (ret);
int ret;
va_list ap;
FILE f;
+ struct _reent *ptr = _REENT;
+ if (size > INT_MAX)
+ {
+ ptr->_errno = EOVERFLOW;
+ return EOF;
+ }
f._flags = __SWR | __SSTR;
f._bf._base = f._p = (unsigned char *) str;
f._bf._size = f._w = (size > 0 ? size - 1 : 0);
#else
va_start (ap);
#endif
- ret = _vfprintf_r (_REENT, &f, fmt, ap);
+ ret = _vfprintf_r (ptr, &f, fmt, ap);
va_end (ap);
+ if (ret < EOF)
+ ptr->_errno = EOVERFLOW;
if (size > 0)
*f._p = 0;
return (ret);
_flockfile (fp);
/* sorry, fprintf(read_only_file, "") returns EOF, not 0 */
- if (cantwrite (fp)) {
+ if (cantwrite (data, fp)) {
_funlockfile (fp);
return (EOF);
}
/*
- * Copyright (c) 1990 The Regents of the University of California.
+ * Copyright (c) 1990, 2007 The Regents of the University of California.
* All rights reserved.
*
* Redistribution and use in source and binary forms are permitted
#else
#include <varargs.h>
#endif
+#include <errno.h>
#ifndef _REENT_ONLY
{
int ret;
FILE f;
+ struct _reent *ptr = _REENT;
+ if (size > INT_MAX)
+ {
+ ptr->_errno = EOVERFLOW;
+ return EOF;
+ }
f._flags = __SWR | __SSTR;
f._bf._base = f._p = (unsigned char *) str;
f._bf._size = f._w = (size > 0 ? size - 1 : 0);
f._file = -1; /* No file. */
- ret = _vfiprintf_r (_REENT, &f, fmt, ap);
+ ret = _vfiprintf_r (ptr, &f, fmt, ap);
+ if (ret < EOF)
+ ptr->_errno = EOVERFLOW;
if (size > 0)
*f._p = 0;
return ret;
int ret;
FILE f;
+ if (size > INT_MAX)
+ {
+ ptr->_errno = EOVERFLOW;
+ return EOF;
+ }
f._flags = __SWR | __SSTR;
f._bf._base = f._p = (unsigned char *) str;
f._bf._size = f._w = (size > 0 ? size - 1 : 0);
f._file = -1; /* No file. */
ret = _vfiprintf_r (ptr, &f, fmt, ap);
+ if (ret < EOF)
+ ptr->_errno = EOVERFLOW;
if (size > 0)
*f._p = 0;
return ret;
/*
- * Copyright (c) 1990 The Regents of the University of California.
+ * Copyright (c) 1990, 2007 The Regents of the University of California.
* All rights reserved.
*
* Redistribution and use in source and binary forms are permitted
#else
#include <varargs.h>
#endif
+#include <errno.h>
#ifndef _REENT_ONLY
{
int ret;
FILE f;
+ struct _reent *ptr = _REENT;
+ if (size > INT_MAX)
+ {
+ ptr->_errno = EOVERFLOW;
+ return EOF;
+ }
f._flags = __SWR | __SSTR;
f._bf._base = f._p = (unsigned char *) str;
f._bf._size = f._w = (size > 0 ? size - 1 : 0);
f._file = -1; /* No file. */
- ret = _vfprintf_r (_REENT, &f, fmt, ap);
+ ret = _vfprintf_r (ptr, &f, fmt, ap);
+ if (ret < EOF)
+ ptr->_errno = EOVERFLOW;
if (size > 0)
*f._p = 0;
return ret;
int ret;
FILE f;
+ if (size > INT_MAX)
+ {
+ ptr->_errno = EOVERFLOW;
+ return EOF;
+ }
f._flags = __SWR | __SSTR;
f._bf._base = f._p = (unsigned char *) str;
f._bf._size = f._w = (size > 0 ? size - 1 : 0);
f._file = -1; /* No file. */
ret = _vfprintf_r (ptr, &f, fmt, ap);
+ if (ret < EOF)
+ ptr->_errno = EOVERFLOW;
if (size > 0)
*f._p = 0;
return ret;
/*
- * Copyright (c) 1990 The Regents of the University of California.
+ * Copyright (c) 1990, 2007 The Regents of the University of California.
* All rights reserved.
*
* Redistribution and use in source and binary forms are permitted
*/
fp->_w = fp->_lbfsize;
- if (cantwrite (fp))
+ if (cantwrite (ptr, fp))
{
fp->_flags |= __SERR;
ptr->_errno = EBADF;
/* No user fns here. Pesch 15apr92. */
/*
- * Copyright (c) 1990 The Regents of the University of California.
+ * Copyright (c) 1990, 2007 The Regents of the University of California.
* All rights reserved.
*
* Redistribution and use in source and binary forms are permitted
*/
int
-_DEFUN(__swsetup, (fp),
+_DEFUN(__swsetup_r, (ptr, fp),
+ struct _reent *ptr _AND
register FILE * fp)
{
/* Make sure stdio is set up. */
{
/* clobber any ungetc data */
if (HASUB (fp))
- FREEUB (fp);
+ FREEUB (ptr, fp);
fp->_flags &= ~(__SRD | __SEOF);
fp->_r = 0;
fp->_p = fp->_bf._base;
*/
if (fp->_bf._base == NULL
&& (!(fp->_flags & __SSTR) || (fp->_flags & __SMBF)))
- __smakebuf (fp);
+ __smakebuf_r (ptr, fp);
if (fp->_flags & __SLBF)
{
else
fp->_w = fp->_flags & __SNBF ? 0 : fp->_bf._size;
- return 0;
+ return (!fp->_bf._base && (fp->_flags & __SMBF)) ? EOF : 0;
}
OSDN Git Service
