hush: fix potential buffer overflow on NOMMU

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

diff --git a/coreutils/cat.c b/coreutils/cat.c
index d828b86ec3dcf147205b48b2686297773a51c24a..0024eb8d5e11262dd3061952043cf42a131765ed 100644 (file)
--- a/coreutils/cat.c
+++ b/coreutils/cat.c
@@ -10,24 +10,28 @@
 /* BB_AUDIT SUSv3 compliant */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/cat.html */
 
-#include "busybox.h"
+#include "libbb.h"
+
+/* This is a NOFORK applet. Be very careful! */
+
 
 int bb_cat(char **argv)
 {
-       static char *const argv_dash[] = { "-", NULL };
-       FILE *f;
+       int fd;
        int retval = EXIT_SUCCESS;
 
-       if (!*argv) argv = (char**) &argv_dash;
+       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);
@@ -35,9 +39,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;
        return bb_cat(argv);
 }