JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* ps.cc (ttynam): Accommodate new console numbering.

Browse Source 
(main): Ditto.
This commit is contained in:
Christopher Faylor 2011-05-29 15:20:10 +00:00
parent 6cd2e18523
commit a4fddeb9f6
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/utils/ChangeLog
View File

@ -1,3 +1,8 @@
2011-05-29 Christopher Faylor <me.cygwin2011@cgf.cx>
* ps.cc (ttynam): Accommodate new console numbering.
(main): Ditto.
2011-05-03 Corinna Vinschen <corinna@vinschen.de> 2011-05-03 Corinna Vinschen <corinna@vinschen.de>
* locale.cc (print_locale_with_codeset): Align printing of locale names * locale.cc (print_locale_with_codeset): Align printing of locale names

19
winsup/utils/ps.cc
View File

@ -198,12 +198,15 @@ to_time_t (FILETIME *ptr)
static const char * static const char *
ttynam (int ntty) ttynam (int ntty)
{ {
static char buf[5]; static char buf[9];
char buf0[9];
if (ntty < 0) if (ntty < 0)
return " ?"; strcpy (buf0, "?");
if (ntty == TTY_CONSOLE) else if (ntty & 0xffff0000)
return " con"; sprintf (buf0, "cons%d", ntty & 0xff);
sprintf (buf, "%4d", ntty); else
sprintf (buf0, "tty%d", ntty);
sprintf (buf, " %-7s", buf0);
return buf; return buf;
} }
@ -261,11 +264,11 @@ main (int argc, char *argv[])
int aflag, lflag, fflag, sflag, uid, proc_id; int aflag, lflag, fflag, sflag, uid, proc_id;
bool found_proc_id = true; bool found_proc_id = true;
cygwin_getinfo_types query = CW_GETPINFO; cygwin_getinfo_types query = CW_GETPINFO;
const char *dtitle = " PID TTY STIME COMMAND\n"; const char *dtitle = " PID TTY STIME COMMAND\n";
const char *dfmt = "%7d%4s%10s %s\n"; const char *dfmt = "%7d%4s%10s %s\n";
const char *ftitle = " UID PID PPID TTY STIME COMMAND\n"; const char *ftitle = " UID PID PPID TTY STIME COMMAND\n";
const char *ffmt = "%8.8s%8d%8d%4s%10s %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 *ltitle = " PID PPID PGID WINPID TTY UID STIME COMMAND\n";
const char *lfmt = "%c %7d %7d %7d %10u %4s %4u %8s %s\n"; const char *lfmt = "%c %7d %7d %7d %10u %4s %4u %8s %s\n";
char ch; char ch;
PUNICODE_STRING uni = NULL; PUNICODE_STRING uni = NULL;