From nobody Mon Jun 05 10:58:00 2023 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 4QZVvD5wrNz4ZbNy; Mon, 5 Jun 2023 10:58:00 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QZVvD5TR2z4YL1; Mon, 5 Jun 2023 10:58:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685962680; 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=oqeeSDbGWF9ZTbrJQCJRamyhB7UuzmSNGz6460yj19k=; b=cQrsdeEJOtOzB08sr6YZCXYjEZG67Jw4pg0O5O4Izwh+yGK1exgrIQMgn7OCWM4WgOhVeZ orXbEOG4sYJOkVaTbc5zIPAt6olit/RFSd/+sKm8qRU+NDBVsWhVldTC+u/NqrwucX8s9w IW3dXN9EEF89YaPPzaiIObAnCMLmQH/rZNtXSUNNP4v0HIMwx9inw/9ZTahenqaLPfwfYg 3g+9ACLpjkveNf34QcYOVyfXyVgs5UMcxsr8GaHdO0E2FgxbcnZLdXqKlGhv6zlDPej43U ESu3sS0irxgngEfdfCKQyLYFfEg2O7syE6IU6NIwL2vAJBGIG2ZsPQaKgPdJMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685962680; 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=oqeeSDbGWF9ZTbrJQCJRamyhB7UuzmSNGz6460yj19k=; b=uYCFXOM166D/jFyKYlbXKcNl1GPVVxkKrPN/4fXPIsK77fzoOPqOmYo/3t8FLUkY+ys60V EqlxIa7ETuLR0bfYmlOYA0HQae32cbBd88tvmfEboDemKpo0WrP/SCSxnF70kOG+aS9IEs Kob3f92V8qULeF4ivMcBqfiQNJCPUIrl5T3SQ207/1niYIqAbkDzg8OYcM8ilbjZjcwYHQ pX2OzN2PuKPPUOu2OA8M9h1fg2kPpE30Ty0tQ+CrRp5X30Fv7EozrEgmEUQgNTV8G1P32X OreC0/iALDO/e2/KSr24JrSzdJk4iV+RVjVqVIrDTilJTGCbS2gpmhvPLdI4gA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685962680; a=rsa-sha256; cv=none; b=dUAeEuargbR4hUP/P55QjIS2k5TGwwnGwrIK8ibd5PzcW1K3RM+x3AxGXFhyUpao2ss3au sByFlNIlklodkLs+TqyNGnswIWFCGkcPgIyZuGizuCJlwZLjCb048UAIQYNIAxFE2Bf9w8 mVnFpmIJZlflSmlsRLfwtqujfPx47H+1B4koHTLAubXTaOdmsa4doD2BgUePL8JyObpKHK jFZ33O2SZgwsHYtfFNIaX0Fiq7xixA2gMLwiIwcnpDIoZFGFwr2Ym88ayPXiZdzJeYS9Fo vpTF4ibTswR7tHeuEppuQ1FKN9WNCH5Snit6wTgfo6EbCT2QpFHCeL39xKqKqA== 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 4QZVvD4ZW7zlQ9; Mon, 5 Jun 2023 10:58:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 355Aw0DF055540; Mon, 5 Jun 2023 10:58:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 355Aw0vh055539; Mon, 5 Jun 2023 10:58:00 GMT (envelope-from git) Date: Mon, 5 Jun 2023 10:58:00 GMT Message-Id: <202306051058.355Aw0vh055539@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mateusz Piotrowski <0mp@FreeBSD.org> Subject: git: 19677c0da80f - stable/13 - ps: Fix synopsis 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: 0mp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 19677c0da80fe687e438489f7074ca1670c83952 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by 0mp: URL: https://cgit.FreeBSD.org/src/commit/?id=19677c0da80fe687e438489f7074ca1670c83952 commit 19677c0da80fe687e438489f7074ca1670c83952 Author: Mateusz Piotrowski <0mp@FreeBSD.org> AuthorDate: 2023-04-25 11:38:10 +0000 Commit: Mateusz Piotrowski <0mp@FreeBSD.org> CommitDate: 2023-06-05 10:57:13 +0000 ps: Fix synopsis In the -L mode, the -L flag is not optional. MFC after: 3 days Sponsored by: Klara Inc. (cherry picked from commit 3f46bf40a1b26c49b53df4ec504757c5d8c9f921) --- bin/ps/ps.1 | 4 ++-- bin/ps/ps.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/ps/ps.1 b/bin/ps/ps.1 index 25373adb7d73..bc760c174c11 100644 --- a/bin/ps/ps.1 +++ b/bin/ps/ps.1 @@ -29,7 +29,7 @@ .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" -.Dd June 27, 2020 +.Dd April 25, 2023 .Dt PS 1 .Os .Sh NAME @@ -49,7 +49,7 @@ .Op Fl U Ar user Ns Op , Ns Ar user Ns Ar ... .Nm .Op Fl -libxo -.Op Fl L +.Fl L .Sh DESCRIPTION The .Nm diff --git a/bin/ps/ps.c b/bin/ps/ps.c index 0c656d8a1544..141b57cfd683 100644 --- a/bin/ps/ps.c +++ b/bin/ps/ps.c @@ -1463,6 +1463,6 @@ usage(void) "usage: ps " SINGLE_OPTS " [-O fmt | -o fmt] [-G gid[,gid...]]", " [-J jid[,jid...]] [-M core] [-N system]", " [-p pid[,pid...]] [-t tty[,tty...]] [-U user[,user...]]", - " ps [-L]"); + " ps -L"); exit(1); }