aboutsummaryrefslogtreecommitdiff
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.c42
1 files changed, 8 insertions, 34 deletions
diff --git a/libbb/get_line_from_file.c b/libbb/get_line_from_file.c
index 9be10687b..a98dd35eb 100644
--- a/libbb/get_line_from_file.c
+++ b/libbb/get_line_from_file.c
@@ -11,45 +11,24 @@
11 11
12#include "libbb.h" 12#include "libbb.h"
13 13
14/* This function reads an entire line from a text file, up to a newline 14char* FAST_FUNC bb_get_chunk_from_file(FILE *file, int *end)
15 * or NUL byte, inclusive. It returns a malloc'ed char * which
16 * must be free'ed by the caller. If end is NULL '\n' isn't considered
17 * end of line. If end isn't NULL, length of the chunk is stored in it.
18 * If lineno is not NULL, *lineno is incremented for each line,
19 * and also trailing '\' is recognized as line continuation.
20 *
21 * Returns NULL if EOF/error. */
22char* FAST_FUNC bb_get_chunk_with_continuation(FILE *file, int *end, int *lineno)
23{ 15{
24 int ch; 16 int ch;
25 int idx = 0; 17 unsigned idx = 0;
26 char *linebuf = NULL; 18 char *linebuf = NULL;
27 int linebufsz = 0;
28 19
29 while ((ch = getc(file)) != EOF) { 20 while ((ch = getc(file)) != EOF) {
30 /* grow the line buffer as necessary */ 21 /* grow the line buffer as necessary */
31 if (idx >= linebufsz) { 22 if (!(idx & 0xff))
32 linebufsz += 256; 23 linebuf = xrealloc(linebuf, idx + 0x100);
33 linebuf = xrealloc(linebuf, linebufsz);
34 }
35 linebuf[idx++] = (char) ch; 24 linebuf[idx++] = (char) ch;
36 if (!ch) 25 if (ch == '\0')
26 break;
27 if (end && ch == '\n')
37 break; 28 break;
38 if (end && ch == '\n') {
39 if (lineno == NULL)
40 break;
41 (*lineno)++;
42 if (idx < 2 || linebuf[idx-2] != '\\')
43 break;
44 idx -= 2;
45 }
46 } 29 }
47 if (end) { 30 if (end)
48 *end = idx; 31 *end = idx;
49 /* handle corner case when the file is not ended with '\n' */
50 if (ch == EOF && lineno != NULL)
51 (*lineno)++;
52 }
53 if (linebuf) { 32 if (linebuf) {
54 // huh, does fgets discard prior data on error like this? 33 // huh, does fgets discard prior data on error like this?
55 // I don't think so.... 34 // I don't think so....
@@ -63,11 +42,6 @@ char* FAST_FUNC bb_get_chunk_with_continuation(FILE *file, int *end, int *lineno
63 return linebuf; 42 return linebuf;
64} 43}
65 44
66char* FAST_FUNC bb_get_chunk_from_file(FILE *file, int *end)
67{
68 return bb_get_chunk_with_continuation(file, end, NULL);
69}
70
71/* Get line, including trailing \n if any */ 45/* Get line, including trailing \n if any */
72char* FAST_FUNC xmalloc_fgets(FILE *file) 46char* FAST_FUNC xmalloc_fgets(FILE *file)
73{ 47{