diff options
author | Rob Landley <rob@landley.net> | 2019-04-16 16:53:27 -0500 |
---|---|---|
committer | Rob Landley <rob@landley.net> | 2019-04-16 16:53:27 -0500 |
commit | 2a1f89e5d941a77e8c93ad0a5fe78229a4207d61 (patch) | |
tree | f54c6364e70eafb604bff6e078728e6faf66a57d /toys | |
parent | 63a0e7afff271ac1b1df3309bbf35f52e4771419 (diff) | |
download | toybox-2a1f89e5d941a77e8c93ad0a5fe78229a4207d61.tar.gz |
Add argument to xflush() so it can test for stdout err without flushing.
Diffstat (limited to 'toys')
-rw-r--r-- | toys/other/hexedit.c | 2 | ||||
-rw-r--r-- | toys/pending/arping.c | 1 | ||||
-rw-r--r-- | toys/pending/vi.c | 4 | ||||
-rw-r--r-- | toys/posix/echo.c | 4 | ||||
-rw-r--r-- | toys/posix/head.c | 1 |
5 files changed, 4 insertions, 8 deletions
diff --git a/toys/other/hexedit.c b/toys/other/hexedit.c index 06a96a22..809340a1 100644 --- a/toys/other/hexedit.c +++ b/toys/other/hexedit.c @@ -180,7 +180,7 @@ void hexedit_main(void) // Display cursor and flush output highlight(x, y, ro ? 3 : side); - xflush(); + xflush(1); // Wait for next key key = scan_key(keybuf, -1); diff --git a/toys/pending/arping.c b/toys/pending/arping.c index be43cab1..6007845b 100644 --- a/toys/pending/arping.c +++ b/toys/pending/arping.c @@ -166,7 +166,6 @@ static void recv_from(struct sockaddr_ll *from, int *recv_len) gettimeofday(&tval, NULL); delta = (tval.tv_sec * 1000000ULL + (tval.tv_usec)) - TT.sent_at; xprintf(" %u.%03ums\n", delta / 1000, delta % 1000); - xflush(); } } TT.rcvd_nr++; diff --git a/toys/pending/vi.c b/toys/pending/vi.c index 31516b55..2beedf49 100644 --- a/toys/pending/vi.c +++ b/toys/pending/vi.c @@ -543,7 +543,7 @@ void vi_main(void) //we dont get scroll log full of junk tty_esc("?1049h"); tty_esc("H"); - xflush(); + xflush(1); draw_page(); while(1) { key = scan_key(keybuf, -1); @@ -821,7 +821,7 @@ static void draw_page() tty_esc("0m"); } else tty_jump(cx_scr, cy_scr); - xflush(); + xflush(1); } diff --git a/toys/posix/echo.c b/toys/posix/echo.c index 639f87ab..63eb1981 100644 --- a/toys/posix/echo.c +++ b/toys/posix/echo.c @@ -65,7 +65,7 @@ void echo_main(void) int slash = *(c++), n = unescape(slash); if (n) out = n; - else if (slash=='c') goto done; + else if (slash=='c') return; else if (slash=='0') { out = 0; while (*c>='0' && *c<='7' && n++<3) out = (out*8)+*(c++)-'0'; @@ -90,6 +90,4 @@ void echo_main(void) // Output "\n" if no -n if (!(toys.optflags&FLAG_n)) putchar('\n'); -done: - xflush(); } diff --git a/toys/posix/head.c b/toys/posix/head.c index 7e34a714..38ab919e 100644 --- a/toys/posix/head.c +++ b/toys/posix/head.c @@ -40,7 +40,6 @@ static void do_head(int fd, char *name) // Print an extra newline for all but the first file if (TT.file_no) xprintf("\n"); xprintf("==> %s <==\n", name); - xflush(); } while ((toys.optflags&FLAG_c) ? bytes : lines) { |