X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Flinebuffer.c;h=c12cdbd4a3bdfce95b4486dceb69153c425e3326;hb=5e6933eb225721fac1de4a8abf6c0da985ddaa6a;hp=bed5d94fb889b8fd7716a4ed794558243a87b4b8;hpb=b5f4d75d1105dc9db66ee09164c3e03bedc9ebe7;p=gnulib.git

diff --git a/lib/linebuffer.c b/lib/linebuffer.c
index bed5d94fb..c12cdbd4a 100644
--- a/lib/linebuffer.c
+++ b/lib/linebuffer.c
@@ -1,7 +1,7 @@
 /* linebuffer.c -- read arbitrarily long lines
 
-   Copyright (C) 1986, 1991, 1998, 1999, 2001, 2003 Free Software
-   Foundation, Inc.
+   Copyright (C) 1986, 1991, 1998, 1999, 2001, 2003, 2004 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
@@ -25,19 +25,21 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/types.h>
 #include "linebuffer.h"
-#include "unlocked-io.h"
 #include "xalloc.h"
 
+#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 = xmalloc (linebuffer->size);
+  memset (linebuffer, 0, sizeof *linebuffer);
 }
 
 /* Read an arbitrarily long line of text from STREAM into LINEBUFFER.
@@ -73,9 +75,9 @@ readlinebuffer (struct linebuffer *linebuffer, FILE *stream)
 	}
       if (p == end)
 	{
-	  linebuffer->size *= 2;
-	  buffer = xrealloc (buffer, linebuffer->size);
-	  p = p - linebuffer->buffer + buffer;
+	  size_t oldsize = linebuffer->size;
+	  buffer = x2realloc (buffer, &linebuffer->size);
+	  p = buffer + oldsize;
 	  linebuffer->buffer = buffer;
 	  end = buffer + linebuffer->size;
 	}