summaryrefslogtreecommitdiff
path: root/libbb/get_line_from_file.c
diff options
context:
space:
mode:
authorDenis Vlasenko2006-12-02 17:58:10 +0000
committerDenis Vlasenko2006-12-02 17:58:10 +0000
commit8b22b07bc599ca39d1b42cabef98189894b2162f (patch)
tree64ba681d4e88c20dcb36b2c0c2269e8d4aa5eba5 /libbb/get_line_from_file.c
parentbecd8c538cc689460dca83ecc92222969059c5f4 (diff)
downloadbusybox-8b22b07bc599ca39d1b42cabef98189894b2162f.zip
busybox-8b22b07bc599ca39d1b42cabef98189894b2162f.tar.gz
sed: improve handling of NULs
Diffstat (limited to 'libbb/get_line_from_file.c')
-rw-r--r--libbb/get_line_from_file.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libbb/get_line_from_file.c b/libbb/get_line_from_file.c
index b424d59..3f2c609 100644
--- a/libbb/get_line_from_file.c
+++ b/libbb/get_line_from_file.c
@@ -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;
}