From nobody Sun Nov 26 04:10:49 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 4SdFd52wFwz52lJk; Sun, 26 Nov 2023 04:10:49 +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 4SdFd52TrJz3KKH; Sun, 26 Nov 2023 04:10:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700971849; 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=zPAPhZSzBO+Yrgi5mgMRAUwqhTkSawGAccI9tveh8F0=; b=qA0gQEF2S+tAvlI5e5jQskwbUpNYQ4qt4VeLYGbppMPuIr9458/nGZ4/xu8XF/RwsihaPy MuQZJpy0yaUcNtv5tJcz1ei+UKW0Sr5l57MDJscdWgfwBLN1ZzY8lUZX4g87Jn/jaLC7pK /VMh7gt2jjWoTcDtjghA3RjgGLkGeJ+Fzq+7jbK4rFAqKzSjMPdcOqBkXtXz5MuiBFdzAB mGM9C8iZ/Xx6B+6voUg1QQMDlJE1fHtTod5V+LFTtxLlUft56GGDH/LjKEMPEvvFoH9sfU 9aezVx6qU+dwM+kn0Q6gky6xXUz09/qbEWMy856y7nPv6Bc5cC6Zm5ga5azdZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700971849; 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=zPAPhZSzBO+Yrgi5mgMRAUwqhTkSawGAccI9tveh8F0=; b=GhpRtJiplUp8nZuzqYzFw3fVugolLLUmEm4Y6anA3SMwRWMffXOOsJEX9H8chLluaRTh0v hw3ItUKlIzTtJsXo254wsKG0bYUyjPwbhh9oplZ9kXGmU9RR314nwarddNMvCT9LwT4VKb RNAAHwmInJHDS9g8C0XIgPuS2nUvPKUCa5EbeQr8/s4fEOCD8fmu20DOP+hvDXc+zizJ3k Jy3ImewcoUD9vSdbjjdj5LCuj60RiUTuMkWzJyV/PLpGgRpN6QsmHlGO4+5uqQ5efdm77A 1gHQ9l7x/4+tRQPAWPKuxoxH/LSdAEcb4ZQ4GzEuuDEfQDnI5XBN2ATGRsudtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700971849; a=rsa-sha256; cv=none; b=XvmP2+ZMeIFh0WT4O3x2GCQrLM+6K9zEalmX5VX8FCF1j1dg2jaCKYA7cqC9Bz7s28L3Fy +V9FjBFI6jS34NZVo7h6QPHbkoUk/U/GKN/AUM8/FmicHWfiPPfRCdQ8N076OPVpZq5KJX 2lDY5+GNJS0bw69PFwuWuBKFuA9/QXC8FBIg10YUTPhkIwuG3mbLH18GMBltopEtLbt05q 3NH3Gk+Y7h1UuGeSagLujT6xmdsD7nv5CFltWkBqBTQTWKbT/7+xKACPwCmw3ZFRKMKmh/ 8upc68i+H8vJzpO47nIeHUgHufbm9G507Wq7JJESlT/XcDlbxGj2aXZNnVoTnA== 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 4SdFd51WBrzh4D; Sun, 26 Nov 2023 04:10:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AQ4An6I038073; Sun, 26 Nov 2023 04:10:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AQ4An0t038070; Sun, 26 Nov 2023 04:10:49 GMT (envelope-from git) Date: Sun, 26 Nov 2023 04:10:49 GMT Message-Id: <202311260410.3AQ4An0t038070@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 35095fd23f07 - main - lockf: correct omission in the usage statement 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 35095fd23f071d03633312b91a5b460eaf811efa Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=35095fd23f071d03633312b91a5b460eaf811efa commit 35095fd23f071d03633312b91a5b460eaf811efa Author: Kyle Evans AuthorDate: 2023-11-22 04:45:42 +0000 Commit: Kyle Evans CommitDate: 2023-11-26 04:08:40 +0000 lockf: correct omission in the usage statement The -w flag was added without being noted in the usage statement; fix that now. While we're here, re-sort the getopt() string. Reviewed by: 0mp, allanjude, des Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D42712 --- usr.bin/lockf/lockf.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/lockf/lockf.c b/usr.bin/lockf/lockf.c index 246f134f10f9..ff1e7a6d6216 100644 --- a/usr.bin/lockf/lockf.c +++ b/usr.bin/lockf/lockf.c @@ -62,7 +62,7 @@ main(int argc, char **argv) silent = keep = 0; flags = O_CREAT | O_RDONLY; waitsec = -1; /* Infinite. */ - while ((ch = getopt(argc, argv, "sknt:w")) != -1) { + while ((ch = getopt(argc, argv, "knst:w")) != -1) { switch (ch) { case 'k': keep = 1; @@ -228,7 +228,7 @@ usage(void) { fprintf(stderr, - "usage: lockf [-kns] [-t seconds] file command [arguments]\n"); + "usage: lockf [-knsw] [-t seconds] file command [arguments]\n"); exit(EX_USAGE); }