From f3d4a2c72f315fd3bb0a939f6331ee0465fcfe2f Mon Sep 17 00:00:00 2001 From: Rob Landley Date: Sun, 22 Dec 2019 20:54:03 -0600 Subject: Bugfix: tee with no arguments was writing to stdout twice. Add basic smoketest while we're at it. --- toys/posix/tee.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'toys/posix') diff --git a/toys/posix/tee.c b/toys/posix/tee.c index 78139a8d..ff8a29dc 100644 --- a/toys/posix/tee.c +++ b/toys/posix/tee.c @@ -54,18 +54,18 @@ void tee_main(void) for (;;) { struct fd_list *fdl; - int len; + int len, out = 0; // Read data from stdin len = xread(0, toybuf, sizeof(toybuf)); if (len<1) break; // Write data to each output file, plus stdout. - fdl = TT.outputs; - for (;;) { - if(len != writeall(fdl ? fdl->fd : 1, toybuf, len)) toys.exitval=1; + for (fdl = TT.outputs; ;fdl = fdl->next) { + if (!fdl && out) break; + if (len != writeall(fdl ? fdl->fd : 1, toybuf, len)) toys.exitval=1; if (!fdl) break; - fdl = fdl->next; + if (fdl->fd == 1) out++; } } } -- cgit v1.2.3