int count_bytes = 0;
int header_threshhold = 1;
#endif
-
FILE *fp;
const char *fmt;
char *p;
#if ENABLE_INCLUDE_SUSv2 || ENABLE_FEATURE_FANCY_HEAD
/* Allow legacy syntax of an initial numeric option without -n. */
- if (argc > 1 && argv[1][0] == '-'
+ if (argv[1] && argv[1][0] == '-'
&& isdigit(argv[1][1])
) {
--argc;
#if ENABLE_INCLUDE_SUSv2 || ENABLE_FEATURE_FANCY_HEAD
GET_COUNT:
#endif
-
#if !ENABLE_FEATURE_FANCY_HEAD
count = xatoul(p);
#else
}
}
+ argc -= optind;
argv += optind;
- if (!*argv) {
+ if (!*argv)
*--argv = (char*)"-";
- }
fmt = header_fmt_str + 1;
#if ENABLE_FEATURE_FANCY_HEAD
- if (argc - optind <= header_threshhold) {
+ if (argc <= header_threshhold) {
header_threshhold = 0;
}
#else
- if (argc <= optind + 1) {
- fmt += 11;
+ if (argc <= 1) {
+ fmt += 11; /* "" */
}
/* Now define some things here to avoid #ifdefs in the code below.
* These should optimize out of the if conditions below. */
putchar(c);
}
if (fclose_if_not_stdin(fp)) {
- bb_simple_perror_msg(*argv); /* Avoid multibyte problems. */
+ bb_simple_perror_msg(*argv);
retval = EXIT_FAILURE;
}
die_if_ferror_stdout();
+ } else {
+ retval = EXIT_FAILURE;
}
fmt = header_fmt_str;
} while (*++argv);