From nobody Thu May 1 19:51:21 2025 X-Original-To: dev-commits-src-all@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 4ZpPnQ28gXz5vdtm; Thu, 01 May 2025 19:51:22 +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 4ZpPnP4lGsz46Br; Thu, 01 May 2025 19:51:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746129081; 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=jFuQVWfz8OKyrPq9Hk6Ky6u8aUf3m0aA+QtxfEGxQk4=; b=C2kqdGaMptBrzj7Dinx1nZwsjKYv/Vyj+ywZkn/+qL74pXo1zZ3u43BnjMnB9chR2Gb2ss HlPPlC4viAKw55dYOkdkVOW6kAqtLXci56juQrV3OVasBIfqK6bWndag3K7inQfAzXa5Bk Jk/oMAh1dI5yxf4Q6yZfKG5V+P1ySlAs0QyH3ZIvXmTQNaoizagzo+VCkLEQvivmjiuNGO lJ0FoFB3YYRbEODGnwZICMIDV4W8w8J702xxzn9bRI++2rjWOkSaHu8mVAVfB0ide4XVgA Ty7tMLFYpYtWXypf0WqCMtUPu3mEW640M9rX19A1jHytEsmEv6Qcvj8aPZNBCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746129081; 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=jFuQVWfz8OKyrPq9Hk6Ky6u8aUf3m0aA+QtxfEGxQk4=; b=mwHlE+6detnM4IM3QPQzFHyQm1/1Mi52gl7XE2M1Yb4xhsLsc/DDqPX+7R71E+7a5qikd6 FIi9rGR4Yqrmy898dY6zSMINf5J2Um376ez/alX36785P3teqvgrV1C6xiZgxYnZRCRYl0 At9DkEk6N18E1BB7KUXKE2Q5q7Wj7fLU0n/38vuDDLwijDYNnxu8mWGc6x8laHCeiJS0rs j3V+dfn1qLXgwY01PAbfS7RjSfe1S7PRpJxuB+WfVRIcyY4emXuh0eMzZWgA/5pcc+azPA /Mvlv/JEN3FlYHpEx2MxbS2ZZYVMZwi7DL0kb6ao3G0SLIzJVENyo0OWT59G5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746129081; a=rsa-sha256; cv=none; b=jX423UAtgEN5++0zIiASy0kP/Tp7vktu5TewHid3PkgeE8VuH8RkRp3Nv1z++q9rVniv/+ 5I23QSGe3W8YuNWR9nZ7ztucDVd/lfAXcr0AmBqfIxq4amslI6/rbmav710VTFSWI0Qg+X ewOXzBp8BdX54IVAsgX01GzcnTqFkmmiXUolCQ2j6Ad882aaZBeFI5vDuYF6XdTasG15HT 3Xyg/eYZkeE6fr+fAESFEdMPO3lKMroVn/B29SuC9tthemRY62weVbv6vAn6kZrwt06nMI LDtR6gqutFj7O/AA4UDRzDfVAk4Wtu0K9HMW0EJWDMGnBekuJxPb4bUMCdAwog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ZpPnP4JykzhyL; Thu, 01 May 2025 19:51:21 +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 541JpL0d066971; Thu, 1 May 2025 19:51:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 541JpLN8066968; Thu, 1 May 2025 19:51:21 GMT (envelope-from git) Date: Thu, 1 May 2025 19:51:21 GMT Message-Id: <202505011951.541JpLN8066968@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Olivier Certner Subject: git: 0a1d13469cd8 - stable/14 - ps.1: update regarding -D option and -p x/d interaction List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 0a1d13469cd8f3561d676c7438d7abec0964dd3f Auto-Submitted: auto-generated The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=0a1d13469cd8f3561d676c7438d7abec0964dd3f commit 0a1d13469cd8f3561d676c7438d7abec0964dd3f Author: Benedict Reuschling AuthorDate: 2023-11-11 19:49:24 +0000 Commit: Olivier Certner CommitDate: 2025-05-01 19:35:07 +0000 ps.1: update regarding -D option and -p x/d interaction The -p option does not imply -x, it is merely a different mode that ps uses. Remove that statement from the -p option, effectively rolling back d6ae056e9dc96c2db45982ac358ba9ed716a9202. pstef@ introduced the -D option in 5c0a1c15ff8cb66128f4826ace8ba91e0a31486d which also turns ps into a similar mode. List the -D option along with the others in the first sentence of the second paragraph of the DESCRIPTION section for completeness and correctness sake. Pointed out by: pstef@ Differential Revision: https://reviews.freebsd.org/D42552 (cherry picked from commit ba44650a0b1e3b0f52554380937a3ffc16d396f3) --- bin/ps/ps.1 | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/bin/ps/ps.1 b/bin/ps/ps.1 index 368d50b46abc..b231cc7a35d6 100644 --- a/bin/ps/ps.1 +++ b/bin/ps/ps.1 @@ -28,7 +28,7 @@ .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 .\" -.Dd October 6, 2023 +.Dd November 11, 2023 .Dt PS 1 .Os .Sh NAME @@ -65,7 +65,7 @@ will also display processes that do not have controlling terminals. .Pp A different set of processes can be selected for display by using any combination of the -.Fl a , G , J , p , T , t , +.Fl a , D , G , J , p , T , t , and .Fl U options. @@ -238,11 +238,6 @@ So the header texts for multiple keywords can be changed. If all keywords have empty header texts, no header line is written. .It Fl p Display information about processes which match the specified process IDs. -It implies the use of -.Fl x . -When combined with -.Fl d , -all descendent processes are included. .It Fl r Sort by current CPU usage, instead of the combination of controlling terminal and process ID.