randomconfig fixes

[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 968d7572df50cb2b6d0571ad125de8ba08ccd3e4..903ff1fb684c6f88f7b018df5ce2ec8e2c697f00 100644 (file)
--- a/libbb/get_line_from_file.c
+++ b/libbb/get_line_from_file.c
@@ -6,35 +6,27 @@
  * Copyright (C) 2004 Erik Andersen <andersen@codepoet.org>
  * Copyright (C) 2001 Matt Krai
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
-/* for getline() [GNUism] */
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE 1
-#endif
 #include "libbb.h"
 
-/* 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 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* FAST_FUNC bb_get_chunk_from_file(FILE *file, int *end)
+char* FAST_FUNC bb_get_chunk_from_file(FILE *file, size_t *end)
 {
        int ch;
-       int idx = 0;
+       size_t idx = 0;
        char *linebuf = NULL;
-       int linebufsz = 0;
 
        while ((ch = getc(file)) != EOF) {
                /* grow the line buffer as necessary */
-               if (idx >= linebufsz) {
-                       linebufsz += 80;
-                       linebuf = xrealloc(linebuf, linebufsz);
+               if (!(idx & 0xff)) {
+                       if (idx == ((size_t)-1) - 0xff)
+                               bb_die_memory_exhausted();
+                       linebuf = xrealloc(linebuf, idx + 0x100);
                }
                linebuf[idx++] = (char) ch;
-               if (!ch || (end && ch == '\n'))
+               if (ch == '\0')
+                       break;
+               if (end && ch == '\n')
                        break;
        }
        if (end)
@@ -55,14 +47,14 @@ char* FAST_FUNC bb_get_chunk_from_file(FILE *file, int *end)
 /* Get line, including trailing \n if any */
 char* FAST_FUNC xmalloc_fgets(FILE *file)
 {
-       int i;
+       size_t i;
 
        return bb_get_chunk_from_file(file, &i);
 }
 /* Get line.  Remove trailing \n */
 char* FAST_FUNC xmalloc_fgetline(FILE *file)
 {
-       int i;
+       size_t i;
        char *c = bb_get_chunk_from_file(file, &i);
 
        if (i && c[--i] == '\n')
@@ -72,7 +64,6 @@ char* FAST_FUNC xmalloc_fgetline(FILE *file)
 }
 
 #if 0
-
 /* GNUism getline() should be faster (not tested) than a loop with fgetc */
 
 /* Get line, including trailing \n if any */