emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix xmalloc_fgets_str so that it really does NOT strip terminator.

Browse Source 
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
This commit is contained in:
Denis Vlasenko
2007-12-26 20:44:45 +00:00
parent d55268d0d4
commit abee3d0e0d
5 changed files with 48 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
networking/netstat.c
View File

@ -170,6 +170,11 @@ static void tcp_do_one(int lnr, char *line)
rem_addr, &rem_port, &state,
&txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode, more);
if (num < 10) {
bb_error_msg("warning, got bogus tcp line");
return;
}
if (strlen(local_addr) > 8) {
#if ENABLE_FEATURE_IPV6
build_ipv6_addr(local_addr, &localaddr);
@ -180,11 +185,6 @@ static void tcp_do_one(int lnr, char *line)
build_ipv4_addr(rem_addr, &remaddr);
}
if (num < 10) {
bb_error_msg("warning, got bogus tcp line");
return;
}
if ((rem_port && (flags & NETSTAT_CONNECTED))
|| (!rem_port && (flags & NETSTAT_LISTENING))
) {
@ -349,17 +349,16 @@ static void unix_do_one(int nr, char *line)
const char *ss_proto, *ss_state, *ss_type;
char ss_flags[32];
/* TODO: currently we stop at first NUL byte. Is it a problem? */
if (nr == 0)
return; /* skip header */
{
char *last = last_char_is(line, '\n');
if (last)
*last = '\0';
}
*strchrnul(line, '\n') = '\0';
/* 2.6.15 may report lines like "... @/tmp/fam-user-^@^@^@^@^@^@^@..."
* (those ^@ are NUL bytes). fgets sees them as tons of empty lines. */
* Other users report long lines filled by NUL bytes.
* (those ^@ are NUL bytes too). We see them as empty lines. */
if (!line[0])
return;
@ -474,20 +473,14 @@ static void do_info(const char *file, const char *name, void (*proc)(int, char *
return;
}
lnr = 0;
do {
buffer = xmalloc_fgets(procinfo);
if (buffer) {
(proc)(lnr++, buffer);
free(buffer);
}
} while (buffer);
/* Why? because xmalloc_fgets_str doesn't stop on NULs */
while ((buffer = xmalloc_fgets_str(procinfo, "\n")) != NULL) {
(proc)(lnr++, buffer);
free(buffer);
}
fclose(procinfo);
}
/*
* Our main function.
*/
int netstat_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int netstat_main(int argc, char **argv)
{