X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Fcat.c;h=0024eb8d5e11262dd3061952043cf42a131765ed;hb=6c93b24ce9dfb5c3970178ca2545502a7830716c;hp=0d32efe84958913481df5715a64029a954aa3095;hpb=abc0f4f8f97b36f2865986374405d091cefea107;p=oweals%2Fbusybox.git

diff --git a/coreutils/cat.c b/coreutils/cat.c
index 0d32efe84..0024eb8d5 100644
--- a/coreutils/cat.c
+++ b/coreutils/cat.c
@@ -1,59 +1,48 @@
+/* vi: set sw=4 ts=4: */
 /*
- * Mini Cat implementation for busybox
+ * cat implementation for busybox
  *
- * Copyright (C) 1999 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 tarball for details.
  */
 
-#include "internal.h"
-#include <stdio.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! */
 
-static void print_file( FILE *file) 
+
+int bb_cat(char **argv)
 {
-    int c;
-    while ((c = getc(file)) != EOF)
-	putc(c, stdout);
-    fclose(file);
-    fflush(stdout);
+	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;
 }
 
-extern int cat_main(int argc, char **argv)
+int cat_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int cat_main(int argc UNUSED_PARAM, char **argv)
 {
-    FILE *file;
-
-    if (argc==1) {
-	print_file( stdin);
-	exit( TRUE);
-    }
-
-    if ( **(argv+1) == '-' ) {
-	usage ("cat [file ...]\n");
-    }
-    argc--;
-
-    while (argc-- > 0 && *(argv++) != '\0' && strlen(*argv) ) {
-	file = fopen(*argv, "r");
-	if (file == NULL) {
-	    perror(*argv);
-	    exit(FALSE);
-	}
-	print_file( file);
-    }
-    exit(TRUE);
+	getopt32(argv, "u");
+	argv += optind;
+	return bb_cat(argv);
 }