inetd: comment tweak. no code changes

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

diff --git a/coreutils/catv.c b/coreutils/catv.c
index ce927465b9b91d2d1ac4cd8dce7be6805863f6f4..ff3139c80672ab3f1db7ae325b7588ccdeb6a735 100644 (file)
--- a/coreutils/catv.c
+++ b/coreutils/catv.c
@@ -12,8 +12,8 @@
 
 #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;
        int fd;
@@ -27,18 +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]) {
-               argv--;
-               goto jump_in;
-       }
+       if (!argv[0])
+               *--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;
 
@@ -62,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)