From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2155) id C39D538582A5; Thu, 1 Feb 2024 11:39:50 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C39D538582A5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1706787590; bh=qe8zkLt52auSyleOW7kRpsziE+k7k6rHGA9dg2j0+IE=; h=From:To:Subject:Date:From; b=I/45jVWSIRLaCAFI4YP2P4jOqm9DNdQKUPay7hMRLQo5q19j4Evh2cAqgKmBRF9Xv x9y1OGT8Yd8HLq1lv2kBDMvDaf0cQtuS90dg4k2zAOjZhj2rg5Vap3f3gvvWOA7omM 42RLXbq/+ClIfsHhoKP+sbCxOZIn7QTvP7+Ex6vE= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Corinna Vinschen To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin/main] Cygwin: ps -f: output command line X-Act-Checkin: newlib-cygwin X-Git-Author: Corinna Vinschen X-Git-Refname: refs/heads/main X-Git-Oldrev: 732afede935832beab181ae421c1366df2ae6af5 X-Git-Newrev: 1ce9756ee61e8dff5e3319851e14ebf310a0bdd8 Message-Id: <20240201113950.C39D538582A5@sourceware.org> Date: Thu, 1 Feb 2024 11:39:50 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D1ce9756ee61= e8dff5e3319851e14ebf310a0bdd8 commit 1ce9756ee61e8dff5e3319851e14ebf310a0bdd8 Author: Corinna Vinschen AuthorDate: Tue Jan 30 20:49:20 2024 +0100 Commit: Corinna Vinschen CommitDate: Wed Jan 31 20:11:58 2024 +0100 Cygwin: ps -f: output command line =20 So far ps(1) always prints the full path of the executable under the COMMAND heading. =20 With -f, print the command line instead. =20 Signed-off-by: Corinna Vinschen Diff: --- winsup/cygwin/release/3.6.0 | 3 +++ 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 f7754bd19417..5536d39a3eff 100644 --- a/winsup/cygwin/release/3.6.0 +++ b/winsup/cygwin/release/3.6.0 @@ -8,3 +8,6 @@ What's new: =20 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 982183c5d0f2..3bc8afed4062 100644 --- a/winsup/utils/ps.cc +++ b/winsup/utils/ps.cc @@ -357,6 +357,7 @@ main (int argc, char *argv[]) =20 char uname[128]; char ttyname[9]; + char *cmdline =3D NULL; =20 if (fflag) { @@ -369,13 +370,25 @@ main (int argc, char *argv[]) sprintf (uname, "%u", (unsigned) (p->version >=3D EXTERNAL_PINFO_VERSION_32_BIT ? p->uid32 : p->uid)); + + cmdline =3D (char *) cygwin_internal (CW_CMDLINE_ALLOC, p->pid); + if (cmdline) /* Replace \0 with spaces */ + { + char *p =3D cmdline; + while (p && *p) + if ((p =3D strchr (p, '\0'))) + *p++ =3D ' '; + } } =20 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),