Libc-1439.100.3.tar.gz

[apple/libc.git] / stdio / FreeBSD / fgetln.c

diff --git a/stdio/FreeBSD/fgetln.c b/stdio/FreeBSD/fgetln.c
index 334e21d8b86c9624c6cf9f3712cff088ed94c335..8de4aa92e1f992541741cb560d7cd1b1440e2b70 100644 (file)
--- a/stdio/FreeBSD/fgetln.c
+++ b/stdio/FreeBSD/fgetln.c
@@ -13,10 +13,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
  * 4. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
@@ -38,9 +34,10 @@
 static char sccsid[] = "@(#)fgetln.c   8.2 (Berkeley) 1/2/94";
 #endif /* LIBC_SCCS and not lint */
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetln.c,v 1.8 2002/03/22 21:53:04 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fgetln.c,v 1.11 2007/01/09 00:28:06 imp Exp $");
 
 #include "namespace.h"
+#include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -55,8 +52,8 @@ __FBSDID("$FreeBSD: src/lib/libc/stdio/fgetln.c,v 1.8 2002/03/22 21:53:04 obrien
  * so we add 1 here.
 #endif
  */
-static int
-slbexpand(FILE *fp, size_t newsize)
+int
+__slbexpand(FILE *fp, size_t newsize)
 {
        void *p;
 
@@ -65,6 +62,10 @@ slbexpand(FILE *fp, size_t newsize)
 #endif
        if (fp->_lb._size >= newsize)
                return (0);
+       if (newsize > INT_MAX) {
+               errno = ENOMEM;
+               return (-1);
+       }
        if ((p = realloc(fp->_lb._base, newsize)) == NULL)
                return (-1);
        fp->_lb._base = p;
@@ -87,6 +88,7 @@ fgetln(FILE *fp, size_t *lenp)
        size_t off;
 
        FLOCKFILE(fp);
+       ORIENT(fp, -1);
        /* make sure there is input */
        if (fp->_r <= 0 && __srefill(fp)) {
                *lenp = 0;
@@ -131,7 +133,7 @@ fgetln(FILE *fp, size_t *lenp)
                 * file buffer to line buffer, refill file and look for
                 * newline.  The loop stops only when we find a newline.
                 */
-               if (slbexpand(fp, len + OPTIMISTIC))
+               if (__slbexpand(fp, len + OPTIMISTIC))
                        goto error;
                (void)memcpy((void *)(fp->_lb._base + off), (void *)fp->_p,
                    len - off);
@@ -145,7 +147,7 @@ fgetln(FILE *fp, size_t *lenp)
                p++;
                diff = p - fp->_p;
                len += diff;
-               if (slbexpand(fp, len))
+               if (__slbexpand(fp, len))
                        goto error;
                (void)memcpy((void *)(fp->_lb._base + off), (void *)fp->_p,
                    diff);
@@ -162,6 +164,7 @@ fgetln(FILE *fp, size_t *lenp)
 
 error:
        *lenp = 0;              /* ??? */
+       fp->_flags |= __SERR;
        FUNLOCKFILE(fp);
        return (NULL);          /* ??? */
 }