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 db4d33dc59ecaa41f804c9250d13098815f872c7..9225498283e211c3a2a9db0a785d0723db13274c 100644 (file)
--- a/coreutils/cat.c
+++ b/coreutils/cat.c
@@ -4,27 +4,46 @@
  *
  * 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 */
 
-#include "busybox.h"
+//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! */
+
 
 int bb_cat(char **argv)
 {
-       FILE *f;
+       int fd;
        int retval = EXIT_SUCCESS;
 
+       if (!*argv)
+               argv = (char**) &bb_argv_dash;
+
        do {
-               f = fopen_or_warn_stdin(*argv);
-               if (f) {
-                       off_t r = bb_copyfd_eof(fileno(f), STDOUT_FILENO);
-                       fclose_if_not_stdin(f);
-                       if (r >= 0) {
+               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);
+                       if (fd != STDIN_FILENO)
+                               close(fd);
+                       if (r >= 0)
                                continue;
-                       }
                }
                retval = EXIT_FAILURE;
        } while (*++argv);
@@ -32,14 +51,10 @@ int bb_cat(char **argv)
        return retval;
 }
 
-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(argc, argv, "u");
-
+       getopt32(argv, "u");
        argv += optind;
-       if (!*argv) {
-               *--argv = "-";
-       }
-
        return bb_cat(argv);
 }