X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Flinebuffer.c;h=d1582fe3e77a3415b46f90c78816e84c406b27b8;hb=1276a2c5f24c0c932426aca9c899fa524d2443f2;hp=77f2a047a409e616046608a62e81ec2e9b94595b;hpb=1b343b87f94470fb214cbdb7eac5ea283dacab9b;p=gnulib.git

diff --git a/lib/linebuffer.c b/lib/linebuffer.c
index 77f2a047a..d1582fe3e 100644
--- a/lib/linebuffer.c
+++ b/lib/linebuffer.c
@@ -1,12 +1,12 @@
 /* linebuffer.c -- read arbitrarily long lines
 
-   Copyright (C) 1986, 1991, 1998, 1999, 2001, 2003, 2004, 2006, 2007
+   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
+   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
@@ -14,8 +14,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by Richard Stallman. */
 
@@ -58,7 +57,7 @@ readlinebuffer (struct linebuffer *linebuffer, FILE *stream)
    Otherwise, return LINEBUFFER.  */
 struct linebuffer *
 readlinebuffer_delim (struct linebuffer *linebuffer, FILE *stream,
-		      char delimiter)
+                      char delimiter)
 {
   int c;
   char *buffer = linebuffer->buffer;
@@ -72,21 +71,21 @@ readlinebuffer_delim (struct linebuffer *linebuffer, FILE *stream,
     {
       c = getc (stream);
       if (c == EOF)
-	{
-	  if (p == buffer || ferror (stream))
-	    return NULL;
-	  if (p[-1] == delimiter)
-	    break;
-	  c = delimiter;
-	}
+        {
+          if (p == buffer || ferror (stream))
+            return NULL;
+          if (p[-1] == delimiter)
+            break;
+          c = delimiter;
+        }
       if (p == end)
-	{
-	  size_t oldsize = linebuffer->size;
-	  buffer = x2realloc (buffer, &linebuffer->size);
-	  p = buffer + oldsize;
-	  linebuffer->buffer = buffer;
-	  end = buffer + linebuffer->size;
-	}
+        {
+          size_t oldsize = linebuffer->size;
+          buffer = x2realloc (buffer, &linebuffer->size);
+          p = buffer + oldsize;
+          linebuffer->buffer = buffer;
+          end = buffer + linebuffer->size;
+        }
       *p++ = c;
     }
   while (c != delimiter);