> How to Help
> To contact the maintainers, either to report a bug or to contribute fixes
or improvements, send mail to [EMAIL PROTECTED]
hi
i've been craving for an option to tee to be able to output to stderr. i'd
been using the following shell function for a while:
function teeerr () {
# print stdin to both stdout and stderr
while read i ; do
echo "$i"
echo "$i" 1>&2
done
}
but i just had a look at the source code and adding the capability to tee was
dead easy, so i just did it myself. the patch is attached, as well as what i
propose should be the new tee.c (the patched file). if you're going to
consider it, please review the changes, it should be very simple. i branched
off of 2.0.12 from alpha.gnu.org.
this feature is convenient to monitor something in the middle of a pipe which
doesn't otherwise output error nor output. another possibility was to tee to
a fifo, and tail off the fifo, but that requires creating and destroying the
fifo.
please let me know if you decide to include the patch.
thank you,
--- tee-orig.c Fri Jun 7 16:32:34 2002
+++ tee.c Fri Jun 7 16:34:15 2002
@@ -37,6 +37,9 @@
/* If nonzero, append to output files rather than truncating them. */
static int append;
+/* If nonzero, output to stderr as well. */
+static int out_stderr;
+
/* If nonzero, ignore interrupts. */
static int ignore_interrupts;
@@ -46,6 +49,7 @@
static struct option const long_options[] =
{
{"append", no_argument, NULL, 'a'},
+ {"stderr", no_argument, NULL, 'e'},
{"ignore-interrupts", no_argument, NULL, 'i'},
{GETOPT_HELP_OPTION_DECL},
{GETOPT_VERSION_OPTION_DECL},
@@ -65,6 +69,7 @@
Copy standard input to each FILE, and also to standard output.\n\
\n\
-a, --append append to the given FILEs, do not overwrite\n\
+ -e, --stderr output to standard error as well\n\
-i, --ignore-interrupts ignore interrupt signals\n\
"), stdout);
fputs (HELP_OPTION_DESCRIPTION, stdout);
@@ -88,9 +93,10 @@
atexit (close_stdout);
append = 0;
+ out_stderr = 0;
ignore_interrupts = 0;
- while ((optc = getopt_long (argc, argv, "ai", long_options, NULL)) != -1)
+ while ((optc = getopt_long (argc, argv, "aei", long_options, NULL)) != -1)
{
switch (optc)
{
@@ -101,6 +107,10 @@
append = 1;
break;
+ case 'e':
+ out_stderr = 1;
+ break;
+
case 'i':
ignore_interrupts = 1;
break;
@@ -164,24 +174,37 @@
char buffer[BUFSIZ];
int bytes_read, i;
int ret = 0;
+ int nbstdfiles = 1;
const char *mode_string = (append ? "a" : "w");
+
+ if ( out_stderr )
+ nbstdfiles += 1;
- descriptors = (FILE **) xmalloc ((nfiles + 1) * sizeof (descriptors[0]));
+ descriptors = (FILE **) xmalloc ((nfiles + nbstdfiles) *
+ sizeof (descriptors[0]));
/* 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];
+ the entry for standard output (and standard error, if requested).
+ This writes into argv[argc]. */
+ for (i = nfiles; i >= nbstdfiles; i--)
+ files[i] = files[i - nbstdfiles];
SET_BINARY2 (0, 1);
- /* In the array of NFILES + 1 descriptors, make
- the first one correspond to standard output. */
+ /* In the array of NFILES + nbstdfile descriptors, make the first one
+ correspond to standard output (and the second one correspond to standard
+ error, if requested). */
descriptors[0] = stdout;
files[0] = _("standard output");
SETVBUF (stdout, NULL, _IONBF, 0);
- for (i = 1; i <= nfiles; i++)
+ if ( out_stderr ) {
+ descriptors[1] = stderr;
+ files[1] = _("standard error");
+ SETVBUF (stderr, NULL, _IONBF, 0);
+ }
+
+ for (i = nbstdfiles; i < (nfiles + nbstdfiles); i++)
{
descriptors[i] = fopen (files[i], mode_string);
if (descriptors[i] == NULL)
@@ -206,9 +229,9 @@
if (bytes_read <= 0)
break;
- /* Write to all NFILES + 1 descriptors.
+ /* Write to all NFILES + nbstdfiles descriptors.
Standard output is the first one. */
- for (i = 0; i <= nfiles; i++)
+ for (i = 0; i < (nfiles + nbstdfiles); i++)
{
if (descriptors[i] != NULL)
fwrite (buffer, bytes_read, 1, descriptors[i]);
@@ -221,8 +244,8 @@
ret = 1;
}
- /* Close the files, but not standard output. */
- for (i = 1; i <= nfiles; i++)
+ /* Close the files, but not standard output, nor standard error. */
+ for (i = nbstdfiles; i < (nfiles + nbstdfiles); i++)
if (descriptors[i] != NULL
&& (ferror (descriptors[i]) || fclose (descriptors[i]) == EOF))
{
/* tee - read from standard input and write to standard output and files.
Copyright (C) 85,1990-2001 Free Software Foundation, Inc.
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.
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. */
/* Mike Parker, Richard M. Stallman, and David MacKenzie */
#include <config.h>
#include <stdio.h>
#include <sys/types.h>
#include <signal.h>
#include <getopt.h>
#include "system.h"
#include "closeout.h"
#include "error.h"
/* The official name of this program (e.g., no `g' prefix). */
#define PROGRAM_NAME "tee"
#define AUTHORS N_ ("Mike Parker, Richard M. Stallman, and David MacKenzie")
static int tee PARAMS ((int nfiles, const char **files));
/* If nonzero, append to output files rather than truncating them. */
static int append;
/* If nonzero, output to stderr as well. */
static int out_stderr;
/* If nonzero, ignore interrupts. */
static int ignore_interrupts;
/* The name that this program was run with. */
char *program_name;
static struct option const long_options[] =
{
{"append", no_argument, NULL, 'a'},
{"stderr", no_argument, NULL, 'e'},
{"ignore-interrupts", no_argument, NULL, 'i'},
{GETOPT_HELP_OPTION_DECL},
{GETOPT_VERSION_OPTION_DECL},
{NULL, 0, NULL, 0}
};
void
usage (int status)
{
if (status != 0)
fprintf (stderr, _("Try `%s --help' for more information.\n"),
program_name);
else
{
printf (_("Usage: %s [OPTION]... [FILE]...\n"), program_name);
fputs (_("\
Copy standard input to each FILE, and also to standard output.\n\
\n\
-a, --append append to the given FILEs, do not overwrite\n\
-e, --stderr output to standard error as well\n\
-i, --ignore-interrupts ignore interrupt signals\n\
"), stdout);
fputs (HELP_OPTION_DESCRIPTION, stdout);
fputs (VERSION_OPTION_DESCRIPTION, stdout);
puts (_("\nReport bugs to <[EMAIL PROTECTED]>."));
}
exit (status);
}
int
main (int argc, char **argv)
{
int errs;
int optc;
program_name = argv[0];
setlocale (LC_ALL, "");
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
atexit (close_stdout);
append = 0;
out_stderr = 0;
ignore_interrupts = 0;
while ((optc = getopt_long (argc, argv, "aei", long_options, NULL)) != -1)
{
switch (optc)
{
case 0:
break;
case 'a':
append = 1;
break;
case 'e':
out_stderr = 1;
break;
case 'i':
ignore_interrupts = 1;
break;
case_GETOPT_HELP_CHAR;
case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
default:
usage (1);
}
}
if (ignore_interrupts)
{
#ifdef _POSIX_SOURCE
struct sigaction sigact;
sigact.sa_handler = SIG_IGN;
sigemptyset (&sigact.sa_mask);
sigact.sa_flags = 0;
sigaction (SIGINT, &sigact, NULL);
#else /* !_POSIX_SOURCE */
signal (SIGINT, SIG_IGN);
#endif /* _POSIX_SOURCE */
}
/* Don't let us be killed if one of the output files is a pipe that
doesn't consume all its input. */
#ifdef _POSIX_SOURCE
{
struct sigaction sigact;
sigact.sa_handler = SIG_IGN;
sigemptyset (&sigact.sa_mask);
sigact.sa_flags = 0;
sigaction (SIGPIPE, &sigact, NULL);
}
#else
signal (SIGPIPE, SIG_IGN);
#endif
/* Do *not* warn if tee is given no file arguments.
POSIX requires that it work when given no arguments. */
errs = tee (argc - optind, (const char **) &argv[optind]);
if (close (0) != 0)
error (1, errno, _("standard input"));
exit (errs);
}
/* Copy the standard input into each of the NFILES files in FILES
and into the standard output.
Return 0 if successful, 1 if any errors occur. */
static int
tee (int nfiles, const char **files)
{
FILE **descriptors;
char buffer[BUFSIZ];
int bytes_read, i;
int ret = 0;
int nbstdfiles = 1;
const char *mode_string = (append ? "a" : "w");
if ( out_stderr )
nbstdfiles += 1;
descriptors = (FILE **) xmalloc ((nfiles + nbstdfiles) *
sizeof (descriptors[0]));
/* Move all the names `up' one in the argv array to make room for
the entry for standard output (and standard error, if requested).
This writes into argv[argc]. */
for (i = nfiles; i >= nbstdfiles; i--)
files[i] = files[i - nbstdfiles];
SET_BINARY2 (0, 1);
/* In the array of NFILES + nbstdfile descriptors, make the first one
correspond to standard output (and the second one correspond to standard
error, if requested). */
descriptors[0] = stdout;
files[0] = _("standard output");
SETVBUF (stdout, NULL, _IONBF, 0);
if ( out_stderr ) {
descriptors[1] = stderr;
files[1] = _("standard error");
SETVBUF (stderr, NULL, _IONBF, 0);
}
for (i = nbstdfiles; i < (nfiles + nbstdfiles); i++)
{
descriptors[i] = fopen (files[i], mode_string);
if (descriptors[i] == NULL)
{
error (0, errno, "%s", files[i]);
ret = 1;
}
else
{
SETVBUF (descriptors[i], NULL, _IONBF, 0);
SET_BINARY (fileno (descriptors[i]));
}
}
while (1)
{
bytes_read = read (0, buffer, sizeof buffer);
#ifdef EINTR
if (bytes_read < 0 && errno == EINTR)
continue;
#endif
if (bytes_read <= 0)
break;
/* Write to all NFILES + nbstdfiles descriptors.
Standard output is the first one. */
for (i = 0; i < (nfiles + nbstdfiles); i++)
{
if (descriptors[i] != NULL)
fwrite (buffer, bytes_read, 1, descriptors[i]);
}
}
if (bytes_read == -1)
{
error (0, errno, _("read error"));
ret = 1;
}
/* Close the files, but not standard output, nor standard error. */
for (i = nbstdfiles; i < (nfiles + nbstdfiles); i++)
if (descriptors[i] != NULL
&& (ferror (descriptors[i]) || fclose (descriptors[i]) == EOF))
{
error (0, errno, "%s", files[i]);
ret = 1;
}
free (descriptors);
return ret;
}
