Mercurial > hg > octave-nkf > gnulib-hg
changeset 1866:ac8a74ce72cd
(readline): Append trailing newline to line.
author | Jim Meyering <jim@meyering.net> |
---|---|
date | Sun, 04 Jul 1999 10:06:42 +0000 |
parents | b7012e04c0f4 |
children | 8cac4427bbda |
files | lib/linebuffer.c |
diffstat | 1 files changed, 17 insertions(+), 18 deletions(-) [+] |
line wrap: on
line diff
--- 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 @@ } /* 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 @@ 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; }