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

wc: fix a hang gue to isprint(EOF)

Browse Source 
The new isprint replacement macro returns TRUE for isprint(EOF), so the
read loop never returns. Moved the check for EOF immediately after the
read.

Signed-off-by: Dan Fandrich <dan@coneharvesters.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Dan Fandrich 2009-11-18 10:48:09 +01:00 committed by Denys Vlasenko
parent 995f15452a
commit 5b0a7f1a6e
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
coreutils/wc.c
View File

@ -68,19 +68,14 @@ enum {
int wc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int wc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int wc_main(int argc UNUSED_PARAM, char **argv) int wc_main(int argc UNUSED_PARAM, char **argv)
{ {
FILE *fp; const char *arg;
const char *s, *arg;
const char *start_fmt = " %9"COUNT_FMT + 1; const char *start_fmt = " %9"COUNT_FMT + 1;
const char *fname_fmt = " %s\n"; const char *fname_fmt = " %s\n";
COUNT_T *pcounts; COUNT_T *pcounts;
COUNT_T counts[4]; COUNT_T counts[4];
COUNT_T totals[4]; COUNT_T totals[4];
unsigned linepos; int num_files;
unsigned u;
int num_files = 0;
int c;
smallint status = EXIT_SUCCESS; smallint status = EXIT_SUCCESS;
smallint in_word;
unsigned print_type; unsigned print_type;
print_type = getopt32(argv, "lwcL"); print_type = getopt32(argv, "lwcL");
@ -101,7 +96,14 @@ int wc_main(int argc UNUSED_PARAM, char **argv)
pcounts = counts; pcounts = counts;
num_files = 0;
while ((arg = *argv++) != 0) { while ((arg = *argv++) != 0) {
FILE *fp;
const char *s;
unsigned u;
unsigned linepos;
smallint in_word;
++num_files; ++num_files;
fp = fopen_or_warn_stdin(arg); fp = fopen_or_warn_stdin(arg);
if (!fp) { if (!fp) {
@ -114,10 +116,19 @@ int wc_main(int argc UNUSED_PARAM, char **argv)
in_word = 0; in_word = 0;
do { do {
int c;
/* Our -w doesn't match GNU wc exactly... oh well */ /* Our -w doesn't match GNU wc exactly... oh well */
++counts[WC_CHARS]; ++counts[WC_CHARS];
c = getc(fp); c = getc(fp);
if (c == EOF) {
if (ferror(fp)) {
bb_simple_perror_msg(arg);
status = EXIT_FAILURE;
}
--counts[WC_CHARS];
goto DO_EOF; /* Treat an EOF as '\r'. */
}
if (isprint(c)) { if (isprint(c)) {
++linepos; ++linepos;
if (!isspace(c)) { if (!isspace(c)) {
@ -134,7 +145,7 @@ int wc_main(int argc UNUSED_PARAM, char **argv)
if (c == '\t') { if (c == '\t') {
linepos = (linepos | 7) + 1; linepos = (linepos | 7) + 1;
} else { /* '\n', '\r', '\f', or '\v' */ } else { /* '\n', '\r', '\f', or '\v' */
DO_EOF: DO_EOF:
if (linepos > counts[WC_LENGTH]) { if (linepos > counts[WC_LENGTH]) {
counts[WC_LENGTH] = linepos; counts[WC_LENGTH] = linepos;
} }
@ -145,13 +156,6 @@ int wc_main(int argc UNUSED_PARAM, char **argv)
linepos = 0; linepos = 0;
} }
} }
} else if (c == EOF) {
if (ferror(fp)) {
bb_simple_perror_msg(arg);
status = EXIT_FAILURE;
}
--counts[WC_CHARS];
goto DO_EOF; /* Treat an EOF as '\r'. */
} else { } else {
continue; continue;
} }
@ -170,7 +174,7 @@ int wc_main(int argc UNUSED_PARAM, char **argv)
fclose_if_not_stdin(fp); fclose_if_not_stdin(fp);
OUTPUT: OUTPUT:
/* coreutils wc tries hard to print pretty columns /* coreutils wc tries hard to print pretty columns
* (saves results for all files, find max col len etc...) * (saves results for all files, find max col len etc...)
* we won't try that hard, it will bloat us too much */ * we won't try that hard, it will bloat us too much */