diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-01 21:05:12 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-10-01 21:05:12 +0000 |
commit | b97c9842a521a54980b247ab8b920f057b128b2e (patch) | |
tree | 54731506b0d02a639aa2781412ca3ceab927594f /libbb/get_line_from_file.c | |
parent | bb119d059a80c85fe844b9f9c770e0c77aeb49e6 (diff) | |
download | busybox-w32-b97c9842a521a54980b247ab8b920f057b128b2e.tar.gz busybox-w32-b97c9842a521a54980b247ab8b920f057b128b2e.tar.bz2 busybox-w32-b97c9842a521a54980b247ab8b920f057b128b2e.zip |
sed: unbreak multiple -e, -f option handling (my fault)
Diffstat (limited to 'libbb/get_line_from_file.c')
-rw-r--r-- | libbb/get_line_from_file.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libbb/get_line_from_file.c b/libbb/get_line_from_file.c index 68837b20d..de49eb51d 100644 --- a/libbb/get_line_from_file.c +++ b/libbb/get_line_from_file.c | |||
@@ -16,7 +16,7 @@ | |||
16 | /* get_line_from_file() - This function reads an entire line from a text file, | 16 | /* get_line_from_file() - 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 | 17 | * 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 | 18 | * stored and free'ed by the caller. If end is null '\n' isn't considered |
19 | * and of line. If end isn't null, length of the chunk read is stored in it. */ | 19 | * end of line. If end isn't null, length of the chunk read is stored in it. */ |
20 | 20 | ||
21 | char *bb_get_chunk_from_file(FILE * file, int *end) | 21 | char *bb_get_chunk_from_file(FILE * file, int *end) |
22 | { | 22 | { |
@@ -46,7 +46,7 @@ char *bb_get_chunk_from_file(FILE * file, int *end) | |||
46 | return linebuf; | 46 | return linebuf; |
47 | } | 47 | } |
48 | 48 | ||
49 | /* Get line, including trailing /n if any */ | 49 | /* Get line, including trailing \n if any */ |
50 | char *bb_get_line_from_file(FILE * file) | 50 | char *bb_get_line_from_file(FILE * file) |
51 | { | 51 | { |
52 | int i; | 52 | int i; |
@@ -54,7 +54,7 @@ char *bb_get_line_from_file(FILE * file) | |||
54 | return bb_get_chunk_from_file(file, &i); | 54 | return bb_get_chunk_from_file(file, &i); |
55 | } | 55 | } |
56 | 56 | ||
57 | /* Get line. Remove trailing /n */ | 57 | /* Get line. Remove trailing \n */ |
58 | char *bb_get_chomped_line_from_file(FILE * file) | 58 | char *bb_get_chomped_line_from_file(FILE * file) |
59 | { | 59 | { |
60 | int i; | 60 | int i; |