emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sed: improve handling of NULs

Browse Source
This commit is contained in:
Denis Vlasenko
2006-12-02 17:58:10 +00:00
parent becd8c538c
commit 8b22b07bc5
2 changed files with 68 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libbb/get_line_from_file.c
View File

@@ -11,8 +11,8 @@
#include "libbb.h"
/* This function reads an entire line from a text file,
* up to a newline or NUL byte. It returns a malloc'ed char * which must be
/* This function reads an entire line from a text file, up to a newline
* or NUL byte, inclusive. It returns a malloc'ed char * which must be
* stored and free'ed by the caller. If end is null '\n' isn't considered
* end of line. If end isn't null, length of the chunk read is stored in it. */
@@ -25,7 +25,7 @@ char *bb_get_chunk_from_file(FILE * file, int *end)
while ((ch = getc(file)) != EOF) {
/* grow the line buffer as necessary */
if (idx > linebufsz - 2) {
if (idx >= linebufsz) {
linebuf = xrealloc(linebuf, linebufsz += 80);
}
linebuf[idx++] = (char) ch;
@@ -35,14 +35,14 @@ char *bb_get_chunk_from_file(FILE * file, int *end)
if (end)
*end = idx;
if (linebuf) {
// huh, is fgets discards prior data on error like this?
// huh, does fgets discard prior data on error like this?
// I don't think so....
//if (ferror(file)) {
// free(linebuf);
// return NULL;
//}
linebuf = xrealloc(linebuf, idx+1);
linebuf[idx] = 0;
linebuf[idx] = '\0';
}
return linebuf;
}