libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-02-06 14:30:38 +08:00
Code Issues Projects Releases Wiki Activity

* ps.cc (main): Change print format for uid to unsigned. Use uid32

Browse Source 
member of struct external_pinfo instead of uid.
This commit is contained in:
Corinna Vinschen 2002-05-29 15:07:14 +00:00
parent a8d7ae61e7
commit 642745443f
2 changed files with 10 additions and 5 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 @@
2002-05-29 Corinna Vinschen <corinna@vinschen.de>
* ps.cc (main): Change print format for uid to unsigned. Use uid32
member of struct external_pinfo instead of uid.
2002-05-28 Joshua Daniel Franklin <joshuadfranklin@yahoo.com> 2002-05-28 Joshua Daniel Franklin <joshuadfranklin@yahoo.com>
* passwd.c (prog_name): New global variable. * passwd.c (prog_name): New global variable.

10
winsup/utils/ps.cc
View File

@ -248,7 +248,7 @@ main (int argc, char *argv[])
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 %4d %8s %s\n"; const char *lfmt = "%c %7d %7d %7d %10u %4s %4u %8s %s\n";
char ch; char ch;
aflag = lflag = fflag = sflag = 0; aflag = lflag = fflag = sflag = 0;
@ -325,7 +325,7 @@ main (int argc, char *argv[])
(p = (external_pinfo *) cygwin_internal (query, pid | CW_NEXTPID)); (p = (external_pinfo *) cygwin_internal (query, pid | CW_NEXTPID));
pid = p->pid) pid = p->pid)
{ {
if (!aflag && p->uid != uid) if (!aflag && p->uid32 != (__uid32_t) uid)
continue; continue;
char status = ' '; char status = ' ';
if (p->process_state & PID_STOPPED) if (p->process_state & PID_STOPPED)
@ -370,10 +370,10 @@ main (int argc, char *argv[])
{ {
struct passwd *pw; struct passwd *pw;
if ((pw = getpwuid (p->uid))) if ((pw = getpwuid (p->uid32)))
strcpy (uname, pw->pw_name); strcpy (uname, pw->pw_name);
else else
sprintf (uname, "%d", p->uid); sprintf (uname, "%u", (unsigned) p->uid32);
} }
if (sflag) if (sflag)
@ -382,7 +382,7 @@ main (int argc, char *argv[])
printf (ffmt, uname, p->pid, p->ppid, ttynam (p->ctty), start_time (p), pname); printf (ffmt, uname, p->pid, p->ppid, ttynam (p->ctty), start_time (p), pname);
else if (lflag) else if (lflag)
printf (lfmt, status, p->pid, p->ppid, p->pgid, printf (lfmt, status, p->pid, p->ppid, p->pgid,
p->dwProcessId, ttynam (p->ctty), p->uid, start_time (p), pname); p->dwProcessId, ttynam (p->ctty), p->uid32, start_time (p), pname);
} }
(void) cygwin_internal (CW_UNLOCK_PINFO); (void) cygwin_internal (CW_UNLOCK_PINFO);