whitespace fixes

[oweals/busybox.git] / coreutils / wc.c

diff --git a/coreutils/wc.c b/coreutils/wc.c
index 4b76e549950816fe59ee4869253d31324d800078..291af411fb8b5f88d63a77741004855233eabad6 100644 (file)
--- a/coreutils/wc.c
+++ b/coreutils/wc.c
@@ -36,16 +36,14 @@
  * (adapted from example in gnu wc.c)
  *
  *      echo hello > /tmp/testfile &&
- *      (dd ibs=1k skip=1 count=0 &> /dev/null ; wc -c) < /tmp/testfile
+ *      (dd ibs=1k skip=1 count=0 &> /dev/null; wc -c) < /tmp/testfile
  *
  * for which 'wc -c' should output '0'.
  */
 
-#include "busybox.h"
+#include "libbb.h"
 
-#ifdef CONFIG_LOCALE_SUPPORT
-#include <locale.h>
-#include <ctype.h>
+#if ENABLE_LOCALE_SUPPORT
 #define isspace_given_isprint(c) isspace(c)
 #else
 #undef isspace
@@ -70,6 +68,7 @@ enum {
        WC_LENGTH       = 3
 };
 
+int wc_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int wc_main(int argc, char **argv)
 {
        FILE *fp;
@@ -83,11 +82,11 @@ int wc_main(int argc, char **argv)
        unsigned u;
        int num_files = 0;
        int c;
-       char status = EXIT_SUCCESS;
-       char in_word;
+       smallint status = EXIT_SUCCESS;
+       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);
@@ -151,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];