projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New module, file-set.
[gnulib.git]
/
lib
/
linebuffer.c
diff --git
a/lib/linebuffer.c
b/lib/linebuffer.c
index
96d26bd
..
77f2a04
100644
(file)
--- a/
lib/linebuffer.c
+++ b/
lib/linebuffer.c
@@
-1,7
+1,7
@@
/* linebuffer.c -- read arbitrarily long lines
/* 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
it under the terms of the GNU General Public License as published by
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
@@
-18,10
+18,8
@@
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
/* Written by Richard Stallman. */
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
/* Written by Richard Stallman. */
-
\f
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+
+#include <config.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
@@
-42,17
+40,25
@@
initbuffer (struct linebuffer *linebuffer)
memset (linebuffer, 0, sizeof *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.
/* 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
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 *
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;
{
int c;
char *buffer = linebuffer->buffer;
@@
-69,9
+75,9
@@
readlinebuffer (struct linebuffer *linebuffer, FILE *stream)
{
if (p == buffer || ferror (stream))
return NULL;
{
if (p == buffer || ferror (stream))
return NULL;
- if (p[-1] ==
'\n'
)
+ if (p[-1] ==
delimiter
)
break;
break;
- c =
'\n'
;
+ c =
delimiter
;
}
if (p == end)
{
}
if (p == end)
{
@@
-83,7
+89,7
@@
readlinebuffer (struct linebuffer *linebuffer, FILE *stream)
}
*p++ = c;
}
}
*p++ = c;
}
- while (c !=
'\n'
);
+ while (c !=
delimiter
);
linebuffer->length = p - buffer;
return linebuffer;
linebuffer->length = p - buffer;
return linebuffer;