- add libbb function str_tolower to convert a string to lowercase.

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

diff --git a/coreutils/catv.c b/coreutils/catv.c
index 55656b4b2d268af13828a88c0647eb90a5045433..826e0e9a6ac6ec534dab71ca95f450d19255c086 100644 (file)
--- a/coreutils/catv.c
+++ b/coreutils/catv.c
@@ -12,10 +12,11 @@
 
 #include "busybox.h"
 
+int catv_main(int argc, char **argv);
 int catv_main(int argc, char **argv)
 {
        int retval = EXIT_SUCCESS, fd;
-       unsigned long flags;
+       unsigned flags;
 
        flags = getopt32(argc, argv, "etv");
 #define CATV_OPT_e (1<<0)
@@ -42,19 +43,19 @@ int catv_main(int argc, char **argv)
 
                                if (c > 126 && (flags & CATV_OPT_v)) {
                                        if (c == 127) {
-                                               bb_printf("^?");
+                                               printf("^?");
                                                continue;
                                        } else {
-                                               bb_printf("M-");
+                                               printf("M-");
                                                c -= 128;
                                        }
                                }
                                if (c < 32) {
                                        if (c == 10) {
-                                          if (flags & CATV_OPT_e)
-                                                  putchar('$');
+                                               if (flags & CATV_OPT_e)
+                                                       putchar('$');
                                        } else if (flags & (c==9 ? CATV_OPT_t : CATV_OPT_v)) {
-                                               bb_printf("^%c", c+'@');
+                                               printf("^%c", c+'@');
                                                continue;
                                        }
                                }
@@ -65,5 +66,5 @@ int catv_main(int argc, char **argv)
                        close(fd);
        } while (*++argv);
 
-       return retval;
+       fflush_stdout_and_exit(retval);
 }