X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Flinebuffer.c;h=90e4cca869ab86613c6be75e0c1fa90ab11f9164;hb=4565266f776db0d78b2c207a5fe79f929f9806ca;hp=c12cdbd4a3bdfce95b4486dceb69153c425e3326;hpb=917752adb19961999cd68c6c961efffe33c85141;p=gnulib.git
diff --git a/lib/linebuffer.c b/lib/linebuffer.c
index c12cdbd4a..90e4cca86 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 Free
- Software Foundation, Inc.
+ Copyright (C) 1986, 1991, 1998, 1999, 2001, 2003, 2004, 2006, 2007
+ 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,14 +14,11 @@
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 . */
/* Written by Richard Stallman. */
-
-#ifdef HAVE_CONFIG_H
-# include
-#endif
+
+#include
#include
#include
@@ -42,17 +39,25 @@ initbuffer (struct linebuffer *linebuffer)
memset (linebuffer, 0, sizeof *linebuffer);
}
+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.
- 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.
+ 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 newline) is returned in linebuffer->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 *
-readlinebuffer (struct linebuffer *linebuffer, FILE *stream)
+readlinebuffer_delim (struct linebuffer *linebuffer, FILE *stream,
+ char delimiter)
{
int c;
char *buffer = linebuffer->buffer;
@@ -69,9 +74,9 @@ readlinebuffer (struct linebuffer *linebuffer, FILE *stream)
{
if (p == buffer || ferror (stream))
return NULL;
- if (p[-1] == '\n')
+ if (p[-1] == delimiter)
break;
- c = '\n';
+ c = delimiter;
}
if (p == end)
{
@@ -83,7 +88,7 @@ readlinebuffer (struct linebuffer *linebuffer, FILE *stream)
}
*p++ = c;
}
- while (c != '\n');
+ while (c != delimiter);
linebuffer->length = p - buffer;
return linebuffer;