diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-12-26 20:44:45 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-12-26 20:44:45 +0000 |
commit | abee3d0e0dc7c7e4b733b0145c56bf8159a37a69 (patch) | |
tree | bf000d88c4044106f689060ee795d49f9a9116f6 /libbb/get_line_from_file.c | |
parent | d55268d0d497856a34f732aca158d07276358ab6 (diff) | |
download | busybox-w32-abee3d0e0dc7c7e4b733b0145c56bf8159a37a69.tar.gz busybox-w32-abee3d0e0dc7c7e4b733b0145c56bf8159a37a69.tar.bz2 busybox-w32-abee3d0e0dc7c7e4b733b0145c56bf8159a37a69.zip |
Fix xmalloc_fgets_str so that it really does NOT strip terminator.
Add xmalloc_fgetline_str which does strip terminator,
and use it in dpkg instead of xmalloc_fgets_str.
netstat: use xmalloc_fgets_str - allows to eat strings with NULs
(this fixes bug with some weird /proc/net/unix input)
function old new delta
xmalloc_fgets_internal - 191 +191
xmalloc_fgetline_str - 18 +18
do_info 116 120 +4
unix_do_one 451 447 -4
tcp_do_one 423 419 -4
send_tree 369 365 -4
xmalloc_fgets_str 178 15 -163
------------------------------------------------------------------------------
(add/remove: 2/0 grow/shrink: 1/4 up/down: 213/-175) Total: 38 bytes
text data bss dec hex filename
778445 832 7344 786621 c00bd busybox_old
778483 832 7344 786659 c00e3 busybox_unstripped
Diffstat (limited to 'libbb/get_line_from_file.c')
-rw-r--r-- | libbb/get_line_from_file.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libbb/get_line_from_file.c b/libbb/get_line_from_file.c index 1eb4af13c..ac4d14b1f 100644 --- a/libbb/get_line_from_file.c +++ b/libbb/get_line_from_file.c | |||
@@ -12,11 +12,10 @@ | |||
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 | 14 | /* This function reads an entire line from a text file, up to a newline |
15 | * or NUL byte, inclusive. It returns a malloc'ed char * which must be | 15 | * or NUL byte, inclusive. It returns a malloc'ed char * which |
16 | * stored and free'ed by the caller. If end is NULL '\n' isn't considered | 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 read is stored in it. | 17 | * end of line. If end isn't NULL, length of the chunk read is stored in it. |
18 | * Return NULL if EOF/error */ | 18 | * Return NULL if EOF/error */ |
19 | |||
20 | char *bb_get_chunk_from_file(FILE *file, int *end) | 19 | char *bb_get_chunk_from_file(FILE *file, int *end) |
21 | { | 20 | { |
22 | int ch; | 21 | int ch; |