X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fcat.c;h=0024eb8d5e11262dd3061952043cf42a131765ed;hb=8d680b51148b9cbe7dd3afd37022f3390dd999ef;hp=820b6342e934cbd124333691bbb4ee95226383f8;hpb=bdfd0d78bc44e73d693510e70087857785b3b521;p=oweals%2Fbusybox.git

diff --git a/coreutils/cat.c b/coreutils/cat.c
index 820b6342e..0024eb8d5 100644
--- a/coreutils/cat.c
+++ b/coreutils/cat.c
@@ -1,53 +1,48 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Mini Cat implementation for busybox
+ * cat implementation for busybox
  *
- * Copyright (C) 1999,2000 by Lineo, inc. and Erik Andersen
- * Copyright (C) 1999,2000,2001 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 tarball for details.
  */
 
-#include <stdlib.h>
-#include <string.h>
-#include "busybox.h"
+/* BB_AUDIT SUSv3 compliant */
+/* http://www.opengroup.org/onlinepubs/007904975/utilities/cat.html */
+
+#include "libbb.h"
+
+/* This is a NOFORK applet. Be very careful! */
+
 
-extern int cat_main(int argc, char **argv)
+int bb_cat(char **argv)
 {
-	int status = EXIT_SUCCESS;
-
-	if (argc == 1) {
-		print_file(stdin);
-		return status;
-	}
-
-	while (--argc > 0) {
-		if(!(strcmp(*++argv, "-"))) {
-			print_file(stdin);
-		} else if (print_file_by_name(*argv) == FALSE) {
-			status = EXIT_FAILURE;
+	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 status;
+		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);
+}