Changeset 1765 in MondoRescue for branches/2.2.5/mindi-busybox/coreutils/cat.c

Timestamp:

Nov 4, 2007, 3:16:40 AM (16 years ago)

Author:

Bruno Cornec

Message:

Update to busybox 1.7.2

File:

• branches/2.2.5/mindi-busybox/coreutils/cat.c (modified) (3 diffs)

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

@@ -5 +5 @@
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * Licensed under GPLv2 or later, see file License in this tarball for details.
+ * Licensed under GPLv2, see file License in this tarball for details.
  */
 
@@ -11 +11 @@
 /* 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;
+    static const char *const argv_dash[] = { "-", NULL };
+
+    int fd;
     int retval = EXIT_SUCCESS;
 
-    bb_getopt_ulflags(argc, argv, "u");
-
-    argv += optind;
-    if (!*argv) {
-        *--argv = "-";
-    }
+    if (!*argv)
+        argv = (char**) &argv_dash;
 
     do {
-        if ((f = bb_wfopen_input(*argv)) != NULL) {
-            int 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 an 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;
@@ -39 +43 @@
     return retval;
 }
+
+int cat_main(int argc, char **argv);
+int cat_main(int argc, char **argv)
+{
+    getopt32(argv, "u");
+    argv += optind;
+    return bb_cat(argv);
+}