 @@ -1,14 +1,14 @@
-/* $NetBSD: fgetstr.c,v 1.8 2009/10/15 00:36:24 roy Exp $	*/
+/* $NetBSD: fgetstr.c,v 1.9 2009/12/01 00:03:53 roy Exp $	*/
 /*
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Roy Marples.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -18,57 +18,61 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: fgetstr.c,v 1.8 2009/10/15 00:36:24 roy Exp $");
+__RCSID("$NetBSD: fgetstr.c,v 1.9 2009/12/01 00:03:53 roy Exp $");
 #include "namespace.h"
 #include <assert.h>
 #include <errno.h>
 #include <limits.h>
 #include <stdio.h>
 #include "reentrant.h"
 #include "local.h"
 /*
  * Get an input line.
  * This now uses getdelim(3) for a code reduction.
  * The upside is that strings are now always NULL terminated, but relying
  * on this is non portable - better to use the POSIX getdelim(3) function.
  */
 char *
 __fgetstr(FILE *__restrict fp, size_t *__restrict lenp, int sep)
+{
 	char *p;
 	size_t size;
 	ssize_t n;
 	_DIAGASSERT(fp != NULL);
 	_DIAGASSERT(lenp != NULL);
 	p = (char *)fp->_lb._base;
 	size = fp->_lb._size;
-	*lenp = __getdelim(&p, &size, sep, fp);
+	n = getdelim(&p, &size, sep, fp);
 	fp->_lb._base = (unsigned char *)p;
-	/* The struct size variable is only an int ..... */
+	/* The struct size variable is only an int .....
-	if (size > INT_MAX) {
+	 * This still works when exceeded, but the buffer could be
 	 * realloced needlessly. */
 	if (size > INT_MAX)
 		fp->_lb._size = INT_MAX;
-		errno = EOVERFLOW;
+	else
-		goto error;
+		fp->_lb._size = (int)size;
 	if (n == -1) {
 		*lenp = 0;
 		if (errno == EOVERFLOW) /* fixup errno */
 			errno = EINVAL;
 		return NULL;
+	}
-	fp->_lb._size = (int)size;
+	*lenp = n;
-	if (*lenp != 0 && *lenp < SIZE_MAX - 1)
+	return p;
 		return p;
 error:
 	*lenp = 0;
 	return NULL;
+}

 @@ -1,14 +1,14 @@
-/* $NetBSD: getdelim.c,v 1.7 2009/10/25 20:44:13 christos Exp $ */
+/* $NetBSD: getdelim.c,v 1.8 2009/12/01 00:03:53 roy Exp $ */
 /*
  * Copyright (c) 2009 The NetBSD Foundation, Inc.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Roy Marples.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -18,90 +18,88 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: getdelim.c,v 1.7 2009/10/25 20:44:13 christos Exp $");
+__RCSID("$NetBSD: getdelim.c,v 1.8 2009/12/01 00:03:53 roy Exp $");
 #include "namespace.h"
 #include <sys/param.h>
 #include <assert.h>
 #include <errno.h>
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include "reentrant.h"
 #include "local.h"
 /* Minimum buffer size we create.
  * This should allow config files to fit into our power of 2 buffer growth
  * without the need for a realloc. */
 #define MINBUF	128
 /* This private function allows strings of upto SIZE_MAX - 2
  * and returns 0 on EOF, both of which are disallowed by POSIX.
  * Maybe this should be named fgetdelim and proposed to the OpenGroup....*/
 ssize_t
