aboutsummaryrefslogtreecommitdiff
path: root/toys/posix
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2018-01-15 13:37:25 -0600
committerRob Landley <rob@landley.net>2018-01-15 13:37:25 -0600
commita75364e25676c653c17e30592aa31548ea2a8fc0 (patch)
tree11e2db6ba08d7ec54246b498c49440967d799dac /toys/posix
parent4fdf9942fec42c9d1b10b23b5496c16d0bf6e6b7 (diff)
downloadtoybox-a75364e25676c653c17e30592aa31548ea2a8fc0.tar.gz
Merge shared_main() back into ps_main() and top_main(), add comments.
Diffstat (limited to 'toys/posix')
-rw-r--r--toys/posix/ps.c48
1 files changed, 20 insertions, 28 deletions
diff --git a/toys/posix/ps.c b/toys/posix/ps.c
index 9b645aef..fd9b54bc 100644
--- a/toys/posix/ps.c
+++ b/toys/posix/ps.c
@@ -1188,41 +1188,25 @@ static void default_ko(char *s, void *fields, char *err, struct arg_list *arg)
comma_args(arg ? arg : &def, fields, err, parse_ko);
}
-static void shared_main(void)
+void ps_main(void)
{
+ char **arg;
+ struct dirtree *dt;
+ char *not_o;
int i;
- TT.ticks = sysconf(_SC_CLK_TCK);
- if (!TT.width) {
- TT.width = 80;
- TT.height = 25;
- // If ps can't query terminal size pad to 80 but do -w
- if (toys.which->name[1] == 's') {
- if (!isatty(1) || !terminal_size(&TT.width, &TT.height))
- toys.optflags |= FLAG_w;
- }
- }
+ TT.ticks = sysconf(_SC_CLK_TCK); // units for starttime/uptime
- // find controlling tty, falling back to /dev/tty if none
- for (i = 0; !TT.tty && i<4; i++) {
+ if (-1 != (i = tty_fd())) {
struct stat st;
- int fd = i;
-
- if (i==3 && -1==(fd = open("/dev/tty", O_RDONLY))) break;
- if (isatty(fd) && !fstat(fd, &st)) TT.tty = st.st_rdev;
- if (i==3) close(fd);
+ if (!fstat(i, &st)) TT.tty = st.st_rdev;
}
-}
-void ps_main(void)
-{
- char **arg;
- struct dirtree *dt;
- char *not_o;
- int i;
-
- shared_main();
+ // If we can't query terminal size pad to 80 but do -w
+ TT.width = 80;
+ if (!isatty(1) || !terminal_size(&TT.width, 0))
+ toys.optflags |= FLAG_w;
if (toys.optflags&FLAG_w) TT.width = 99999;
// parse command line options other than -o
@@ -1633,15 +1617,23 @@ static void top_common(
static void top_setup(char *defo, char *defk)
{
TT.top.d *= 1000;
+
+ TT.ticks = sysconf(_SC_CLK_TCK); // units for starttime/uptime
+ TT.tty = tty_fd() != -1;
+
+ // Are we doing "batch" output or interactive?
if (toys.optflags&FLAG_b) TT.width = TT.height = 99999;
else {
+ // Grab starting time, make terminal raw, switch off cursor,
+ // set signal handler to put terminal/cursor back to normal at exit.
TT.time = millitime();
set_terminal(0, 1, 0);
sigatexit(tty_sigreset);
xsignal(SIGWINCH, generic_signal);
printf("\033[?25l\033[0m");
+ TT.width = 80;
+ TT.height = 25;
}
- shared_main();
comma_args(TT.top.u, &TT.uu, "bad -u", parse_rest);
comma_args(TT.top.p, &TT.pp, "bad -p", parse_rest);