X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Flinebuffer.c;h=d1582fe3e77a3415b46f90c78816e84c406b27b8;hb=7ef6c64e210ac0979d7e8ac69bc5b5208c2405ab;hp=cb0b6ba0020c1c44e0484e322fa58736ad755903;hpb=d59ff2bd82d9ab0053d740ebc25736c9804d4520;p=gnulib.git

diff --git a/lib/linebuffer.c b/lib/linebuffer.c
index cb0b6ba00..d1582fe3e 100644
--- a/lib/linebuffer.c
+++ b/lib/linebuffer.c
@@ -1,10 +1,12 @@
 /* linebuffer.c -- read arbitrarily long lines
-   Copyright (C) 1986, 1991, 1998, 1999 Free Software Foundation, Inc.
 
-   This program is free software; you can redistribute it and/or modify
+   Copyright (C) 1986, 1991, 1998-1999, 2001, 2003-2004, 2006-2007, 2009-2014
+   Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
-   any later version.
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,82 +14,90 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software Foundation,
-   Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by Richard Stallman. */
-
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+
+#include <config.h>
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 #include <sys/types.h>
 #include "linebuffer.h"
+#include "xalloc.h"
 
-char *xmalloc ();
-char *xrealloc ();
-void free ();
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
+#endif
 
 /* Initialize linebuffer LINEBUFFER for use. */
 
 void
 initbuffer (struct linebuffer *linebuffer)
 {
-  linebuffer->length = 0;
-  linebuffer->size = 200;
-  linebuffer->buffer = (char *) xmalloc (linebuffer->size);
+  memset (linebuffer, 0, sizeof *linebuffer);
 }
 
-/* Read an arbitrarily long line of text from STREAM into LINEBUFFER.
-   Keep the newline; append a newline if it's the last line of a file
-   that ends in a non-newline character.  Do not null terminate,
-   but leave room for an extra byte after the newline.
-   Return LINEBUFFER, except at end of file return 0.  */
+struct linebuffer *
+readlinebuffer (struct linebuffer *linebuffer, FILE *stream)
+{
+  return readlinebuffer_delim (linebuffer, stream, '\n');
+}
 
+/* Read an arbitrarily long line of text from STREAM into LINEBUFFER.
+   Consider lines to be terminated by DELIMITER.
+   Keep the delimiter; append DELIMITER if it's the last line of a file
+   that ends in a character other than DELIMITER.  Do not NUL-terminate.
+   Therefore the stream can contain NUL bytes, and the length
+   (including the delimiter) is returned in linebuffer->length.
+   Return NULL when stream is empty.  Return NULL and set errno upon
+   error; callers can distinguish this case from the empty case by
+   invoking ferror (stream).
+   Otherwise, return LINEBUFFER.  */
 struct linebuffer *
-readline (struct linebuffer *linebuffer, FILE *stream)
+readlinebuffer_delim (struct linebuffer *linebuffer, FILE *stream,
+                      char delimiter)
 {
   int c;
   char *buffer = linebuffer->buffer;
   char *p = linebuffer->buffer;
-  char *end = buffer + linebuffer->size - 1; /* Sentinel. */
+  char *end = buffer + linebuffer->size; /* Sentinel. */
 
-  if (feof (stream) || ferror (stream))
-    return 0;
+  if (feof (stream))
+    return NULL;
 
   do
     {
       c = getc (stream);
       if (c == EOF)
-	{
-	  if (p == buffer)
-	    return 0;
-	  if (p[-1] == '\n')
-	    break;
-	  c = '\n';
-	}
+        {
+          if (p == buffer || ferror (stream))
+            return NULL;
+          if (p[-1] == delimiter)
+            break;
+          c = delimiter;
+        }
       if (p == end)
-	{
-	  linebuffer->size *= 2;
-	  buffer = (char *) xrealloc (buffer, linebuffer->size);
-	  p = p - linebuffer->buffer + buffer;
-	  linebuffer->buffer = buffer;
-	  end = buffer + linebuffer->size - 1;
-	}
+        {
+          size_t oldsize = linebuffer->size;
+          buffer = x2realloc (buffer, &linebuffer->size);
+          p = buffer + oldsize;
+          linebuffer->buffer = buffer;
+          end = buffer + linebuffer->size;
+        }
       *p++ = c;
     }
-  while (c != '\n');
+  while (c != delimiter);
 
   linebuffer->length = p - buffer;
   return linebuffer;
 }
 
-/* Free linebuffer LINEBUFFER and its data, all allocated with malloc. */
+/* Free the buffer that was allocated for linebuffer LINEBUFFER.  */
 
 void
 freebuffer (struct linebuffer *linebuffer)
 {
   free (linebuffer->buffer);
-  free (linebuffer);
 }