diff options
| author | Elliott Hughes <enh@google.com> | 2016-04-15 18:48:12 -0700 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2016-04-16 19:58:56 -0500 |
| commit | 00a60fcaa318a437ab66d9a6bd6c065a019a8fad (patch) | |
| tree | 6dbf8f2731b1b4a861dddc385d5e72cc2d512146 | |
| parent | 406d4c978ac841b34c8725e67da9962957da1848 (diff) | |
| download | toybox-00a60fcaa318a437ab66d9a6bd6c065a019a8fad.tar.gz | |
Fix "ssh top".
The ps.c change allows us to start. The interestingtimes.c change allows
us to clean up properly afterwards if you ^C out (which you usually do).
Tested with both ssh and "adb shell" (the latter being where I noticed
the problem).
| -rw-r--r-- | lib/interestingtimes.c | 2 | ||||
| -rw-r--r-- | toys/posix/ps.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/interestingtimes.c b/lib/interestingtimes.c index c4ea2c27..8337ce8b 100644 --- a/lib/interestingtimes.c +++ b/lib/interestingtimes.c @@ -227,7 +227,7 @@ void tty_jump(int x, int y) void tty_reset(void) { - set_terminal(1, 0, 0); + set_terminal(0, 0, 0); tty_esc("?25h"); tty_esc("0m"); tty_jump(0, 999); diff --git a/toys/posix/ps.c b/toys/posix/ps.c index a1e1981a..5235a64a 100644 --- a/toys/posix/ps.c +++ b/toys/posix/ps.c @@ -1417,7 +1417,7 @@ static void top_setup(char *defo, char *defk) TT.top.d *= 1000; if (toys.optflags&FLAG_b) TT.width = TT.height = 99999; else { - xset_terminal(0, 1, 0); + set_terminal(0, 1, 0); sigatexit(tty_sigreset); xsignal(SIGWINCH, generic_signal); printf("\033[?25l\033[0m"); |