diff options
| author | Elliott Hughes <enh@google.com> | 2021-04-26 15:13:24 -0700 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2021-04-27 02:39:08 -0500 |
| commit | 2c30d4f7a6a6ee16f9149519f6e2634b58c281cb (patch) | |
| tree | 61004b68630e82d30ede55c9f34bc4f30ceea7e6 /toys | |
| parent | 4785b7611de7eae714941b2e648ffa85c336108b (diff) | |
| download | toybox-2c30d4f7a6a6ee16f9149519f6e2634b58c281cb.tar.gz | |
More line buffering.
This patch does two things:
1. Enable line buffering for echo and yes. I found this through test
flakiness from the toybox xargs tests running in CI on devices where
"echo" is provided by toybox. For `echo y`, GNU echo does one write
of "y\n" but toybox echo was doing two writes, which makes it more
likely (4% on the heavily-loaded CI machines) for writes from the two
processes to be interleaved.
2. Fix line buffering on glibc if you're calling `toybox foo` rather
than `foo`. Otherwise we come through once and switch to unbuffered
mode, then again and switch to line buffered mode --- which doesn't
seem to actually work in glibc unless you specify a buffer (so
passing toybuf and sizeof(toybuf) works, but NULL and 0 doesn't).
I hit the second issue trying to reproduce the first issue on the desktop
rather than on Android.
(If you're scratching your head wondering "why yes(1) too, not just
echo(1)?", that represents a blind alley I went down when I mistook
which tool was in use. It seemed like the same principle should apply,
and it matches what other implementations do.)
Diffstat (limited to 'toys')
| -rw-r--r-- | toys/other/yes.c | 2 | ||||
| -rw-r--r-- | toys/posix/echo.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/toys/other/yes.c b/toys/other/yes.c index 773a5a88..8edba0ae 100644 --- a/toys/other/yes.c +++ b/toys/other/yes.c @@ -2,7 +2,7 @@ * * Copyright 2007 Rob Landley <rob@landley.net> -USE_YES(NEWTOY(yes, NULL, TOYFLAG_USR|TOYFLAG_BIN)) +USE_YES(NEWTOY(yes, NULL, TOYFLAG_USR|TOYFLAG_BIN|TOYFLAG_LINEBUF)) config YES bool "yes" diff --git a/toys/posix/echo.c b/toys/posix/echo.c index b546e94b..9b7b9222 100644 --- a/toys/posix/echo.c +++ b/toys/posix/echo.c @@ -9,7 +9,7 @@ * We also honor -- to _stop_ option parsing (bash doesn't, we go with * consistency over compatibility here). -USE_ECHO(NEWTOY(echo, "^?Een[-eE]", TOYFLAG_BIN|TOYFLAG_MAYFORK)) +USE_ECHO(NEWTOY(echo, "^?Een[-eE]", TOYFLAG_BIN|TOYFLAG_MAYFORK|TOYFLAG_LINEBUF)) config ECHO bool "echo" |