projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
*** empty log message ***
[gnulib.git]
/
lib
/
linebuffer.c
diff --git
a/lib/linebuffer.c
b/lib/linebuffer.c
index
b7e875b
..
8374a8a
100644
(file)
--- a/
lib/linebuffer.c
+++ b/
lib/linebuffer.c
@@
-1,5
+1,5
@@
/* linebuffer.c -- read arbitrarily long lines
/* linebuffer.c -- read arbitrarily long lines
- Copyright (C) 1986, 1991, 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1986, 1991, 1998, 1999
, 2001
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
@@
-22,10
+22,11
@@
#endif
#include <stdio.h>
#endif
#include <stdio.h>
+#include <sys/types.h>
#include "linebuffer.h"
#include "linebuffer.h"
+#include "unlocked-io.h"
+#include "xalloc.h"
-char *xmalloc ();
-char *xrealloc ();
void free ();
/* Initialize linebuffer LINEBUFFER for use. */
void free ();
/* Initialize linebuffer LINEBUFFER for use. */
@@
-35,14
+36,16
@@
initbuffer (struct linebuffer *linebuffer)
{
linebuffer->length = 0;
linebuffer->size = 200;
{
linebuffer->length = 0;
linebuffer->size = 200;
- linebuffer->buffer =
(char *)
xmalloc (linebuffer->size);
+ linebuffer->buffer = xmalloc (linebuffer->size);
}
/* 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.
}
/* 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.
- Return LINEBUFFER, except at end of file return 0. */
-
+ Therefore the stream can contain NUL bytes, and the length
+ (including the newline) is returned in linebuffer->length.
+ Return NULL upon error, or when STREAM is empty.
+ Otherwise, return LINEBUFFER. */
struct linebuffer *
readline (struct linebuffer *linebuffer, FILE *stream)
{
struct linebuffer *
readline (struct linebuffer *linebuffer, FILE *stream)
{
@@
-52,7
+55,7
@@
readline (struct linebuffer *linebuffer, FILE *stream)
char *end = buffer + linebuffer->size; /* Sentinel. */
if (feof (stream) || ferror (stream))
char *end = buffer + linebuffer->size; /* Sentinel. */
if (feof (stream) || ferror (stream))
- return
0
;
+ return
NULL
;
do
{
do
{
@@
-60,7
+63,7
@@
readline (struct linebuffer *linebuffer, FILE *stream)
if (c == EOF)
{
if (p == buffer)
if (c == EOF)
{
if (p == buffer)
- return
0
;
+ return
NULL
;
if (p[-1] == '\n')
break;
c = '\n';
if (p[-1] == '\n')
break;
c = '\n';
@@
-68,7
+71,7
@@
readline (struct linebuffer *linebuffer, FILE *stream)
if (p == end)
{
linebuffer->size *= 2;
if (p == end)
{
linebuffer->size *= 2;
- buffer =
(char *)
xrealloc (buffer, linebuffer->size);
+ buffer = xrealloc (buffer, linebuffer->size);
p = p - linebuffer->buffer + buffer;
linebuffer->buffer = buffer;
end = buffer + linebuffer->size;
p = p - linebuffer->buffer + buffer;
linebuffer->buffer = buffer;
end = buffer + linebuffer->size;