From nobody Mon Apr 28 12:23:33 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZmN056SZFz5vJ29; Mon, 28 Apr 2025 12:23:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZmN053KFwz3g7j; Mon, 28 Apr 2025 12:23:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745843013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KHstyATDV1Bm2Pvw9OMnW0E4TmfGNzPpjcX2aMlGKgg=; b=UlFs+ov62Xlh+moDHanPnYSOime4THYl5UMQSF6RB263Ji+tNGcXrMHLoK/KZVeXJTso+q +/R7FbxxIWe1nDqC8nzkqC4/OnZQlZP1U/ppbMNC2a9k5mu3+OooFlEDNs14M1/wkyfPeC I4kGMMi5EegUU9pUtGNxpP7LyAl9oRCyoLsdD00h8ir13drXlqJ1zPJWB0nWo/IZBGqQ77 6gCPyX0Py/uvQcEYCFiVwpGUMX8AzjcS/zeJl95rUkXiuC2QC7gJ1ZXYxyDKWaIBphpwcJ eVobnF/uy9ND3rje03p6b7+vut2db82x1ofTrCFAiCDaa7Dhm0CTDoXxP4ebtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1745843013; a=rsa-sha256; cv=none; b=Rgav/zOl/Y3Vfj4atAwnh0Rn71M7eOLbhdtA5auiY2AXE/WVSCBOdeWQkV5WOaH2AVW1Wi f+i2QcgwNBSqWKi1adlxROWiataMmUiaD6Q5kv2DyPJqTrpAbZ5dpt3vy3KNvmqDVYn9Gq QgXYEjImGNdd2DmWyJQt6z+t1yIQWO/0DoYYLQLTXTaTFfIgndcY4jgl/X6PbX7aTyMiXJ +lAItlSQZKn+no6Fb36CPgNSeqp8qGjsVuhyBO6Zdi17rXTRK0vd8ow9o7Ubk8yVLyVKyJ g8q2YPK1i3aJWfyqnUiwoDUrX6IHmOSinKxTS37Mx8EW6l9OUJ0wUaPHcF6o0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1745843013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KHstyATDV1Bm2Pvw9OMnW0E4TmfGNzPpjcX2aMlGKgg=; b=jgQDz2NMAt6zMJifQKi+Kvm98wfIBkB5aBenQipthVVLi2Kv/TzLTJH65PhCCxMSLo8aTK JnU1qhnot9pcFtTS4aNOljm7kbi5Olx7phkcqkfLGoNuEgdugy066OiXKXoC0HIJteEhwO xttU9VeOQ3Blj+Yq+WIC14NKXcEt6qnY1UGOv6zcf1A6ru6ZQCe26BIaNm/Y7925MMXzU+ e1jN6kevf5gZm2AoCj/AyMOBQMYLRuQDrZyKGohG1VUt1RzDMA9EClkwsHwalQSBdz/hMw o3xeRM/2ivrOH2KDS1n3VFmne5pzl0urji9Nl8hVaMnVboLM3MDkyc0k52g0BQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZmN0527BSzbkb; Mon, 28 Apr 2025 12:23:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53SCNXZB025544; Mon, 28 Apr 2025 12:23:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53SCNXtr025541; Mon, 28 Apr 2025 12:23:33 GMT (envelope-from git) Date: Mon, 28 Apr 2025 12:23:33 GMT Message-Id: <202504281223.53SCNXtr025541@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Olivier Certner Subject: git: 93a94ce731a8 - main - ps(1): Make '-a' and '-A' always show all processes List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olce X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 93a94ce731a89b5643021b486da599e7963da232 Auto-Submitted: auto-generated The branch main has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=93a94ce731a89b5643021b486da599e7963da232 commit 93a94ce731a89b5643021b486da599e7963da232 Author: Olivier Certner AuthorDate: 2025-03-14 21:42:08 +0000 Commit: Olivier Certner CommitDate: 2025-04-28 11:59:02 +0000 ps(1): Make '-a' and '-A' always show all processes When combined with other options affecting the selection of processes, except for '-X' and '-x', option '-a' would have no effect (and '-A' would reduce to just '-x'). This was in contradiction with the rule applying to all other selection options stating that one process is listed as soon as any of these options has been specified and selects it, which is both mandated by POSIX and arguably a natural expectation. MFC after: 3 days Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D49617 (code) Differential Revision: https://reviews.freebsd.org/D49618 (manual page) --- bin/ps/ps.1 | 25 +++---------------------- bin/ps/ps.c | 9 ++++++++- 2 files changed, 11 insertions(+), 23 deletions(-) diff --git a/bin/ps/ps.1 b/bin/ps/ps.1 index 2e25249c2e76..532e920d1cdd 100644 --- a/bin/ps/ps.1 +++ b/bin/ps/ps.1 @@ -78,7 +78,7 @@ and .Fl x options. Except for options -.Fl A , a , X , +.Fl X and .Fl x , as soon as one of them appears, it inhibits the default process selection, i.e., @@ -213,11 +213,6 @@ see and .Fl x .Pc . -Currently, this option has no effect if any other option selecting processes to -display is present, except for -.Fl X -and -.Fl x . If the .Va security.bsd.see_other_uids sysctl is set to zero, this option is honored only if the real user ID of the @@ -965,13 +960,13 @@ which is the current behavior of option .Pc . .Pp However, options -.Fl G , l , o , p , +.Fl A , a , G , l , o , p , and .Fl t behave as prescribed by .St -p1003.1-2024 . Options -.Fl A , a , f , U , +.Fl f , U , and .Fl w currently do not, but may be changed to in the future. @@ -1021,20 +1016,6 @@ implementation (for other BSDs, illumos or Linux) behaves like this. For all these reasons, the behavior is expected to be changed soon to using the effective user ID instead. .Pp -The -.Fl a -option has no effect if other options affecting the selection of processes are -used, except for (non-)filters -.Fl X -and -.Fl x. -Option -.Fl A -has the same restriction. -This idiosyncrasy is both in contradiction with -.St -p1003.1-2024 -and arguably with common sense, and is expected to be removed soon. -.Pp .Nm ps currently does not correctly limit the ouput width, and in most cases does not limit it at all when it should. diff --git a/bin/ps/ps.c b/bin/ps/ps.c index 48839cd00837..f40f6160672d 100644 --- a/bin/ps/ps.c +++ b/bin/ps/ps.c @@ -503,7 +503,14 @@ main(int argc, char *argv[]) free(keywords_info); keywords_info = NULL; - if (!all && nselectors == 0) { + if (all) + /* + * We have to display all processes, regardless of other + * options. + */ + nselectors = 0; + else if (nselectors == 0) { + /* Default is to request our processes only. */ uidlist.l.ptr = malloc(sizeof(uid_t)); if (uidlist.l.ptr == NULL) xo_errx(1, "malloc failed");