diff options
Diffstat (limited to 'src/tee.c')
| -rw-r--r-- | src/tee.c | 210 |
1 files changed, 135 insertions, 75 deletions
@@ -1,10 +1,10 @@ /* tee - read from standard input and write to standard output and files. - Copyright (C) 85,1990-2006 Free Software Foundation, Inc. + Copyright (C) 1985-2016 Free Software Foundation, Inc. - This program is free software; you can redistribute it and/or modify + 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, or (at your option) - any later version. + the Free Software Foundation, either version 3 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 @@ -12,8 +12,7 @@ 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + along with this program. If not, see <http://www.gnu.org/licenses/>. */ /* Mike Parker, Richard M. Stallman, and David MacKenzie */ @@ -23,15 +22,21 @@ #include <getopt.h> #include "system.h" +#include "argmatch.h" #include "error.h" +#include "fadvise.h" #include "stdio--.h" +#include "xfreopen.h" -/* The official name of this program (e.g., no `g' prefix). */ +/* The official name of this program (e.g., no 'g' prefix). */ #define PROGRAM_NAME "tee" -#define AUTHORS "Mike Parker", "Richard M. Stallman", "David MacKenzie" +#define AUTHORS \ + proper_name ("Mike Parker"), \ + proper_name ("Richard M. Stallman"), \ + proper_name ("David MacKenzie") -static bool tee_files (int nfiles, const char **files); +static bool tee_files (int nfiles, char **files); /* If true, append to output files rather than truncating them. */ static bool append; @@ -39,24 +44,43 @@ static bool append; /* If true, ignore interrupts. */ static bool ignore_interrupts; -/* The name that this program was run with. */ -char *program_name; +enum output_error + { + output_error_sigpipe, /* traditional behavior, sigpipe enabled. */ + output_error_warn, /* warn on EPIPE, but continue. */ + output_error_warn_nopipe, /* ignore EPIPE, continue. */ + output_error_exit, /* exit on any output error. */ + output_error_exit_nopipe /* exit on any output error except EPIPE. */ + }; + +static enum output_error output_error; static struct option const long_options[] = { {"append", no_argument, NULL, 'a'}, {"ignore-interrupts", no_argument, NULL, 'i'}, + {"output-error", optional_argument, NULL, 'p'}, {GETOPT_HELP_OPTION_DECL}, {GETOPT_VERSION_OPTION_DECL}, {NULL, 0, NULL, 0} }; +static char const *const output_error_args[] = +{ + "warn", "warn-nopipe", "exit", "exit-nopipe", NULL +}; +static enum output_error const output_error_types[] = +{ + output_error_warn, output_error_warn_nopipe, + output_error_exit, output_error_exit_nopipe +}; +ARGMATCH_VERIFY (output_error_args, output_error_types); + void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { printf (_("Usage: %s [OPTION]... [FILE]...\n"), program_name); @@ -66,13 +90,25 @@ Copy standard input to each FILE, and also to standard output.\n\ -a, --append append to the given FILEs, do not overwrite\n\ -i, --ignore-interrupts ignore interrupt signals\n\ "), stdout); + fputs (_("\ + -p diagnose errors writing to non pipes\n\ + --output-error[=MODE] set behavior on write error. See MODE below\n\ +"), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); fputs (_("\ \n\ -If a FILE is -, copy again to standard output.\n\ +MODE determines behavior with write errors on the outputs:\n\ + 'warn' diagnose errors writing to any output\n\ + 'warn-nopipe' diagnose errors writing to any output not a pipe\n\ + 'exit' exit on error writing to any output\n\ + 'exit-nopipe' exit on error writing to any output not a pipe\n\ +The default MODE for the -p option is 'warn-nopipe'.\n\ +The default operation when --output-error is not specified, is to\n\ +exit immediately on error writing to a pipe, and diagnose errors\n\ +writing to non pipe outputs.\n\ "), stdout); - printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -84,7 +120,7 @@ main (int argc, char **argv) int optc; initialize_main (&argc, &argv); - program_name = argv[0]; + set_program_name (argv[0]); setlocale (LC_ALL, ""); bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); @@ -94,50 +130,62 @@ main (int argc, char **argv) append = false; ignore_interrupts = false; - while ((optc = getopt_long (argc, argv, "ai", long_options, NULL)) != -1) + while ((optc = getopt_long (argc, argv, "aip", long_options, NULL)) != -1) { switch (optc) - { - case 'a': - append = true; - break; - - case 'i': - ignore_interrupts = true; - break; - - case_GETOPT_HELP_CHAR; - - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); - - default: - usage (EXIT_FAILURE); - } + { + case 'a': + append = true; + break; + + case 'i': + ignore_interrupts = true; + break; + + case 'p': + if (optarg) + output_error = XARGMATCH ("--output-error", optarg, + output_error_args, output_error_types); + else + output_error = output_error_warn_nopipe; + break; + + case_GETOPT_HELP_CHAR; + + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + + default: + usage (EXIT_FAILURE); + } } if (ignore_interrupts) signal (SIGINT, SIG_IGN); + if (output_error != output_error_sigpipe) + signal (SIGPIPE, SIG_IGN); + /* Do *not* warn if tee is given no file arguments. POSIX requires that it work when given no arguments. */ - ok = tee_files (argc - optind, (const char **) &argv[optind]); + ok = tee_files (argc - optind, &argv[optind]); if (close (STDIN_FILENO) != 0) - error (EXIT_FAILURE, errno, _("standard input")); + error (EXIT_FAILURE, errno, "%s", _("standard input")); - exit (ok ? EXIT_SUCCESS : EXIT_FAILURE); + return ok ? EXIT_SUCCESS : EXIT_FAILURE; } /* Copy the standard input into each of the NFILES files in FILES - and into the standard output. + and into the standard output. As a side effect, modify FILES[-1]. Return true if successful. */ static bool -tee_files (int nfiles, const char **files) +tee_files (int nfiles, char **files) { + size_t n_outputs = 0; FILE **descriptors; char buffer[BUFSIZ]; - ssize_t bytes_read; + ssize_t bytes_read = 0; int i; bool ok = true; char const *mode_string = @@ -145,58 +193,71 @@ tee_files (int nfiles, const char **files) ? (append ? "ab" : "wb") : (append ? "a" : "w")); - descriptors = xnmalloc (nfiles + 1, sizeof *descriptors); - - /* Move all the names `up' one in the argv array to make room for - the entry for standard output. This writes into argv[argc]. */ - for (i = nfiles; i >= 1; i--) - files[i] = files[i - 1]; - if (O_BINARY && ! isatty (STDIN_FILENO)) - freopen (NULL, "rb", stdin); + xfreopen (NULL, "rb", stdin); if (O_BINARY && ! isatty (STDOUT_FILENO)) - freopen (NULL, "wb", stdout); + xfreopen (NULL, "wb", stdout); + + fadvise (stdin, FADVISE_SEQUENTIAL); - /* In the array of NFILES + 1 descriptors, make - the first one correspond to standard output. */ + /* Set up FILES[0 .. NFILES] and DESCRIPTORS[0 .. NFILES]. + In both arrays, entry 0 corresponds to standard output. */ + + descriptors = xnmalloc (nfiles + 1, sizeof *descriptors); + files--; descriptors[0] = stdout; - files[0] = _("standard output"); + files[0] = bad_cast (_("standard output")); setvbuf (stdout, NULL, _IONBF, 0); + n_outputs++; for (i = 1; i <= nfiles; i++) { - descriptors[i] = (STREQ (files[i], "-") - ? stdout - : fopen (files[i], mode_string)); + /* Do not treat "-" specially - as mandated by POSIX. */ + descriptors[i] = fopen (files[i], mode_string); if (descriptors[i] == NULL) - { - error (0, errno, "%s", files[i]); - ok = false; - } + { + error (output_error == output_error_exit + || output_error == output_error_exit_nopipe, + errno, "%s", quotef (files[i])); + ok = false; + } else - setvbuf (descriptors[i], NULL, _IONBF, 0); + { + setvbuf (descriptors[i], NULL, _IONBF, 0); + n_outputs++; + } } - while (1) + while (n_outputs) { bytes_read = read (0, buffer, sizeof buffer); -#ifdef EINTR if (bytes_read < 0 && errno == EINTR) continue; -#endif if (bytes_read <= 0) - break; + break; /* Write to all NFILES + 1 descriptors. - Standard output is the first one. */ + Standard output is the first one. */ for (i = 0; i <= nfiles; i++) - if (descriptors[i] - && fwrite (buffer, 1, bytes_read, descriptors[i]) != bytes_read) - { - error (0, errno, "%s", files[i]); - descriptors[i] = NULL; - ok = false; - } + if (descriptors[i] + && fwrite (buffer, bytes_read, 1, descriptors[i]) != 1) + { + int w_errno = errno; + bool fail = errno != EPIPE || (output_error == output_error_exit + || output_error == output_error_warn); + if (descriptors[i] == stdout) + clearerr (stdout); /* Avoid redundant close_stdout diagnostic. */ + if (fail) + { + error (output_error == output_error_exit + || output_error == output_error_exit_nopipe, + w_errno, "%s", quotef (files[i])); + } + descriptors[i] = NULL; + if (fail) + ok = false; + n_outputs--; + } } if (bytes_read == -1) @@ -207,11 +268,10 @@ tee_files (int nfiles, const char **files) /* Close the files, but not standard output. */ for (i = 1; i <= nfiles; i++) - if (!STREQ (files[i], "-") - && descriptors[i] && fclose (descriptors[i]) != 0) + if (descriptors[i] && fclose (descriptors[i]) != 0) { - error (0, errno, "%s", files[i]); - ok = false; + error (0, errno, "%s", quotef (files[i])); + ok = false; } free (descriptors); |