X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Ftee.c;h=73c2f8e9df406c6f0f790141ebdd835a5ddf32be;hb=637d2266e1ea711f27ab0aec200a196b5eccbbca;hp=c9b5410d312347d59e200b6497bb5566844d941c;hpb=b610615be9aedfac07d1e01f12575707fa3a227c;p=oweals%2Fbusybox.git diff --git a/coreutils/tee.c b/coreutils/tee.c index c9b5410d3..73c2f8e9d 100644 --- a/coreutils/tee.c +++ b/coreutils/tee.c @@ -1,10 +1,8 @@ /* vi: set sw=4 ts=4: */ /* - * Mini tee implementation for busybox + * tee implementation for busybox * - * - * Copyright (C) 1999,2000 by Lineo, inc. - * Written by John Beppu + * Copyright (C) 2003 Manuel Novoa III * * 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 @@ -22,115 +20,97 @@ * */ -#include "internal.h" -#include -#include - -static const char tee_usage[] = - "tee [OPTION]... [FILE]...\n" -#ifndef BB_FEATURE_TRIVIAL_HELP - "\nCopy 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 -#endif -; - - -/* FileList _______________________________________________________________ */ - -#define FL_MAX 1024 -static FILE **FileList; -static int FL_end; +/* BB_AUDIT SUSv3 compliant */ +/* http://www.opengroup.org/onlinepubs/007904975/utilities/tee.html */ -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); - } -} +#include +#include +#include +#include +#include "busybox.h" -/* FL_Function for writing to files*/ -static void tee_fwrite(FILE * file, char c) +int tee_main(int argc, char **argv) { - fputc(c, file); -} + const char *mode = "w\0a"; + FILE **files; + FILE **p; + char **filenames; + int flags; + int retval = EXIT_SUCCESS; +#ifdef CONFIG_FEATURE_TEE_USE_BLOCK_IO + size_t c; + RESERVE_CONFIG_BUFFER(buf, BUFSIZ); +#else + int c; +#endif -/* FL_Function for closing files */ -static void tee_fclose(FILE * file, char c) -{ - fclose(file); -} + flags = bb_getopt_ulflags(argc, argv, "ia"); /* 'a' must be 2nd */ -/* ________________________________________________________________________ */ + mode += (flags & 2); /* Since 'a' is the 2nd option... */ -/* BusyBoxed tee(1) */ -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; -#endif - default: - usage(tee_usage); - } - } else { - break; - } + if (flags & 1) { + signal(SIGINT, SIG_IGN); /* TODO - switch to sigaction.*/ } - /* init FILE pointers */ - FileList = calloc(FL_MAX, sizeof(FILE*)); - if (!FileList) { - fprintf(stderr, "tee: %s\n", strerror(errno)); - exit(1); - } - FL_end = 0; - FileList[0] = stdout; - for (; i < argc; i++) { - /* add a file to FileList */ - file = fopen(argv[i], opt_fopen); - if (!file) { + /* 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); /* TODO - switch to sigaction.*/ + + /* Allocate an array of FILE *'s, with one extra for a sentinal. */ + p = files = (FILE **)xmalloc(sizeof(FILE *) * (argc - optind + 2)); + *p = stdout; + argv += optind - 1; + filenames = argv - 1; + *filenames = (char *) bb_msg_standard_input; /* for later */ + goto GOT_NEW_FILE; + + do { + if ((*p = bb_wfopen(*argv, mode)) == NULL) { + retval = EXIT_FAILURE; continue; } - if (FL_end < FL_MAX) { - FileList[++FL_end] = file; + filenames[(int)(p - files)] = *argv; + GOT_NEW_FILE: + setbuf(*p, NULL); /* tee must not buffer output. */ + ++p; + } while (*++argv); + + *p = NULL; /* Store the sentinal value. */ + +#ifdef CONFIG_FEATURE_TEE_USE_BLOCK_IO + while ((c = fread(buf, 1, BUFSIZ, stdin)) != 0) { + for (p=files ; *p ; p++) { + fwrite(buf, 1, c, *p); } } - /* read and redirect */ - while ((c = (char) getchar()) && (!feof(stdin))) { - FL_apply(tee_fwrite, c); +#ifdef CONFIG_FEATURE_CLEAN_UP + RELEASE_CONFIG_BUFFER(buf); +#endif + +#else + setvbuf(stdout, NULL, _IONBF, 0); + while ((c = getchar()) != EOF) { + for (p=files ; *p ; p++) { + putc(c, *p); + } } +#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); */ - return(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 bb_fflush_stdout_and_exit()... although fflush()ing + * is unnecessary here. */ + + p = files; + *p = 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! */ + bb_xferror(*p, filenames[(int)(p - files)]); + } while (*++p); + + bb_fflush_stdout_and_exit(retval); } - -/* $Id: tee.c,v 1.11 2000/06/19 17:25:40 andersen Exp $ */