projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(MAXSIZE): New macro.
[gnulib.git]
/
lib
/
linebuffer.c
diff --git
a/lib/linebuffer.c
b/lib/linebuffer.c
index
e169a98
..
c12cdbd
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
Free Softwar
e
- Foundation, Inc.
+ Copyright (C) 1986, 1991, 1998, 1999, 2001, 2003
, 2004 Fre
e
+
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
@@
-25,19
+25,21
@@
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <sys/types.h>
#include "linebuffer.h"
#include <sys/types.h>
#include "linebuffer.h"
-#include "unlocked-io.h"
#include "xalloc.h"
#include "xalloc.h"
+#if USE_UNLOCKED_IO
+# include "unlocked-io.h"
+#endif
+
/* Initialize linebuffer LINEBUFFER for use. */
void
initbuffer (struct linebuffer *linebuffer)
{
/* 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.
}
/* Read an arbitrarily long line of text from STREAM into LINEBUFFER.
@@
-45,7
+47,9
@@
initbuffer (struct linebuffer *linebuffer)
that ends in a non-newline character. Do not null terminate.
Therefore the stream can contain NUL bytes, and the length
(including the newline) is returned in linebuffer->length.
that ends in a non-newline character. Do not null terminate.
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.
+ 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)
Otherwise, return LINEBUFFER. */
struct linebuffer *
readlinebuffer (struct linebuffer *linebuffer, FILE *stream)
@@
-55,7
+59,7
@@
readlinebuffer (struct linebuffer *linebuffer, FILE *stream)
char *p = linebuffer->buffer;
char *end = buffer + linebuffer->size; /* Sentinel. */
char *p = linebuffer->buffer;
char *end = buffer + linebuffer->size; /* Sentinel. */
- if (feof (stream)
|| ferror (stream)
)
+ if (feof (stream))
return NULL;
do
return NULL;
do
@@
-63,7
+67,7
@@
readlinebuffer (struct linebuffer *linebuffer, FILE *stream)
c = getc (stream);
if (c == EOF)
{
c = getc (stream);
if (c == EOF)
{
- if (p == buffer)
+ if (p == buffer
|| ferror (stream)
)
return NULL;
if (p[-1] == '\n')
break;
return NULL;
if (p[-1] == '\n')
break;
@@
-71,9
+75,9
@@
readlinebuffer (struct linebuffer *linebuffer, FILE *stream)
}
if (p == end)
{
}
if (p == end)
{
-
linebuffer->size *= 2
;
- buffer = x
realloc (buffer,
linebuffer->size);
- p =
p - linebuffer->buffer + buffer
;
+
size_t oldsize = linebuffer->size
;
+ buffer = x
2realloc (buffer, &
linebuffer->size);
+ p =
buffer + oldsize
;
linebuffer->buffer = buffer;
end = buffer + linebuffer->size;
}
linebuffer->buffer = buffer;
end = buffer + linebuffer->size;
}
@@
-85,11
+89,10
@@
readlinebuffer (struct linebuffer *linebuffer, FILE *stream)
return linebuffer;
}
return linebuffer;
}
-/* Free
linebuffer LINEBUFFER and its data, all allocated with malloc.
*/
+/* Free
the buffer that was allocated for linebuffer LINEBUFFER.
*/
void
freebuffer (struct linebuffer *linebuffer)
{
free (linebuffer->buffer);
void
freebuffer (struct linebuffer *linebuffer)
{
free (linebuffer->buffer);
- free (linebuffer);
}
}