diff options
| -rw-r--r-- | winsup/cygwin/release/3.6.0 | 3 | ||||
| -rw-r--r-- | winsup/utils/ps.cc | 17 |
2 files changed, 18 insertions, 2 deletions
diff --git a/winsup/cygwin/release/3.6.0 b/winsup/cygwin/release/3.6.0 index f7754bd..5536d39 100644 --- a/winsup/cygwin/release/3.6.0 +++ b/winsup/cygwin/release/3.6.0 @@ -8,3 +8,6 @@ What's new: What changed: ------------- + +- ps -f now prints the commandline rather than the full path to the + executable. 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), |