openvt,getty,vfork_daemon_rexec,mount: tighten up fd cleanup code

[oweals/busybox.git] / libbb / get_line_from_file.c

diff --git a/libbb/get_line_from_file.c b/libbb/get_line_from_file.c
index b424d59e913ade059c0434d85c12c545289b6311..2c9608e9edc2f00f2e3c12a1c5d525c7d736a770 100644 (file)
--- a/libbb/get_line_from_file.c
+++ b/libbb/get_line_from_file.c
@@ -11,10 +11,11 @@
 
 #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
- * 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. */
+/* 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.
+ * Return NULL if EOF/error */
 
 char *bb_get_chunk_from_file(FILE * file, int *end)
 {
@@ -25,7 +26,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 +36,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;
 }
@@ -62,7 +63,7 @@ char *xmalloc_getline(FILE * file)
        char *c = bb_get_chunk_from_file(file, &i);
 
        if (i && c[--i] == '\n')
-               c[i] = 0;
+               c[i] = '\0';
 
        return c;
 }