abee3d0e0d
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
67 lines
1.5 KiB
C
67 lines
1.5 KiB
C
/* vi: set sw=4 ts=4: */
|
|
/*
|
|
* Utility routines.
|
|
*
|
|
* Copyright (C) many different people.
|
|
* If you wrote this, please acknowledge your work.
|
|
*
|
|
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
|
|
*/
|
|
|
|
#include "libbb.h"
|
|
|
|
static char *xmalloc_fgets_internal(FILE *file, const char *terminating_string, int chop_off)
|
|
{
|
|
char *linebuf = NULL;
|
|
const int term_length = strlen(terminating_string);
|
|
int end_string_offset;
|
|
int linebufsz = 0;
|
|
int idx = 0;
|
|
int ch;
|
|
|
|
while (1) {
|
|
ch = fgetc(file);
|
|
if (ch == EOF) {
|
|
if (idx == 0)
|
|
return linebuf; /* NULL */
|
|
break;
|
|
}
|
|
|
|
if (idx >= linebufsz) {
|
|
linebufsz += 200;
|
|
linebuf = xrealloc(linebuf, linebufsz);
|
|
}
|
|
|
|
linebuf[idx] = ch;
|
|
idx++;
|
|
|
|
/* Check for terminating string */
|
|
end_string_offset = idx - term_length;
|
|
if (end_string_offset >= 0
|
|
&& memcmp(&linebuf[end_string_offset], terminating_string, term_length) == 0
|
|
) {
|
|
if (chop_off)
|
|
idx -= term_length;
|
|
break;
|
|
}
|
|
}
|
|
/* Grow/shrink *first*, then store NUL */
|
|
linebuf = xrealloc(linebuf, idx + 1);
|
|
linebuf[idx] = '\0';
|
|
return linebuf;
|
|
}
|
|
|
|
/* Read up to TERMINATING_STRING from FILE and return it,
|
|
* including terminating string.
|
|
* Non-terminated string can be returned if EOF is reached.
|
|
* Return NULL if EOF is reached immediately. */
|
|
char *xmalloc_fgets_str(FILE *file, const char *terminating_string)
|
|
{
|
|
return xmalloc_fgets_internal(file, terminating_string, 0);
|
|
}
|
|
|
|
char *xmalloc_fgetline_str(FILE *file, const char *terminating_string)
|
|
{
|
|
return xmalloc_fgets_internal(file, terminating_string, 1);
|
|
}
|