projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tests for module 'logbl'.
[gnulib.git]
/
lib
/
linebuffer.c
diff --git
a/lib/linebuffer.c
b/lib/linebuffer.c
index
3f1e45b
..
b5109e6
100644
(file)
--- a/
lib/linebuffer.c
+++ b/
lib/linebuffer.c
@@
-1,12
+1,12
@@
/* linebuffer.c -- read arbitrarily long lines
/* linebuffer.c -- read arbitrarily long lines
- Copyright (C) 1986, 1991, 1998
, 1999, 2001, 2003, 2004, 2006 Free
- Software Foundation, Inc.
+ Copyright (C) 1986, 1991, 1998
-1999, 2001, 2003-2004, 2006-2007, 2009-2012
+
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
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
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
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. */
/* Written by Richard Stallman. */
@@
-40,17
+39,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;
@@
-64,24
+71,24
@@
readlinebuffer (struct linebuffer *linebuffer, FILE *stream)
{
c = getc (stream);
if (c == EOF)
{
c = getc (stream);
if (c == EOF)
- {
- if (p == buffer || ferror (stream))
- return NULL;
-
if (p[-1] == '\n'
)
- break;
-
c = '\n'
;
- }
+
{
+
if (p == buffer || ferror (stream))
+
return NULL;
+
if (p[-1] == delimiter
)
+
break;
+
c = delimiter
;
+
}
if (p == end)
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;
}
*p++ = c;
}
- while (c !=
'\n'
);
+ while (c !=
delimiter
);
linebuffer->length = p - buffer;
return linebuffer;
linebuffer->length = p - buffer;
return linebuffer;