From 64c41c76ff573a35bc035c7ddffeb360cb232349 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Sun, 29 Apr 2001 02:32:18 +0000 Subject: * passwd.cc (ttymnam): New function. (main): Use ttynam() to report name of tty. --- winsup/utils/ChangeLog | 5 +++++ winsup/utils/ps.cc | 26 +++++++++++++++++++------- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/winsup/utils/ChangeLog b/winsup/utils/ChangeLog index c48e2daa8..4ed7c1ec9 100644 --- a/winsup/utils/ChangeLog +++ b/winsup/utils/ChangeLog @@ -1,3 +1,8 @@ +Sat Apr 28 22:32:01 2001 Christopher Faylor + + * passwd.cc (ttymnam): New function. + (main): Use ttynam() to report name of tty. + 2001-04-19 Egor Duda * dumper.cc (dumper::init_core_dump): Set architecture field in dump diff --git a/winsup/utils/ps.cc b/winsup/utils/ps.cc index 79d28b1c5..796d9f069 100644 --- a/winsup/utils/ps.cc +++ b/winsup/utils/ps.cc @@ -165,6 +165,18 @@ to_time_t (FILETIME *ptr) return x; } +static const char * +ttynam (int ntty) +{ + static char buf[5]; + if (ntty < 0) + return " ?"; + if (ntty == TTY_CONSOLE) + return " con"; + sprintf (buf, "%4d", ntty); + return buf; +} + int main (int argc, char *argv[]) { @@ -172,11 +184,11 @@ main (int argc, char *argv[]) int aflag, lflag, fflag, sflag, uid; cygwin_getinfo_types query = CW_GETPINFO; const char *dtitle = " PID TTY STIME COMMAND\n"; - const char *dfmt = "%7d%4d%10s %s\n"; + const char *dfmt = "%7d%4s%10s %s\n"; const char *ftitle = " UID PID PPID TTY STIME COMMAND\n"; - const char *ffmt = "%8.8s%8d%8d%4d%10s %s\n"; - const char *ltitle = " PID PPID PGID WINPID TTY UID STIME COMMAND\n"; - const char *lfmt = "%c %7d %7d %7d %10u %3d %4d %8s %s\n"; + const char *ffmt = "%8.8s%8d%8d%4s%10s %s\n"; + const char *ltitle = " PID PPID PGID WINPID TTY UID STIME COMMAND\n"; + const char *lfmt = "%c %7d %7d %7d %10u %4s %4d %8s %s\n"; char ch; aflag = lflag = fflag = sflag = 0; @@ -298,12 +310,12 @@ main (int argc, char *argv[]) } if (sflag) - printf (dfmt, p->pid, p->ctty, start_time (p), pname); + printf (dfmt, p->pid, ttynam (p->ctty), start_time (p), pname); else if (fflag) - printf (ffmt, uname, p->pid, p->ppid, p->ctty, start_time (p), pname); + printf (ffmt, uname, p->pid, p->ppid, ttynam (p->ctty), start_time (p), pname); else if (lflag) printf (lfmt, status, p->pid, p->ppid, p->pgid, - p->dwProcessId, p->ctty, p->uid, start_time (p), pname); + p->dwProcessId, ttynam (p->ctty), p->uid, start_time (p), pname); } (void) cygwin_internal (CW_UNLOCK_PINFO); -- cgit v1.2.3