From nobody Fri Dec 15 16:50:56 2023 X-Original-To: dev-commits-src-branches@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 4SsFbP4Dhkz53nDb; Fri, 15 Dec 2023 16:50:57 +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 4SsFbP1W4cz4b7Z; Fri, 15 Dec 2023 16:50:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702659057; 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=en939RxkIDtm9Lxjtd9qtYNoWnmSHL9qsIcWDsqO/WA=; b=O/FTImLbjeTKJHIToENhHpLiDE2LiVgDi22JgfyGjynBVXMiMlDI7t/5GFquk0tfrmcoHX Is6pTE2rXhFpShc1LdaKwUnJ13NA4r12YlEhg7tsnhu/SpjhcChlI6DTD79M59g+2UZdLW 0BXx0C7LbZi7Fe+2PEak+Ln+/ASem/6RXOjOZsi19sG0fpR9nsbBMgQcWjZZEhJmaHJ4GU gj/2VQI21GKBBH6i+rixtpO4HGHdKLsCKam1k8bBzh9rBkJ9NJ7uPJE/cQVk5f+nctAeBD FPZ6JPtkHxphiJs9uIX9aD1Cz0iWHQmpwoCJjueOjHIFpcLLDFLhZ9WLy0DWdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702659057; a=rsa-sha256; cv=none; b=THBzFWY/sbxlWczsBN41uC1m6qbLuLLFxkSwr+h7K1m4HZqzMdvLjc/E83QUGUAVfQn77s kl2JzAqZkRKViBwRWw5eugTeP/RItJFydOxGqL+k30gyGhWMlwN+jKrirircWLxtPUa4ap Tn3hqM8cqESl4kY9fnBfjEc/jKUeFo9UilbNXeOuzp58RM6juz+wHplXrsF38l43V0SEia XLgtBGWY8g4D3P2Gwp8YxMUOeZiYwG/6Xy5Nnkqhe1RhAu+RTFCjp8TTLb0BjIBdPHu2Sn Ey9TpkxyKtk18R+rez7mC7PPV2VRFefsLuTQcH+OV7Aowhbx+LyOos5/cHKzMg== 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=1702659057; 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=en939RxkIDtm9Lxjtd9qtYNoWnmSHL9qsIcWDsqO/WA=; b=lPQM2rMQkpZa6IkrO7B+F/DwoAzbPEm4tZgc09WdJQLOfbqvmTsK04DnMuFojnyFw8QSbo iOGZZxgPU4HdEMTtREyuTE83Djxml+0Uowc2DB/n4IgzgP9Kie51DatiMfXhspKNXUQro1 KzRFvz9M+GyKYPsljbLi6v1qSxFVv5mm4n2opn/dPhdA0vIoJoo+ro6eWnvrzjgAK5c95/ wJxK9YsbGEUWx6dWZFyARztTfjZNSJLOMeFmwstgIOcxKo9YuXdAuOxxmEDU7VvyoQ3CfT ZGultAUIvvBUiYsnto9zPzsdgHrzZO+kbAYIv9OySRnFZL0lukyb7hrveskUZg== 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 4SsFbP0cqfz3wn; Fri, 15 Dec 2023 16:50:57 +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 3BFGoudf010868; Fri, 15 Dec 2023 16:50:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BFGouXd010865; Fri, 15 Dec 2023 16:50:56 GMT (envelope-from git) Date: Fri, 15 Dec 2023 16:50:56 GMT Message-Id: <202312151650.3BFGouXd010865@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 8a152128dcc5 - stable/14 - lockf: correct omission in the usage statement List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 8a152128dcc546745194ef671673b5a0762b6d26 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=8a152128dcc546745194ef671673b5a0762b6d26 commit 8a152128dcc546745194ef671673b5a0762b6d26 Author: Kyle Evans AuthorDate: 2023-11-22 04:45:42 +0000 Commit: Kyle Evans CommitDate: 2023-12-15 00:58:11 +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. (cherry picked from commit 35095fd23f071d03633312b91a5b460eaf811efa) --- 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 c98c584bc6a9..4fbabea8c08f 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; @@ -224,7 +224,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); }