X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fwc.c;h=d0e5482ca500ca141f2abebd5db5ce6c06f46ada;hb=5b492ee87614632e7bf5cd68fe0ce87dad30002a;hp=e5353b4cb5fce6569e79059f68411ca5bf60df9b;hpb=b71c668c577f7780362f7ea632895c11e3760d66;p=oweals%2Fbusybox.git diff --git a/coreutils/wc.c b/coreutils/wc.c index e5353b4cb..d0e5482ca 100644 --- a/coreutils/wc.c +++ b/coreutils/wc.c @@ -43,7 +43,7 @@ #include "libbb.h" -#ifdef CONFIG_LOCALE_SUPPORT +#if ENABLE_LOCALE_SUPPORT #define isspace_given_isprint(c) isspace(c) #else #undef isspace @@ -68,12 +68,12 @@ enum { WC_LENGTH = 3 }; -int wc_main(int argc, char **argv); -int wc_main(int argc, char **argv) +int wc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; +int wc_main(int argc UNUSED_PARAM, char **argv) { FILE *fp; const char *s, *arg; - const char *start_fmt = "%9"COUNT_FMT; + const char *start_fmt = " %9"COUNT_FMT + 1; const char *fname_fmt = " %s\n"; COUNT_T *pcounts; COUNT_T counts[4]; @@ -86,7 +86,7 @@ int wc_main(int argc, char **argv) smallint in_word; unsigned print_type; - print_type = getopt32(argc, argv, "lwcL"); + print_type = getopt32(argv, "lwcL"); if (print_type == 0) { print_type = (1 << WC_LINES) | (1 << WC_WORDS) | (1 << WC_CHARS); @@ -150,7 +150,7 @@ int wc_main(int argc, char **argv) } } else if (c == EOF) { if (ferror(fp)) { - bb_perror_msg("%s", arg); + bb_simple_perror_msg(arg); status = EXIT_FAILURE; } --counts[WC_CHARS];