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
diff --git a/archival/dpkg.c b/archival/dpkg.c
index 27512eb..1db53f4 100644
--- a/archival/dpkg.c
+++ b/archival/dpkg.c
@@ -602,7 +602,7 @@
&field_name, &field_value);
if (field_name == NULL) {
- goto fill_package_struct_cleanup; /* Oh no, the dreaded goto statement! */
+ goto fill_package_struct_cleanup;
}
field_num = index_in_strings(field_names, field_name);
@@ -745,7 +745,7 @@
unsigned status_num;
status_file = xfopen(filename, "r");
- while ((control_buffer = xmalloc_fgets_str(status_file, "\n\n")) != NULL) {
+ while ((control_buffer = xmalloc_fgetline_str(status_file, "\n\n")) != NULL) {
const unsigned package_num = fill_package_struct(control_buffer);
if (package_num != -1) {
status_node = xmalloc(sizeof(status_node_t));
@@ -798,7 +798,7 @@
int i = 0;
/* Update previously known packages */
- while ((control_buffer = xmalloc_fgets_str(old_status_file, "\n\n")) != NULL) {
+ while ((control_buffer = xmalloc_fgetline_str(old_status_file, "\n\n")) != NULL) {
tmp_string = strstr(control_buffer, "Package:");
if (tmp_string == NULL) {
continue;