summaryrefslogtreecommitdiff
path: root/libbb/get_line_from_file.c
diff options
context:
space:
mode:
Diffstat (limited to 'libbb/get_line_from_file.c')
-rw-r--r--libbb/get_line_from_file.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/libbb/get_line_from_file.c b/libbb/get_line_from_file.c
index 969d808cf..b424d59e9 100644
--- a/libbb/get_line_from_file.c
+++ b/libbb/get_line_from_file.c
@@ -9,11 +9,9 @@
9 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. 9 * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
10 */ 10 */
11 11
12#include <stdio.h>
13#include <stdlib.h>
14#include "libbb.h" 12#include "libbb.h"
15 13
16/* get_line_from_file() - This function reads an entire line from a text file, 14/* This function reads an entire line from a text file,
17 * up to a newline or NUL byte. It returns a malloc'ed char * which must be 15 * up to a newline or NUL byte. It returns a malloc'ed char * which must be
18 * stored and free'ed by the caller. If end is null '\n' isn't considered 16 * stored and free'ed by the caller. If end is null '\n' isn't considered
19 * end of line. If end isn't null, length of the chunk read is stored in it. */ 17 * end of line. If end isn't null, length of the chunk read is stored in it. */
@@ -37,10 +35,12 @@ char *bb_get_chunk_from_file(FILE * file, int *end)
37 if (end) 35 if (end)
38 *end = idx; 36 *end = idx;
39 if (linebuf) { 37 if (linebuf) {
40 if (ferror(file)) { 38 // huh, is fgets discards prior data on error like this?
41 free(linebuf); 39 // I don't think so....
42 return NULL; 40 //if (ferror(file)) {
43 } 41 // free(linebuf);
42 // return NULL;
43 //}
44 linebuf = xrealloc(linebuf, idx+1); 44 linebuf = xrealloc(linebuf, idx+1);
45 linebuf[idx] = 0; 45 linebuf[idx] = 0;
46 } 46 }