Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/coreutils/catv.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/coreutils/catv.c (modified) (5 diffs)

branches/2.2.9/mindi-busybox/coreutils/catv.c

@@ -5 +5 @@
  * 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.
  */
 
@@ -13 +13 @@
 #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;
@@ -28 +28 @@
 
     /* 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;
@@ -63 +59 @@
                     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+'@');
@@ -69 +65 @@
                     }
                 }
-                putchar(c);
+                bb_putchar(c);
             }
         }