From nobody Fri Dec 15 18:57:28 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 4SsJPN43Qxz53wqF; Fri, 15 Dec 2023 18:57:28 +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 4SsJPN24f8z3Lw1; Fri, 15 Dec 2023 18:57:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702666648; 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=qFyLbwAdT8tRiAROaryEoh+U6s1+kntb7fQhPmPZZKc=; b=VXMUu+8r2XeCx70bnX0IF7s6ZydCYWEKqRvfaJlrX8CJhuOKuGyttOLd0oq6QXkpDT75g/ qzpFjwbXYmAzAHnrz5eYf/n9XFMsBM2JjV4SwXrnf1tv4PjWP6xKkZU8c0LSfntNKoQHqH Bc7U2DZNNDSs9hgTBHOJSXT6HjMhaaUAmX/Np5MeDrKBte6Dv7SwDDKDqDNd1fMyN0lBW6 LGwr2ljZifKFhVgGefeWs5vWtv2rDbRQQrFSrZ4RQMQE1u3Mou7bcJMHBhuH+V01mYDkE7 49BGaaVzkEdQcLKV6P7ElTQ/i2XZpNO9f7UeOl6uV74FQeUFss59OuK1X04gKQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702666648; a=rsa-sha256; cv=none; b=sjDlCe7KTeQ2v96T9YVpwgYPHg+m58PyEQ0vra5M91Jb/LJpTvnfccXuu4E5LEo8Hg9kN5 Imkhr4wILvJdNubzAB1JdYdBtO5/U4J5KnBfMtik6JLy/C95YqGVZkzSsi29/KDDH0SgYc 0/MhyV6y6UpDu0Qd3FNlNl2nTwkk/3I48/H674VU05L0V3SPUNT7HQlp67TC4ZzDc2bCEg GSB08pgJ6CBrPDrQiRAYtoeZ8mOfhyyR7LZAtxRburG4FPNn77cdhzsgEEBK24tVUqYa2k JCNYYkTv/+c6a7VQMbBiutpGaidHFyIbz3HjYKx2vhbTGhWI/Y44Xo7jXUpuJA== 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=1702666648; 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=qFyLbwAdT8tRiAROaryEoh+U6s1+kntb7fQhPmPZZKc=; b=txrUe3Kebd5OQOAq6pUKQ25veVYwB010d0tNsx8Yb2s1AHere8b1nmQDAHYr6RsgoBIMUO JVn155s3h/PuelgitmROOG/pnZ1mm9SJ3iINxrWLXkQ5FLNZTQBywH8RVuNFmRL9Jt6gOq LOuueeIuQzU2JPwFuw8pyXa23BluRLb5RTyIaesNv7iFUnHc9bLouRbZNRzqfk43f13pTu FL5qJuQAK6l9wZ6fhU4AVcoZVBJQJDOyIgCN9pj+sMjoqHAFWLiumjqDO5oKdWfz1SGfJk wjO5rwbDt6imatonYIE19xEh8Lh+KmROUPlo1N4EKm2QKF3FKb8J1kYjAPdSyQ== 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 4SsJPN19JNz7cl; Fri, 15 Dec 2023 18:57:28 +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 3BFIvSd3018217; Fri, 15 Dec 2023 18:57:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BFIvSE5018214; Fri, 15 Dec 2023 18:57:28 GMT (envelope-from git) Date: Fri, 15 Dec 2023 18:57:28 GMT Message-Id: <202312151857.3BFIvSE5018214@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: aa9ad4d484ef - stable/13 - 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/stable/13 X-Git-Reftype: branch X-Git-Commit: aa9ad4d484eff42dfd7461fdfcc5d32a03922e8e Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=aa9ad4d484eff42dfd7461fdfcc5d32a03922e8e commit aa9ad4d484eff42dfd7461fdfcc5d32a03922e8e Author: Kyle Evans AuthorDate: 2023-11-22 04:45:42 +0000 Commit: Kyle Evans CommitDate: 2023-12-15 00:59:12 +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 3caf8941bdf6..6ca317887cb1 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); }