X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Ftee.c;h=48cc0508fced0d498a6b09fadcd54fa14adf4836;hb=66426760beef7e87c4735f433d123daf911b5b4a;hp=018fe117bed77627a57df69cefcd4d5315c455de;hpb=298854f02963bd8e43dfeb7224d88cfeb0c932cb;p=oweals%2Fbusybox.git diff --git a/coreutils/tee.c b/coreutils/tee.c index 018fe117b..48cc0508f 100644 --- a/coreutils/tee.c +++ b/coreutils/tee.c @@ -1,134 +1,118 @@ /* vi: set sw=4 ts=4: */ /* - * Mini tee implementation for busybox + * tee implementation for busybox * + * Copyright (C) 2003 Manuel Novoa III * - * Copyright (C) 1999 by Lineo, inc. - * Written by John Beppu - * - * 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 - * + * Licensed under GPLv2 or later, see file LICENSE in this source tree. */ -#include "internal.h" -#include -#include - -static const char tee_usage[] = - "tee [OPTION]... [FILE]...\n\n" - "Copy standard input to each FILE, and also to standard output.\n\n" - "Options:\n" "\t-a\tappend to the given FILEs, do not overwrite\n" -#if 0 - "\t-i\tignore interrupt signals\n" -#endif -; - - -/* FileList _______________________________________________________________ */ - -#define FL_MAX 1024 -static FILE **FileList; -static int FL_end; - -typedef void (FL_Function) (FILE * file, char c); - - -/* apply a function to everything in FileList */ -static void FL_apply(FL_Function * f, char c) -{ - int i; - - for (i = 0; i <= FL_end; i++) { - f(FileList[i], c); - } -} - -/* FL_Function for writing to files*/ -static void tee_fwrite(FILE * file, char c) -{ - fputc(c, file); -} +/* BB_AUDIT SUSv3 compliant */ +/* http://www.opengroup.org/onlinepubs/007904975/utilities/tee.html */ -/* FL_Function for closing files */ -static void tee_fclose(FILE * file, char c) -{ - fclose(file); -} +//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" -/* ________________________________________________________________________ */ +#include "libbb.h" -/* BusyBoxed tee(1) */ +int tee_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE; int tee_main(int argc, char **argv) { - int i; - char c; - char opt; - char opt_fopen[2] = "w"; - FILE *file; - - /* parse argv[] */ - for (i = 1; i < argc; i++) { - if (argv[i][0] == '-') { - opt = argv[i][1]; - switch (opt) { - case 'a': - opt_fopen[0] = 'a'; - break; -#if 0 - case 'i': - fprintf(stderr, "ignore interrupt not implemented\n"); - break; + 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 - default: - usage(tee_usage); - } - } else { - break; - } - } + retval = getopt32(argv, "ia"); /* 'a' must be 2nd */ + argc -= optind; + argv += optind; + + mode += (retval & 2); /* Since 'a' is the 2nd option... */ - /* init FILE pointers */ - FileList = calloc(FL_MAX, sizeof(FILE*)); - if (!FileList) { - fprintf(stderr, "tee: %s\n", strerror(errno)); - exit(1); + if (retval & 1) { + signal(SIGINT, SIG_IGN); /* TODO - switch to sigaction. (why?) */ } - FL_end = 0; - FileList[0] = stdout; - for (; i < argc; i++) { - /* add a file to FileList */ - file = fopen(argv[i], opt_fopen); - if (!file) { - continue; - } - if (FL_end < FL_MAX) { - FileList[++FL_end] = file; + 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); + + /* 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); } - - /* read and redirect */ - while ((c = (char) getchar()) && (!feof(stdin))) { - FL_apply(tee_fwrite, c); + 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 - /* clean up */ - FL_apply(tee_fclose, 0); - /* Don't bother to close files Exit does that - * automagically, so we can save a few bytes */ - /* free(FileList); */ - exit(0); + /* 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); + + fflush_stdout_and_exit(retval); } - -/* $Id: tee.c,v 1.8 2000/03/23 01:09:18 erik Exp $ */