diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2006-11-30 16:41:15 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2006-11-30 16:41:15 +0000 |
| commit | ab24e18c7a32ee1637be19f239e9dd9d7c7f6534 (patch) | |
| tree | 2646cfd66b5a8d279ad360aaa989a814eeecfd64 /libbb/get_line_from_file.c | |
| parent | b8bb27c7ea37c9885b1ded36d0f7807a09ede712 (diff) | |
| download | busybox-ab24e18c7a32ee1637be19f239e9dd9d7c7f6534.tar.gz | |
passwd: rework:
* do not make backup copy by copying (just retain old file)
* correctly fall back to /etc/passwd if user is not in shadow
* fix bug with overlong passwd entries
* be permissive on some kinds of failures
* reduce stack usage
* code size: -500 bytes
Diffstat (limited to 'libbb/get_line_from_file.c')
| -rw-r--r-- | libbb/get_line_from_file.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libbb/get_line_from_file.c b/libbb/get_line_from_file.c index 969d808cf..b424d59e9 100644 --- a/libbb/get_line_from_file.c +++ b/libbb/get_line_from_file.c @@ -9,11 +9,9 @@ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include <stdio.h> -#include <stdlib.h> #include "libbb.h" -/* get_line_from_file() - This function reads an entire line from a text file, +/* This function reads an entire line from a text file, * up to a newline or NUL byte. It returns a malloc'ed char * which must be * stored and 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. */ @@ -37,10 +35,12 @@ char *bb_get_chunk_from_file(FILE * file, int *end) if (end) *end = idx; if (linebuf) { - if (ferror(file)) { - free(linebuf); - return NULL; - } + // huh, is fgets discards 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; } |