-__getdelim(char **__restrict buf, size_t *__restrict buflen,
+getdelim(char **__restrict buf, size_t *__restrict buflen,
     int sep, FILE *__restrict fp)
+{
 	unsigned char *p;
 	size_t len, newlen, off;
 	char *newb;
 	_DIAGASSERT(fp != NULL);
 	if (buf == NULL || buflen == NULL) {
 		errno = EINVAL;
 		return -1;
+	}
 	/* If buf is NULL, we have to assume a size of zero */
 	if (*buf == NULL)
 		*buflen = 0;
 	FLOCKFILE(fp);
 	_SET_ORIENTATION(fp, -1);
 	off = 0;
-	for (;;) {
+	do {
 		/* If the input buffer is empty, refill it */
 		if (fp->_r <= 0 && __srefill(fp)) {
 			if (__sferror(fp))
 				goto error;
 			/* No error, so EOF. */
 			break;
+		}
 		/* Scan through looking for the separator */
 		p = memchr(fp->_p, sep, (size_t)fp->_r);
 		if (p == NULL)
 			len = fp->_r;
 		else
 			len = (p - fp->_p) + 1;
 		newlen = off + len + 1;
 		/* Ensure we can handle it */
-		if (newlen < off || newlen > SIZE_MAX - 2) {
+		if (newlen < off || newlen > (size_t)SSIZE_MAX + 1) {
 			errno = EOVERFLOW;
 			goto error;
+		}
 		if (newlen > *buflen) {
 			if (newlen < MINBUF)
 				newlen = MINBUF;
 			if (!powerof2(newlen)) {
 				/* Grow the buffer to the next power of 2 */
 				newlen--;
 				newlen |= newlen >> 1;
 				newlen |= newlen >> 2;
 				newlen |= newlen >> 4;
 				newlen |= newlen >> 8;
 @@ -114,43 +112,29 @@ __getdelim(char **__restrict buf, size_t
 			newb = realloc(*buf, newlen);
 			if (newb == NULL)
 				goto error;
 			*buf = newb;
 			*buflen = newlen;
+		}
 		(void)memcpy((*buf + off), fp->_p, len);
 		/* Safe, len is never greater than what fp->_r can fit. */
 		fp->_r -= (int)len;
 		fp->_p += (int)len;
 		off += len;
-		if (p != NULL)
+	} while (p == NULL);
 			break;
 	FUNLOCKFILE(fp);
 	/* POSIX demands we return -1 on EOF. */
 	if (off == 0)
 		return -1;
 	if (*buf != NULL)
 		*(*buf + off) = '\0';
 	return off;
 error:
 	fp->_flags |= __SERR;
 	FUNLOCKFILE(fp);
 	return -1;
+}
 ssize_t
 getdelim(char **__restrict buf, size_t *__restrict buflen,
     int sep, FILE *__restrict fp)
 	ssize_t len;
 	len = __getdelim(buf, buflen, sep, fp);
 	if (len == 0) {
 		/* POSIX requires that we return -1 on EOF */
 		return -1;
 	} else if (len < -1) {
 		/* POSIX requires no string larger than SSIZE_MAX */
 		errno = EOVERFLOW;
 		return -1;
 	return len;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: local.h,v 1.21 2009/09/24 20:38:53 roy Exp $	*/
+/*	$NetBSD: local.h,v 1.22 2009/12/01 00:03:53 roy Exp $	*/
 /*-
  * Copyright (c) 1990, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Chris Torek.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -65,28 +65,26 @@ extern int	__svfscanf_unlocked __P((FILE
 		    _BSD_VA_LIST_))
 		    __attribute__((__format__(__scanf__, 2, 0)));
 extern int	__vfprintf_unlocked __P((FILE * __restrict, const char * __restrict,
 		    _BSD_VA_LIST_));
 extern int	__sdidinit;
 extern int	__gettemp __P((char *, int *, int));
 extern wint_t	__fgetwc_unlock __P((FILE *));
 extern wint_t	__fputwc_unlock __P((wchar_t, FILE *));
 extern ssize_t	__getdelim __P((char ** __restrict, size_t * __restrict, int,
     FILE * __restrict));
 extern char	*__fgetstr __P((FILE * __restrict, size_t * __restrict, int));
 extern int 	 __vfwprintf_unlocked __P((FILE *, const wchar_t *,
     _BSD_VA_LIST_));
 extern int	 __vfwscanf_unlocked __P((FILE * __restrict,
     const wchar_t * __restrict, _BSD_VA_LIST_));
 /*
  * Return true iff the given FILE cannot be written now.
  */
 #define	cantwrite(fp) \
 	((((fp)->_flags & __SWR) == 0 || (fp)->_bf._base == NULL) && \
 	 __swsetup(fp))