Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-01-03 00:31:16 +00:00
Code Issues Projects Releases Wiki Activity

- fix bug #887, in bb_get_chomped_line_from_file(), the last char was removed

Browse Source 
unconditionally, even if it was not a newline.
  This was apparently broken by r14254
- whitespace while at it.
This commit is contained in:
Bernhard Reutner-Fischer 2006-06-10 11:04:43 +00:00
parent 6ba8bbe88a
commit 2d1a6e7c1f
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libbb/get_line_from_file.c
View File

@ -18,7 +18,7 @@
* stored and free'ed by the caller. If end is null '\n' isn't considered * stored and free'ed by the caller. If end is null '\n' isn't considered
* and of line. If end isn't null, length of the chunk read is stored in it. */ * and of line. If end isn't null, length of the chunk read is stored in it. */
char *bb_get_chunk_from_file(FILE *file, int *end) char *bb_get_chunk_from_file(FILE * file, int *end)
{ {
int ch; int ch;
int idx = 0; int idx = 0;
@ -30,10 +30,12 @@ char *bb_get_chunk_from_file(FILE *file, int *end)
if (idx > linebufsz - 2) { if (idx > linebufsz - 2) {
linebuf = xrealloc(linebuf, linebufsz += 80); linebuf = xrealloc(linebuf, linebufsz += 80);
} }
linebuf[idx++] = (char)ch; linebuf[idx++] = (char) ch;
if (!ch || (end && ch == '\n')) break; if (!ch || (end && ch == '\n'))
break;
} }
if (end) *end = idx; if (end)
*end = idx;
if (linebuf) { if (linebuf) {
if (ferror(file)) { if (ferror(file)) {
free(linebuf); free(linebuf);
@ -45,18 +47,21 @@ char *bb_get_chunk_from_file(FILE *file, int *end)
} }
/* Get line, including trailing /n if any */ /* Get line, including trailing /n if any */
char *bb_get_line_from_file(FILE *file) char *bb_get_line_from_file(FILE * file)
{ {
int i; int i;
return bb_get_chunk_from_file(file, &i); return bb_get_chunk_from_file(file, &i);
} }
/* Get line. Remove trailing /n */ /* Get line. Remove trailing /n */
char *bb_get_chomped_line_from_file(FILE *file) char *bb_get_chomped_line_from_file(FILE * file)
{ {
int i; int i;
char *c=bb_get_chunk_from_file(file, &i); char *c = bb_get_chunk_from_file(file, &i);
if(i) c[--i]=0;
if (i && c[--i] == '\n')
c[i] = 0;
return c; return c;
} }