Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/coreutils/cat.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/cat.c (modified) (3 diffs)

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

@@ -5 +5 @@
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * Licensed under GPLv2, see file License in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
 /* BB_AUDIT SUSv3 compliant */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/cat.html */
+
+//kbuild:lib-$(CONFIG_CAT)     += cat.o
+//kbuild:lib-$(CONFIG_MORE)    += cat.o # more uses it if stdout isn't a tty
+//kbuild:lib-$(CONFIG_LESS)    += cat.o # less too
+//kbuild:lib-$(CONFIG_CRONTAB) += cat.o # crontab -l
+
+//config:config CAT
+//config:   bool "cat"
+//config:   default y
+//config:   help
+//config:     cat is used to concatenate files and print them to the standard
+//config:     output. Enable this option if you wish to enable the 'cat' utility.
 
 #include "libbb.h"
@@ -18 +30 @@
 int bb_cat(char **argv)
 {
-    static const char *const argv_dash[] = { "-", NULL };
-
     int fd;
     int retval = EXIT_SUCCESS;
 
     if (!*argv)
-        argv = (char**) &argv_dash;
+        argv = (char**) &bb_argv_dash;
 
     do {
-        fd = STDIN_FILENO;
-        if (!LONE_DASH(*argv))
-            fd = open_or_warn(*argv, O_RDONLY);
+        fd = open_or_warn_stdin(*argv);
         if (fd >= 0) {
-            /* This is not an xfunc - never exits */
+            /* This is not a xfunc - never exits */
             off_t r = bb_copyfd_eof(fd, STDOUT_FILENO);
             if (fd != STDIN_FILENO)
@@ -44 +52 @@
 }
 
-int cat_main(int argc, char **argv);
-int cat_main(int argc, char **argv)
+int cat_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int cat_main(int argc UNUSED_PARAM, char **argv)
 {
     getopt32(argv, "u");