diff options
author | Jim Meyering <jim@meyering.net> | 1999-07-04 10:06:42 +0000 |
---|---|---|
committer | Jim Meyering <jim@meyering.net> | 1999-07-04 10:06:42 +0000 |
commit | ade79def12b42c40afa2d4bd47989ee40df7fe98 (patch) | |
tree | 1bdaccde31d9976b42989bde7eb9f24ceb331275 /lib/linebuffer.c | |
parent | c1a9d5a365f1d949726a99480b114a456c5263b7 (diff) | |
download | gnulib-ade79def12b42c40afa2d4bd47989ee40df7fe98.tar.gz |
(readline): Append trailing newline to line.
Diffstat (limited to 'lib/linebuffer.c')
-rw-r--r-- | lib/linebuffer.c | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/lib/linebuffer.c b/lib/linebuffer.c index c1a696acc9..b7e875be75 100644 --- a/lib/linebuffer.c +++ b/lib/linebuffer.c @@ -1,5 +1,5 @@ /* linebuffer.c -- read arbitrarily long lines - Copyright (C) 1986, 1991, 1998 Free Software Foundation, Inc. + Copyright (C) 1986, 1991, 1998, 1999 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 @@ -39,9 +39,9 @@ initbuffer (struct linebuffer *linebuffer) } /* Read an arbitrarily long line of text from STREAM into LINEBUFFER. - Remove any newline. Does not null terminate. - Return zero upon error or upon end of file. - Otherwise, return 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. */ struct linebuffer * readline (struct linebuffer *linebuffer, FILE *stream) @@ -52,33 +52,32 @@ readline (struct linebuffer *linebuffer, FILE *stream) char *end = buffer + linebuffer->size; /* Sentinel. */ if (feof (stream) || ferror (stream)) - { - linebuffer->length = 0; - return 0; - } + return 0; - while (1) + do { c = getc (stream); + if (c == EOF) + { + if (p == buffer) + return 0; + if (p[-1] == '\n') + break; + c = '\n'; + } if (p == end) { linebuffer->size *= 2; buffer = (char *) xrealloc (buffer, linebuffer->size); - p += buffer - linebuffer->buffer; + p = p - linebuffer->buffer + buffer; linebuffer->buffer = buffer; end = buffer + linebuffer->size; } - if (c == EOF || c == '\n') - break; *p++ = c; } + while (c != '\n'); - if (feof (stream) && p == buffer) - { - linebuffer->length = 0; - return 0; - } - linebuffer->length = p - linebuffer->buffer; + linebuffer->length = p - buffer; return linebuffer; } |