X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=coreutils%2Ftee.c;h=73c2f8e9df406c6f0f790141ebdd835a5ddf32be;hb=637d2266e1ea711f27ab0aec200a196b5eccbbca;hp=fe444fcc4a66b6708b7cf6cb088d7c96b698ffc9;hpb=059f152a7a2d1796cf93d1a79f33055d38b94f2a;p=oweals%2Fbusybox.git diff --git a/coreutils/tee.c b/coreutils/tee.c index fe444fcc4..73c2f8e9d 100644 --- a/coreutils/tee.c +++ b/coreutils/tee.c @@ -1,9 +1,8 @@ +/* vi: set sw=4 ts=4: */ /* - * Mini tee implementation for busybox + * tee implementation for busybox * - * - * Copyright (C) 1999 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 @@ -21,127 +20,97 @@ * */ +/* BB_AUDIT SUSv3 compliant */ +/* http://www.opengroup.org/onlinepubs/007904975/utilities/tee.html */ + #include #include +#include +#include +#include "busybox.h" -/* FileList _______________________________________________________________ */ - -#define FL_MAX 1024 -static FILE *FileList[FL_MAX]; -static int FL_end; - -typedef void (FL_Function)(FILE *file, char c); - -/* initialize FileList */ -static void -FL_init() -{ - FL_end = 0; - FileList[0] = stdout; -} - -/* add a file to FileList */ -static int -FL_add(const char *filename, char *opt_open) -{ - FILE *file; - - file = fopen(filename, opt_open); - if (!file) { return 0; }; - if (FL_end < FL_MAX) { - FileList[++FL_end] = file; - } - return 1; -} - -/* apply a function to everything in FileList */ -static void -FL_apply(FL_Function *f, char c) +int tee_main(int argc, char **argv) { - 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); -} + 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 + + flags = bb_getopt_ulflags(argc, argv, "ia"); /* 'a' must be 2nd */ + + mode += (flags & 2); /* Since 'a' is the 2nd option... */ + + if (flags & 1) { + signal(SIGINT, SIG_IGN); /* TODO - switch to sigaction.*/ + } -/* FL_Function for closing files */ -static void -tee_fclose(FILE *file, char c) -{ - fclose(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; + } + 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); + } + } -/* help message */ -static void -tee_usage() -{ - fprintf ( - stdout, - "%s\n%s\n%s\n%s\n%s\n", - "Usage: tee [OPTION]... [FILE]...", - "Copy standard input to each FILE, and also to standard output.\n", - " -a, append to the given FILEs, do not overwrite", - " -i, ignore interrupt signals", - " -h, this help message" - ); - exit(1); -} +#ifdef CONFIG_FEATURE_CLEAN_UP + RELEASE_CONFIG_BUFFER(buf); +#endif -/* BusyBoxed tee(1) */ -int -tee_main(int argc, char **argv) -{ - int i; - char c; - char opt; - char opt_fopen[2] = "w"; - - /* 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; - case 'i': - fprintf(stderr, "ingore interrupt not implemented\n"); - break; - case 'h': - tee_usage(); - break; - default: - fprintf(stderr, "tee: invalid option -- %c\n", opt); - tee_usage(); - } - } else { - break; +#else + setvbuf(stdout, NULL, _IONBF, 0); + while ((c = getchar()) != EOF) { + for (p=files ; *p ; p++) { + putc(c, *p); + } } - } - - /* init FILE pointers */ - FL_init(); - for ( ; i < argc; i++) { - FL_add(argv[i], opt_fopen); - } - - /* read and redirect */ - while ((c = (char) getchar()) && (!feof(stdin))) { - FL_apply(tee_fwrite, c); - } - - /* clean up */ - FL_apply(tee_fclose, 0); - exit(0); +#endif + + /* 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.1 1999/12/10 05:27:16 beppu Exp $ */