X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Ftee.c;h=48cc0508fced0d498a6b09fadcd54fa14adf4836;hb=66426760beef7e87c4735f433d123daf911b5b4a;hp=f0eca070d558249379aaefffddd85ee969c8cfc4;hpb=1fa1adea2ae16d4f4c82d7466905dce4c6edd5f5;p=oweals%2Fbusybox.git

diff --git a/coreutils/tee.c b/coreutils/tee.c
index f0eca070d..48cc0508f 100644
--- a/coreutils/tee.c
+++ b/coreutils/tee.c
@@ -1,68 +1,118 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Mini tee implementation for busybox
+ * tee implementation for busybox
  *
- * Copyright (C) 1999,2000 by Lineo, inc.
- * Written by Matt Kraai <kraai@alumni.carnegiemellon.edu>
- *
- * 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 or later, see file LICENSE in this source tree.
  */
 
-#include "busybox.h"
-#include <getopt.h>
-#include <stdio.h>
+/* BB_AUDIT SUSv3 compliant */
+/* http://www.opengroup.org/onlinepubs/007904975/utilities/tee.html */
+
+//usage:#define tee_trivial_usage
+//usage:       "[-ai] [FILE]..."
+//usage:#define tee_full_usage "\n\n"
+//usage:       "Copy stdin to each FILE, and also to stdout\n"
+//usage:     "\n	-a	Append to the given FILEs, don't overwrite"
+//usage:     "\n	-i	Ignore interrupt signals (SIGINT)"
+//usage:
+//usage:#define tee_example_usage
+//usage:       "$ echo \"Hello\" | tee /tmp/foo\n"
+//usage:       "$ cat /tmp/foo\n"
+//usage:       "Hello\n"
 
-int
-tee_main(int argc, char **argv)
+#include "libbb.h"
+
+int tee_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int tee_main(int argc, char **argv)
 {
-	char *mode = "w";
-	int c, i, status = 0, nfiles = 0;
+	const char *mode = "w\0a";
 	FILE **files;
+	FILE **fp;
+	char **names;
+	char **np;
+	char retval;
+//TODO: make unconditional
+#if ENABLE_FEATURE_TEE_USE_BLOCK_IO
+	ssize_t c;
+# define buf bb_common_bufsiz1
+#else
+	int c;
+#endif
+	retval = getopt32(argv, "ia");	/* 'a' must be 2nd */
+	argc -= optind;
+	argv += optind;
 
-	while ((c = getopt(argc, argv, "a")) != EOF) {
-		switch (c) {
-		case 'a': 
-			mode = "a";
-			break;
-		default:
-			usage(tee_usage);
-		}
+	mode += (retval & 2);	/* Since 'a' is the 2nd option... */
+
+	if (retval & 1) {
+		signal(SIGINT, SIG_IGN); /* TODO - switch to sigaction. (why?) */
 	}
+	retval = EXIT_SUCCESS;
+	/* gnu tee ignores SIGPIPE in case one of the output files is a pipe
+	 * that doesn't consume all its input.  Good idea... */
+	signal(SIGPIPE, SIG_IGN);
 
-	files = (FILE **)xmalloc(sizeof(FILE *) * (argc - optind + 1));
-	files[nfiles++] = stdout;
-	while (optind < argc) {
-		if ((files[nfiles++] = fopen(argv[optind++], mode)) == NULL) {
-			nfiles--;
-			perror_msg("%s", argv[optind-1]);
-			status = 1;
+	/* Allocate an array of FILE *'s, with one extra for a sentinel. */
+	fp = files = xzalloc(sizeof(FILE *) * (argc + 2));
+	np = names = argv - 1;
+
+	files[0] = stdout;
+	goto GOT_NEW_FILE;
+	do {
+		*fp = stdout;
+		if (NOT_LONE_DASH(*argv)) {
+			*fp = fopen_or_warn(*argv, mode);
+			if (*fp == NULL) {
+				retval = EXIT_FAILURE;
+				argv++;
+				continue;
+			}
 		}
+		*np = *argv++;
+ GOT_NEW_FILE:
+		setbuf(*fp, NULL);	/* tee must not buffer output. */
+		fp++;
+		np++;
+	} while (*argv);
+	/* names[0] will be filled later */
+
+#if ENABLE_FEATURE_TEE_USE_BLOCK_IO
+	while ((c = safe_read(STDIN_FILENO, buf, sizeof(buf))) > 0) {
+		fp = files;
+		do
+			fwrite(buf, 1, c, *fp);
+		while (*++fp);
+	}
+	if (c < 0) {		/* Make sure read errors are signaled. */
+		retval = EXIT_FAILURE;
 	}
+#else
+	setvbuf(stdout, NULL, _IONBF, 0);
+	while ((c = getchar()) != EOF) {
+		fp = files;
+		do
+			putc(c, *fp);
+		while (*++fp);
+	}
+#endif
 
-	while ((c = getchar()) != EOF)
-		for (i = 0; i < nfiles; i++)
-			putc(c, files[i]);
+	/* Now we need to check for i/o errors on stdin and the various
+	 * output files.  Since we know that the first entry in the output
+	 * file table is stdout, we can save one "if ferror" test by
+	 * setting the first entry to stdin and checking stdout error
+	 * status with fflush_stdout_and_exit()... although fflush()ing
+	 * is unnecessary here. */
+	np = names;
+	fp = files;
+	names[0] = (char *) bb_msg_standard_input;
+	files[0] = stdin;
+	do {	/* Now check for input and output errors. */
+		/* Checking ferror should be sufficient, but we may want to fclose.
+		 * If we do, remember not to close stdin! */
+		die_if_ferror(*fp++, *np++);
+	} while (*fp);
 
-	return status;
+	fflush_stdout_and_exit(retval);
 }
-
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/