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 0f2460eb7a6da6bcd62856f0dd7dca8c710d1240..9225498283e211c3a2a9db0a785d0723db13274c 100644 (file)
--- a/coreutils/cat.c
+++ b/coreutils/cat.c
@@ -1,54 +1,60 @@
+/* vi: set sw=4 ts=4: */
 /*
- * Mini Cat implementation for busybox
+ * cat implementation for busybox
  *
- * Copyright (C) 1998 by Erik Andersen <andersee@debian.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
-#include "internal.h"
-#include <stdio.h>
+/* 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! */
 
-const char cat_usage[] = "[file ...]";
 
-extern int cat_more_main(int argc, char **argv)
+int bb_cat(char **argv)
+{
+       int fd;
+       int retval = EXIT_SUCCESS;
+
+       if (!*argv)
+               argv = (char**) &bb_argv_dash;
+
+       do {
+               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);
+
+       return retval;
+}
+
+int cat_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int cat_main(int argc UNUSED_PARAM, char **argv)
 {
-    int c;
-    FILE *file = stdin;
-
-    if (argc < 2) {
-       fprintf(stderr, "Usage: %s %s", *argv, cat_usage);
-       return(FALSE);
-    }
-    argc--;
-    argv++;
-
-    while (argc-- > 0) {
-       file = fopen(*argv, "r");
-       if (file == NULL) {
-           perror(*argv);
-           return(FALSE);
-       }
-       while ((c = getc(file)) != EOF)
-           putc(c, stdout);
-       fclose(file);
-       fflush(stdout);
-
-       argc--;
-       argv++;
-    }
-    return(TRUE);
+       getopt32(argv, "u");
+       argv += optind;
+       return bb_cat(argv);
 }