ls: add support for -H

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

diff --git a/coreutils/catv.c b/coreutils/catv.c
index 876b67a2ae1988cae94afdf3b3e4aa52e95f2fc1..f92d93d24175335bb1c4c0ed82a7f4d15e57c99e 100644 (file)
--- a/coreutils/catv.c
+++ b/coreutils/catv.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2006 Rob Landley <rob@landley.net>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 /* See "Cat -v considered harmful" at
@@ -12,13 +12,14 @@
 
 #include "libbb.h"
 
-int catv_main(int argc, char **argv);
-int catv_main(int argc, char **argv)
+int catv_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int catv_main(int argc UNUSED_PARAM, char **argv)
 {
-       int retval = EXIT_SUCCESS, fd;
+       int retval = EXIT_SUCCESS;
+       int fd;
        unsigned flags;
 
-       flags = getopt32(argc, argv, "etv");
+       flags = getopt32(argv, "etv");
 #define CATV_OPT_e (1<<0)
 #define CATV_OPT_t (1<<1)
 #define CATV_OPT_v (1<<2)
@@ -26,16 +27,14 @@ int catv_main(int argc, char **argv)
        argv += optind;
 
        /* Read from stdin if there's nothing else to do. */
-       fd = 0;
        if (!argv[0])
-               goto jump_in;
+               *--argv = (char*)"-";
        do {
-               fd = open_or_warn(*argv, O_RDONLY);
+               fd = open_or_warn_stdin(*argv);
                if (fd < 0) {
                        retval = EXIT_FAILURE;
                        continue;
                }
- jump_in:
                for (;;) {
                        int i, res;
 
@@ -46,7 +45,7 @@ int catv_main(int argc, char **argv)
                        if (res < 1)
                                break;
                        for (i = 0; i < res; i++) {
-                               char c = read_buf[i];
+                               unsigned char c = read_buf[i];
 
                                if (c > 126 && (flags & CATV_OPT_v)) {
                                        if (c == 127) {
@@ -59,13 +58,13 @@ int catv_main(int argc, char **argv)
                                if (c < 32) {
                                        if (c == 10) {
                                                if (flags & CATV_OPT_e)
-                                                       putchar('$');
+                                                       bb_putchar('$');
                                        } else if (flags & (c==9 ? CATV_OPT_t : CATV_OPT_v)) {
                                                printf("^%c", c+'@');
                                                continue;
                                        }
                                }
-                               putchar(c);
+                               bb_putchar(c);
                        }
                }
                if (ENABLE_FEATURE_CLEAN_UP && fd)