From nobody Fri Mar 22 09:15:05 2024 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 4V1GrB1Xrcz5G90H; Fri, 22 Mar 2024 09:15:06 +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 4V1Gr950vzz4XlJ; Fri, 22 Mar 2024 09:15:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711098905; 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=ZxsTAmHVlXsVsuvt4Vn3UCuuUl5d+T2WozdkKj9tIgw=; b=UzhnPGSelTJj4Yt8vWIxYigIEStfLDpRurwIjbaC6TVsXAJnvHQPAnxPA79jYh9A1y6xY4 Niq93X0EEWYgiFL6glMuB3rxGJHLn3+N8s3nL2WGgBi018s9LEntYykv1Ua6IhfBsWOdgx oS0SNq1/mTOj82jZ2LMKqI7gEF4KOgMdw0CeHvr1wW3Fjyf0nbbAmZCxDNu71rJYVFX9oJ HJ1wyBVPOJqihX4+2kwNOSCumsm41wgv0zGwWhsOPaCH4PsPl87OlgmJ63Id8tw38XV2MZ vSBqKVjEIt0syzGIWSzBO1xZ+rJUgggg0fiX5jb9hwU7lweN5sLcg3RPUG8DTA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711098905; a=rsa-sha256; cv=none; b=FvxXNf5j2MPORXD1ddB/A7iDUhXAEPZXbIfqz0mzSo40oHVesBa4yJ6P4RWq7jC0DWknum OKB3lQJycPvzpqt16xk9j4b9mTxEBLjnGrvgWXEpbUTmdpYqeIkFh7Yicx4W3QupzAE6sM yBcyFYVOiMZ1jBOgbb0VxNFj5x6PSZvPj7AaQBEcT9nYIM8cPrethTxAbi7K72sn1wGHiY zPhF+OToirKrLZtLWSInW0N22+vdCXGaf+UG4UorvTDgOYe4oz/ZzD84tOj9WRw7v0WJSS Q5XPRGzRHvKNKK8ag+2o7LPXYvdsskQ9ss3npHwxytNU25nFmoZMp39WjsTEiQ== 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=1711098905; 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=ZxsTAmHVlXsVsuvt4Vn3UCuuUl5d+T2WozdkKj9tIgw=; b=qz56i7s5JC9/vKuDGTlZRBqps4Rwpr73d7nKNvKF3F4BPv3NYR8tRDwQJxLZjyGr7SoPu0 h96v7/S2zbKGQDSyWuNfQLMIyXaEKuOMXtZWJljbFTHh+rpdi1Z9B6aVPhXgC19m9H2aWw BYos9FV223jIaua3f6WGUGea90JI17/jXevL7dJs12VbWxGdYB3rpx/hbhpEtRokSerSUL 9wmy6yOCiYlV9blE+PW0BAm87ev8m8l4OkidyyEDaqeZMhqAsSlD23Ol01ZWgshK074CRA SFBnwsVaOywjFMwRqM7q+7qxRVlUEYXxxk3PIoX6+GZbDIRJ6oBigQJwOzVJJQ== 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 4V1Gr94bv7z1C00; Fri, 22 Mar 2024 09:15:05 +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 42M9F5aP061978; Fri, 22 Mar 2024 09:15:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42M9F5f9061976; Fri, 22 Mar 2024 09:15:05 GMT (envelope-from git) Date: Fri, 22 Mar 2024 09:15:05 GMT Message-Id: <202403220915.42M9F5f9061976@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 95d66df41b83 - stable/13 - bectl: Use geopt() and drop mention of -?. 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 95d66df41b832724a6a5e58f4a07cc89639cb660 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=95d66df41b832724a6a5e58f4a07cc89639cb660 commit 95d66df41b832724a6a5e58f4a07cc89639cb660 Author: Dag-Erling Smørgrav AuthorDate: 2024-03-18 13:49:18 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-03-22 08:07:34 +0000 bectl: Use geopt() and drop mention of -?. MFC after: 3 days PR: 272260 Reviewed by: kevans Differential Revision: https://reviews.freebsd.org/D44405 (cherry picked from commit e819534f15308c92afd19166254604995766ce32) --- sbin/bectl/bectl.8 | 11 ++++------- sbin/bectl/bectl.c | 45 +++++++++++++++++++++++---------------------- 2 files changed, 27 insertions(+), 29 deletions(-) diff --git a/sbin/bectl/bectl.8 b/sbin/bectl/bectl.8 index 42561a967bfd..e0e2827fb34f 100644 --- a/sbin/bectl/bectl.8 +++ b/sbin/bectl/bectl.8 @@ -13,9 +13,7 @@ .\" documentation and/or other materials provided with the distribution. .\" .\" -.\" @(#)be.1 -.\" -.Dd October 5, 2023 +.Dd March 18, 2024 .Dt BECTL 8 .Os .Sh NAME @@ -23,7 +21,7 @@ .Nd Utility to manage boot environments on ZFS .Sh SYNOPSIS .Nm -.Op Fl h\&? +.Op Fl h .Nm .Op Fl r Ar beroot .Cm activate @@ -117,10 +115,9 @@ flag to work. .Ss Supported Subcommands and Flags .Bl -tag -width activate .It Xo -.Fl h | -.Fl \&? +.Fl h .Xc -Print usage information. +Print usage information and exit. .It Xo .Cm activate .Op Fl t | Fl T diff --git a/sbin/bectl/bectl.c b/sbin/bectl/bectl.c index f2ea8b241b14..89d107431661 100644 --- a/sbin/bectl/bectl.c +++ b/sbin/bectl/bectl.c @@ -65,7 +65,7 @@ usage(bool explicit) fp = explicit ? stdout : stderr; fprintf(fp, "%s", - "Usage:\tbectl {-h | -? | subcommand [args...]}\n" + "Usage:\tbectl {-h | subcommand [args...]}\n" #if SOON "\tbectl [-r beroot] add (path)*\n" #endif @@ -545,27 +545,31 @@ main(int argc, char *argv[]) { struct command_map_entry *cmd; const char *command; - char *root; - int rc; + char *root = NULL; + int opt, rc; - cmd = NULL; - root = NULL; - if (argc < 2) - return (usage(false)); - - if (strcmp(argv[1], "-r") == 0) { - if (argc < 4) - return (usage(false)); - root = strdup(argv[2]); - command = argv[3]; - argc -= 3; - argv += 3; - } else { - command = argv[1]; - argc -= 1; - argv += 1; + while ((opt = getopt(argc, argv, "hr:")) != -1) { + switch (opt) { + case 'h': + exit(usage(true)); + case 'r': + root = strdup(optarg); + break; + default: + exit(usage(false)); + } } + argc -= optind; + argv += optind; + + if (argc == 0) + exit(usage(false)); + + command = *argv; + optreset = 1; + optind = 1; + /* Handle command aliases */ if (strcmp(command, "umount") == 0) command = "unmount"; @@ -573,9 +577,6 @@ main(int argc, char *argv[]) if (strcmp(command, "ujail") == 0) command = "unjail"; - if ((strcmp(command, "-?") == 0) || (strcmp(command, "-h") == 0)) - return (usage(true)); - if ((cmd = get_cmd_info(command)) == NULL) { fprintf(stderr, "Unknown command: %s\n", command); return (usage(false));