ls: fix handling of symlinks by option -1

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

diff --git a/coreutils/cat.c b/coreutils/cat.c
index 181d96a2c9828b74eeab0892648b9ce731511d22..9225498283e211c3a2a9db0a785d0723db13274c 100644 (file)
--- a/coreutils/cat.c
+++ b/coreutils/cat.c
@@ -4,12 +4,24 @@
  *
  * 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"
 
 /* This is a NOFORK applet. Be very careful! */
@@ -17,18 +29,14 @@
 
 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 a xfunc - never exits */
                        off_t r = bb_copyfd_eof(fd, STDOUT_FILENO);
@@ -44,7 +52,7 @@ int bb_cat(char **argv)
 }
 
 int cat_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int cat_main(int argc ATTRIBUTE_UNUSED, char **argv)
+int cat_main(int argc UNUSED_PARAM, char **argv)
 {
        getopt32(argv, "u");
        argv += optind;