/* BB_AUDIT SUSv3 compliant */
/* http://www.opengroup.org/onlinepubs/007904975/utilities/tee.html */
-#include "busybox.h"
-#include <signal.h>
+#include "libbb.h"
-int tee_main(int argc, char **argv);
+int tee_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int tee_main(int argc, char **argv)
{
const char *mode = "w\0a";
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
- retval = getopt32(argc, argv, "ia"); /* 'a' must be 2nd */
+ retval = getopt32(argv, "ia"); /* 'a' must be 2nd */
argc -= optind;
argv += optind;
mode += (retval & 2); /* Since 'a' is the 2nd option... */
if (retval & 1) {
- signal(SIGINT, SIG_IGN); /* TODO - switch to sigaction. */
+ signal(SIGINT, SIG_IGN); /* TODO - switch to sigaction. (why?) */
}
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); /* TODO - switch to sigaction. */
+ signal(SIGPIPE, SIG_IGN);
/* Allocate an array of FILE *'s, with one extra for a sentinal. */
fp = files = xzalloc(sizeof(FILE *) * (argc + 2));
files[0] = stdout;
goto GOT_NEW_FILE;
do {
- *fp = fopen_or_warn(*argv, mode);
- if (*fp == NULL) {
- retval = EXIT_FAILURE;
- continue;
+ *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. */
+ 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, BUFSIZ)) > 0) {
+ while ((c = safe_read(STDIN_FILENO, buf, sizeof(buf))) > 0) {
fp = files;
do
fwrite(buf, 1, c, *fp++);