X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fcat.c;h=00c38d486ade6b718999b7b0026ce6fb951ca8c2;hb=a82e32d9ce199db01aaea92ebcb39a23d90e5b85;hp=f3baf0a2da4135edc49bfd48e378e0c8585a0400;hpb=67b23e6043d8e2b30b0bf3bc105b8583c2a26db5;p=oweals%2Fbusybox.git

diff --git a/coreutils/cat.c b/coreutils/cat.c
index f3baf0a2d..00c38d486 100644
--- a/coreutils/cat.c
+++ b/coreutils/cat.c
@@ -4,37 +4,66 @@
  *
  * 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 source tree.
  */
 
 /* BB_AUDIT SUSv3 compliant */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/cat.html */
 
-#include "busybox.h"
-#include <unistd.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
 
-int cat_main(int argc, char **argv)
+//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.
+
+//usage:#define cat_trivial_usage
+//usage:       "[FILE]..."
+//usage:#define cat_full_usage "\n\n"
+//usage:       "Concatenate FILEs and print them to stdout"
+//usage:
+//usage:#define cat_example_usage
+//usage:       "$ cat /proc/uptime\n"
+//usage:       "110716.72 17.67"
+
+#include "libbb.h"
+
+/* This is a NOFORK applet. Be very careful! */
+
+
+int bb_cat(char **argv)
 {
-	FILE *f;
+	int fd;
 	int retval = EXIT_SUCCESS;
 
-	getopt32(argc, argv, "u");
-
-	argv += optind;
-	if (!*argv) {
-		*--argv = "-";
-	}
+	if (!*argv)
+		argv = (char**) &bb_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 = 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)
+{
+	getopt32(argv, "u");
+	argv += optind;
+	return bb_cat(argv);
+}