diff options
author | Ron Yorston <rmy@pobox.com> | 2018-09-10 14:37:07 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2018-09-10 14:59:33 +0100 |
commit | d89ced75b204f0eb5611f522864beb81d1b393f5 (patch) | |
tree | 5daa31427e287fe079a0ef551097753773fdb266 /libbb/get_line_from_file.c | |
parent | f72845d9332fa6311a46dbcad3180d5008182982 (diff) | |
parent | 05b18065ab9c375f6185b65a3631d4c6cc1a4be9 (diff) | |
download | busybox-w32-d89ced75b204f0eb5611f522864beb81d1b393f5.tar.gz busybox-w32-d89ced75b204f0eb5611f522864beb81d1b393f5.tar.bz2 busybox-w32-d89ced75b204f0eb5611f522864beb81d1b393f5.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'libbb/get_line_from_file.c')
-rw-r--r-- | libbb/get_line_from_file.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libbb/get_line_from_file.c b/libbb/get_line_from_file.c index 09ccfba67..929bab78a 100644 --- a/libbb/get_line_from_file.c +++ b/libbb/get_line_from_file.c | |||
@@ -47,7 +47,9 @@ char* FAST_FUNC bb_get_chunk_from_file(FILE *file, size_t *end) | |||
47 | /* Get line, including trailing \n if any */ | 47 | /* Get line, including trailing \n if any */ |
48 | char* FAST_FUNC xmalloc_fgets(FILE *file) | 48 | char* FAST_FUNC xmalloc_fgets(FILE *file) |
49 | { | 49 | { |
50 | return bb_get_chunk_from_file(file, NULL); | 50 | size_t i; |
51 | |||
52 | return bb_get_chunk_from_file(file, &i); | ||
51 | } | 53 | } |
52 | /* Get line. Remove trailing \n */ | 54 | /* Get line. Remove trailing \n */ |
53 | char* FAST_FUNC xmalloc_fgetline(FILE *file) | 55 | char* FAST_FUNC xmalloc_fgetline(FILE *file) |