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

diff --git a/coreutils/cat.c b/coreutils/cat.c
index a1db4cd45..00c38d486 100644
--- a/coreutils/cat.c
+++ b/coreutils/cat.c
@@ -4,12 +4,33 @@
  *
  * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * Licensed under GPLv2, 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 */
 
+//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.
+
+//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! */
@@ -17,20 +38,16 @@
 
 int bb_cat(char **argv)
 {
-	static const char *const argv_dash[] = { "-", NULL };
-
 	int fd;
 	int retval = EXIT_SUCCESS;
 
 	if (!*argv)
-		argv = (char**) &argv_dash;
+		argv = (char**) &bb_argv_dash;
 
 	do {
-		fd = STDIN_FILENO;
-		if (!LONE_DASH(*argv))
-			fd = open_or_warn(*argv, O_RDONLY);
+		fd = open_or_warn_stdin(*argv);
 		if (fd >= 0) {
-			/* This is not an xfunc - never exits */
+			/* This is not a xfunc - never exits */
 			off_t r = bb_copyfd_eof(fd, STDOUT_FILENO);
 			if (fd != STDIN_FILENO)
 				close(fd);
@@ -44,7 +61,7 @@ int bb_cat(char **argv)
 }
 
 int cat_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int cat_main(int argc, char **argv)
+int cat_main(int argc UNUSED_PARAM, char **argv)
 {
 	getopt32(argv, "u");
 	argv += optind;