README: doccument the need of CONFIG_DESKTOP

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

diff --git a/coreutils/cat.c b/coreutils/cat.c
index 10eb29c4d65437d14d8fc6421936cbf2b92c7f0d..18a74b81d2fea7ef9287e90016d88e52c7084254 100644 (file)
--- a/coreutils/cat.c
+++ b/coreutils/cat.c
@@ -10,32 +10,43 @@
 /* BB_AUDIT SUSv3 compliant */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/cat.html */
 
-#include "busybox.h"
-#include <unistd.h>
+#include "libbb.h"
 
-int cat_main(int argc, char **argv)
+/* This is a NOFORK applet. Be very careful! */
+
+
+int bb_cat(char **argv)
 {
-       FILE *f;
-       int retval = EXIT_SUCCESS;
+       static const char *const argv_dash[] = { "-", NULL };
 
-       getopt32(argc, argv, "u");
+       int fd;
+       int retval = EXIT_SUCCESS;
 
-       argv += optind;
-       if (!*argv) {
-               *--argv = "-";
-       }
+       if (!*argv)
+               argv = (char**) &argv_dash;
 
        do {
-               f = bb_wfopen_input(*argv);
-               if (f) {
-                       off_t r = bb_copyfd_eof(fileno(f), STDOUT_FILENO);
-                       bb_fclose_nonstdin(f);
-                       if (r >= 0) {
+               fd = STDIN_FILENO;
+               if (!LONE_DASH(*argv))
+                       fd = open_or_warn(*argv, O_RDONLY);
+               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);
 
        return retval;
 }
+
+int cat_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int cat_main(int argc, char **argv)
+{
+       getopt32(argv, "u");
+       argv += optind;
+       return bb_cat(argv);
+}