diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2024-01-30 20:49:20 +0100 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2024-01-31 20:11:58 +0100 |
| commit | 1ce9756ee61e8dff5e3319851e14ebf310a0bdd8 (patch) | |
| tree | f7a65bac8e823298911029f6bc02bbf528834304 /winsup/utils | |
| parent | 732afede935832beab181ae421c1366df2ae6af5 (diff) | |
| download | newlib-1ce9756ee61e8dff5e3319851e14ebf310a0bdd8.zip newlib-1ce9756ee61e8dff5e3319851e14ebf310a0bdd8.tar.gz newlib-1ce9756ee61e8dff5e3319851e14ebf310a0bdd8.tar.bz2 | |
Cygwin: ps -f: output command line
So far ps(1) always prints the full path of the executable under
the COMMAND heading.
With -f, print the command line instead.
Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
Diffstat (limited to 'winsup/utils')
| -rw-r--r-- | winsup/utils/ps.cc | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/winsup/utils/ps.cc b/winsup/utils/ps.cc index 982183c..3bc8afe 100644 --- a/winsup/utils/ps.cc +++ b/winsup/utils/ps.cc @@ -357,6 +357,7 @@ main (int argc, char *argv[]) char uname[128]; char ttyname[9]; + char *cmdline = NULL; if (fflag) { @@ -369,13 +370,25 @@ main (int argc, char *argv[]) sprintf (uname, "%u", (unsigned) (p->version >= EXTERNAL_PINFO_VERSION_32_BIT ? p->uid32 : p->uid)); + + cmdline = (char *) cygwin_internal (CW_CMDLINE_ALLOC, p->pid); + if (cmdline) /* Replace \0 with spaces */ + { + char *p = cmdline; + while (p && *p) + if ((p = strchr (p, '\0'))) + *p++ = ' '; + } } if (sflag) printf (dfmt, p->pid, ttynam (p->ctty, ttyname), start_time (p), pname); else if (fflag) - printf (ffmt, uname, p->pid, p->ppid, ttynam (p->ctty, ttyname), - start_time (p), pname); + { + printf (ffmt, uname, p->pid, p->ppid, ttynam (p->ctty, ttyname), + start_time (p), cmdline ?: pname); + free (cmdline); + } else if (lflag) printf (lfmt, status, p->pid, p->ppid, p->pgid, p->dwProcessId, ttynam (p->ctty, ttyname), |