X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgetndelim2.c;h=6f0868999525c671560ad97759abc0dec2de4cff;hb=df308e3fc0bbea8e50977ab1e86e4ddf124606d8;hp=bceb70fbe71671e5749f5f3f087d3731b4de291f;hpb=ef2f334e88fcd5daffc4c72dfc51794927c75920;p=gnulib.git

diff --git a/lib/getndelim2.c b/lib/getndelim2.c
index bceb70fbe..6f0868999 100644
--- a/lib/getndelim2.c
+++ b/lib/getndelim2.c
@@ -1,4 +1,5 @@
-/* getndelim2 - Core of getline, getdelim, getnline, getndelim.
+/* getndelim2 - Read a line from a stream, stopping at one of 2 delimiters,
+   with bounded memory allocation.
 
    Copyright (C) 1993, 1996, 1997, 1998, 2000, 2003 Free Software
    Foundation, Inc.
@@ -17,28 +18,23 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
-#if STDC_HEADERS
-# include <stdlib.h>
-#else
-char *malloc (), *realloc ();
+/* Originally written by Jan Brittenson, bson@gnu.ai.mit.edu.  */
+
+#if HAVE_CONFIG_H
+# include <config.h>
 #endif
 
+/* Specification.  */
+#include "getndelim2.h"
+
+#include <stdlib.h>
+
 #include "unlocked-io.h"
 
 /* Always add at least this many bytes when extending the buffer.  */
 #define MIN_CHUNK 64
 
-/* Read up to (and including) a delimiter DELIM1 from STREAM into *LINEPTR
-   + OFFSET (and NUL-terminate it).  If DELIM2 is non-zero, then read up
-   and including the first occurrence of DELIM1 or DELIM2.  *LINEPTR is
-   a pointer returned from malloc (or NULL), pointing to *LINESIZE bytes of
-   space.  It is realloc'd as necessary.  Reallocation is limited to
-   NMAX bytes; if the line is longer than that, the extra bytes are read but
-   thrown away.
-   Return the number of bytes read and stored at *LINEPTR + OFFSET (not
-   including the NUL terminator), or -1 on error or EOF.  */
-
-static int
+ssize_t
 getndelim2 (char **lineptr, size_t *linesize, size_t nmax,
 	    FILE *stream, int delim1, int delim2, size_t offset)
 {
@@ -74,7 +70,7 @@ getndelim2 (char **lineptr, size_t *linesize, size_t nmax,
     {
       /* Here always *lineptr + *linesize == read_pos + nbytes_avail.  */
 
-      register int c = getc (stream);
+      register int c;
 
       /* We always want at least one char left in the buffer, since we
 	 always (unless we get an error while reading the first char)
@@ -99,7 +95,8 @@ getndelim2 (char **lineptr, size_t *linesize, size_t nmax,
 	    }
 	}
 
-      if (c == EOF || ferror (stream))
+      c = getc (stream);
+      if (c == EOF)
 	{
 	  /* Return partial line, if any.  */
 	  if (read_pos == *lineptr)