diff options
author | Christopher Faylor <me@cgf.cx> | 2004-10-25 15:49:36 +0000 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2004-10-25 15:49:36 +0000 |
commit | 4bfc614b42c52ed78f66abff92e9103a9ce549e1 (patch) | |
tree | f698a4d89c2508cb1763156b804ae5bf0c832602 /winsup/utils/ps.cc | |
parent | bc4ab9927687b3b2c67cce6e88ce6b5c15bd81c5 (diff) | |
download | cygnal-4bfc614b42c52ed78f66abff92e9103a9ce549e1.tar.gz cygnal-4bfc614b42c52ed78f66abff92e9103a9ce549e1.tar.bz2 cygnal-4bfc614b42c52ed78f66abff92e9103a9ce549e1.zip |
fix whitespace, update some copyrights
Diffstat (limited to 'winsup/utils/ps.cc')
-rw-r--r-- | winsup/utils/ps.cc | 96 |
1 files changed, 48 insertions, 48 deletions
diff --git a/winsup/utils/ps.cc b/winsup/utils/ps.cc index b6307fd33..843693598 100644 --- a/winsup/utils/ps.cc +++ b/winsup/utils/ps.cc @@ -1,6 +1,6 @@ /* ps.cc - Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 Red Hat, Inc. + Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Red Hat, Inc. This file is part of Cygwin. @@ -271,45 +271,45 @@ main (int argc, char *argv[]) { case 'a': case 'e': - aflag = 1; - break; + aflag = 1; + break; case 'f': - fflag = 1; - break; + fflag = 1; + break; case 'h': - usage (stdout, 0); + usage (stdout, 0); case 'l': - lflag = 1; - break; + lflag = 1; + break; case 's': sflag = 1; break; case 'u': - uid = atoi (optarg); - if (uid == 0) - { - struct passwd *pw; - - if ((pw = getpwnam (optarg))) - uid = pw->pw_uid; - else - { - fprintf (stderr, "%s: user %s unknown\n", prog_name, optarg); - exit (1); - } - } - break; + uid = atoi (optarg); + if (uid == 0) + { + struct passwd *pw; + + if ((pw = getpwnam (optarg))) + uid = pw->pw_uid; + else + { + fprintf (stderr, "%s: user %s unknown\n", prog_name, optarg); + exit (1); + } + } + break; case 'v': - print_version (); - exit (0); - break; + print_version (); + exit (0); + break; case 'W': query = CW_GETPINFO_FULL; aflag = 1; break; default: - usage (stderr, 1); + usage (stderr, 1); } if (sflag) @@ -329,24 +329,24 @@ main (int argc, char *argv[]) pid = p->pid) { if (!aflag) - if (p->version >= EXTERNAL_PINFO_VERSION_32_BIT) + if (p->version >= EXTERNAL_PINFO_VERSION_32_BIT) { if (p->uid32 != (__uid32_t) uid) continue; - } + } else if (p->uid != uid) continue; char status = ' '; if (p->process_state & PID_STOPPED) - status = 'S'; + status = 'S'; else if (p->process_state & PID_TTYIN) - status = 'I'; + status = 'I'; else if (p->process_state & PID_TTYOU) - status = 'O'; + status = 'O'; char pname[MAX_PATH]; if (p->process_state & (PID_ZOMBIE | PID_EXITED)) - strcpy (pname, "<defunct>"); + strcpy (pname, "<defunct>"); else if (p->ppid) { char *s; @@ -359,7 +359,7 @@ main (int argc, char *argv[]) else if (query == CW_GETPINFO_FULL) { HANDLE h = OpenProcess (PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, - FALSE, p->dwProcessId); + FALSE, p->dwProcessId); if (!h) continue; HMODULE hm[1000]; @@ -377,26 +377,26 @@ main (int argc, char *argv[]) char uname[128]; if (fflag) - { - struct passwd *pw; - - if ((pw = getpwuid (p->version >= EXTERNAL_PINFO_VERSION_32_BIT ? - p->uid32 : p->uid))) - strcpy (uname, pw->pw_name); - else - sprintf (uname, "%u", (unsigned) - (p->version >= EXTERNAL_PINFO_VERSION_32_BIT ? + { + struct passwd *pw; + + if ((pw = getpwuid (p->version >= EXTERNAL_PINFO_VERSION_32_BIT ? + p->uid32 : p->uid))) + strcpy (uname, pw->pw_name); + else + sprintf (uname, "%u", (unsigned) + (p->version >= EXTERNAL_PINFO_VERSION_32_BIT ? p->uid32 : p->uid)); - } + } if (sflag) - printf (dfmt, p->pid, ttynam (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, ttynam (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, ttynam (p->ctty), + printf (lfmt, status, p->pid, p->ppid, p->pgid, + p->dwProcessId, ttynam (p->ctty), p->version >= EXTERNAL_PINFO_VERSION_32_BIT ? p->uid32 : p->uid, start_time (p), pname); |