hush/libbb/get_line_from_file.c
Denis Vlasenko abee3d0e0d 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
2007-12-26 20:44:45 +00:00

70 lines
1.5 KiB
C

/* vi: set sw=4 ts=4: */
/*
* Utility routines.
*
* Copyright (C) 2005, 2006 Rob Landley <rob@landley.net>
* Copyright (C) 2004 Erik Andersen <andersen@codepoet.org>
* Copyright (C) 2001 Matt Krai
*
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/
#include "libbb.h"
/* This function reads an entire line from a text file, up to a newline
* or NUL byte, inclusive. It returns a malloc'ed char * which
* must be free'ed by the caller. If end is NULL '\n' isn't considered
* end of line. If end isn't NULL, length of the chunk read is stored in it.
* Return NULL if EOF/error */
char *bb_get_chunk_from_file(FILE *file, int *end)
{
int ch;
int idx = 0;
char *linebuf = NULL;
int linebufsz = 0;
while ((ch = getc(file)) != EOF) {
/* grow the line buffer as necessary */
if (idx >= linebufsz) {
linebufsz += 80;
linebuf = xrealloc(linebuf, linebufsz);
}
linebuf[idx++] = (char) ch;
if (!ch || (end && ch == '\n'))
break;
}
if (end)
*end = idx;
if (linebuf) {
// huh, does fgets discard prior data on error like this?
// I don't think so....
//if (ferror(file)) {
// free(linebuf);
// return NULL;
//}
linebuf = xrealloc(linebuf, idx+1);
linebuf[idx] = '\0';
}
return linebuf;
}
/* Get line, including trailing \n if any */
char *xmalloc_fgets(FILE *file)
{
int i;
return bb_get_chunk_from_file(file, &i);
}
/* Get line. Remove trailing \n */
char *xmalloc_getline(FILE *file)
{
int i;
char *c = bb_get_chunk_from_file(file, &i);
if (i && c[--i] == '\n')
c[i] = '\0';
return c;
}