X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=coreutils%2Fcat.c;h=00c38d486ade6b718999b7b0026ce6fb951ca8c2;hb=561f9c8585e7cb0882472297f4fd2ed763dc085a;hp=6a9204fe7bfe93bbfa7c898eaba3453a616a182f;hpb=cc8a66b113dbdf04082b6f7c9b0b58984d433028;p=oweals%2Fbusybox.git

diff --git a/coreutils/cat.c b/coreutils/cat.c
index 6a9204fe7..00c38d486 100644
--- a/coreutils/cat.c
+++ b/coreutils/cat.c
@@ -1,52 +1,69 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Mini Cat implementation for busybox
+ * cat implementation for busybox
  *
- * Copyright (C) 1999,2000 by Lineo, inc.
- * Written by Erik Andersen <andersen@lineo.com>, <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.
+
+//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! */
 
-extern int cat_main(int argc, char **argv)
+
+int bb_cat(char **argv)
 {
-	if (argc == 1) {
-		print_file(stdin);
-		exit(TRUE);
-	}
-
-	if (**(argv + 1) == '-')
-		usage(cat_usage);
-
-	while (--argc > 0) {
-		if (print_file_by_name(*++argv) == FALSE) {
-			perror(*argv);
-			exit(FALSE);
+	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;
 		}
-	}
-	return(TRUE);
+		retval = EXIT_FAILURE;
+	} while (*++argv);
+
+	return retval;
 }
 
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/
+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);
+}