projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adjust getdate's grammar to accept a slightly more regular language.
[gnulib.git]
/
lib
/
linebuffer.c
diff --git
a/lib/linebuffer.c
b/lib/linebuffer.c
index
e169a98
..
90e4cca
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
Free Software
- Foundation, Inc.
+ Copyright (C) 1986, 1991, 1998, 1999, 2001, 2003
, 2004, 2006, 2007
+ F
ree Software F
oundation, 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,48
+14,57
@@
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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
/* Written by Richard Stallman. */
/* 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>
+#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);
+}
+
+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.
- Return NULL upon error, or when STREAM is empty.
+ (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 *
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;
char *p = linebuffer->buffer;
char *end = buffer + linebuffer->size; /* Sentinel. */
{
int c;
char *buffer = linebuffer->buffer;
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,33
+72,32
@@
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;
return NULL;
- if (p[-1] ==
'\n'
)
+ if (p[-1] ==
delimiter
)
break;
break;
- c =
'\n'
;
+ c =
delimiter
;
}
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;
}
*p++ = c;
}
linebuffer->buffer = buffer;
end = buffer + linebuffer->size;
}
*p++ = c;
}
- while (c !=
'\n'
);
+ while (c !=
delimiter
);
linebuffer->length = p - buffer;
return linebuffer;
}
linebuffer->length = p - buffer;
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);
}
}