summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDenis Vlasenko2007-12-26 20:44:45 +0000
committerDenis Vlasenko2007-12-26 20:44:45 +0000
commitabee3d0e0dc7c7e4b733b0145c56bf8159a37a69 (patch)
treebf000d88c4044106f689060ee795d49f9a9116f6 /include
parentd55268d0d497856a34f732aca158d07276358ab6 (diff)
downloadbusybox-abee3d0e0dc7c7e4b733b0145c56bf8159a37a69.zip
busybox-abee3d0e0dc7c7e4b733b0145c56bf8159a37a69.tar.gz
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 'include')
-rw-r--r--include/libbb.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/include/libbb.h b/include/libbb.h
index 2b92821..1da37ed 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -464,9 +464,12 @@ extern void xwrite(int fd, const void *buf, size_t count);
/* Reads and prints to stdout till eof, then closes FILE. Exits on error: */
extern void xprint_and_close_file(FILE *file);
-extern char *xmalloc_fgets(FILE *file);
-/* Read up to (and including) TERMINATING_STRING: */
+/* Reads up to (and including) TERMINATING_STRING: */
extern char *xmalloc_fgets_str(FILE *file, const char *terminating_string);
+/* Chops off TERMINATING_STRING: from the end: */
+extern char *xmalloc_fgetline_str(FILE *file, const char *terminating_string);
+/* Reads up to (and including) "\n" or NUL byte */
+extern char *xmalloc_fgets(FILE *file);
/* Chops off '\n' from the end, unlike fgets: */
extern char *xmalloc_getline(FILE *file);
extern char *bb_get_chunk_from_file(FILE *file, int *end);