From nobody Wed Jan 29 21:57:21 2025 X-Original-To: dev-commits-src-main@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 4YjwxG4KgWz5m9Hj; Wed, 29 Jan 2025 21:57:22 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YjwxF5k3gz3ZGp; Wed, 29 Jan 2025 21:57:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738187841; 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=3RyiI/PoP8Lh8Ts9lxQ3BIs8K4GvYGvGNGVDJ+Oc6r4=; b=i8wGSV96w7cb8q0AmRxCkYbcr8kgxRuNhbWjgWwL6d9z5t3AAYJzpxSFYJWJZNsCcRAaxU qPxHfDC9LP8Xs5CZb/BKg2PT954hssG/G1OHR4zzKHOWJzX1CmaXgGmbIgJ3V3s55cEouI IopF4Cg/TrdWkpCmKvtOygPiG2HyJsvkzQ4t/pCzLCSMt5aoLJnLFJrtyJMXtQLHnNDzLY z6fSCJV8naN/cLaRA2kzAmvQT4fI0czMQy2hDZVY5Op/S8a/d6sl7247kHkt/4miqbB2Ff sAbUljkYuyP8ffOIQG8UYuhlQaXH2mQ7+Fg7oXRiaRr0fYp9FPP+tK1oMwtRPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738187841; 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=3RyiI/PoP8Lh8Ts9lxQ3BIs8K4GvYGvGNGVDJ+Oc6r4=; b=oM+f8dom60L6KCppq5kKr8iQftn3Le1e8f31fwdA29hnMYMrCSfrtN1BEvAFCOIgsww+k5 41C7TcQAQdLRHlwnAFnwhKAVWYdQmNEMQTNYnIaq/N7VpwawzZ4eCRjHybq8oK74UKmzyg tsPgX3Gjd/rsh4YxkGEZdQMYge35g0s/w38XWE6jCwS4o1M0TN8LLe2+eEZY56riBmtud0 xjUTk72+qs0InpeYtU50MjKvAGI0Ti0CQQfDtBjUpJCTvck8GJCBOVD0RedfrIlM0rHpIA DsvnSc9N7a4UOcorJtT5XOHqpSGBMu1eqWXMpFP7QKG00hslwNNPJ8Xrg52dsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738187841; a=rsa-sha256; cv=none; b=Emsv0EdyzvfpFSGxm47uJcdbmaAblmJbeHwxfCUEJlAJoOiRJbf7gUf7KlKP707c2pNV3H CwTzsaSxsUWADl5QVBHtJAAuUXFjDD1RplKpjbMayGYpERCA+7yWQa+T6MIRpG9b6sZcUc cuh8bdGXS/oLWpYgwvcIQYX0M655oeIDup1bRfqaYx4Gy1c8pdUQZRI4x5Y0r3+Jbblcxt bOVTKaU6TPxD9OewGgqFhwGdCKZwz3f3gi3u8TNd42QXUhURcTvPM+sMck2i3ph/TjsvYD 4rNCcsjQiCo9IXL5CkGIOBgCmVZm9EnIWvaVVBs1EZFPmDmNN5d/yBZwhxr8IA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YjwxF4vFGz4YV; Wed, 29 Jan 2025 21:57:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 50TLvLjW001520; Wed, 29 Jan 2025 21:57:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50TLvLqu001517; Wed, 29 Jan 2025 21:57:21 GMT (envelope-from git) Date: Wed, 29 Jan 2025 21:57:21 GMT Message-Id: <202501292157.50TLvLqu001517@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Vladimir Kondratyev Subject: git: 0feaf865ce8e - main - iwmbtfw(8): fix getopt flags, unify usage()/manual page contents List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wulf X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0feaf865ce8e333f834177a5656e57b5e32ad5cf Auto-Submitted: auto-generated The branch main has been updated by wulf: URL: https://cgit.FreeBSD.org/src/commit/?id=0feaf865ce8e333f834177a5656e57b5e32ad5cf commit 0feaf865ce8e333f834177a5656e57b5e32ad5cf Author: Eygene Ryabinkin AuthorDate: 2025-01-29 21:56:41 +0000 Commit: Vladimir Kondratyev CommitDate: 2025-01-29 21:56:41 +0000 iwmbtfw(8): fix getopt flags, unify usage()/manual page contents Seems like there was an intention to use command line switches -m, -p and -v (each with argument), but there is no handling for them. Also, some enhancements to the usage()/manpage: - use FreeBSD manpage style -- square brackets -- for denoting optional arguments in usage(); - show default directory path in usage(); - update manual: -f is the optional flag; - show descriptions for -I/-D together: they are logically related. Signed-off-by: Eygene Ryabinkin Reviewed by: wulf MFC after: 1 month --- usr.sbin/bluetooth/iwmbtfw/iwmbtfw.8 | 6 +++--- usr.sbin/bluetooth/iwmbtfw/main.c | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/usr.sbin/bluetooth/iwmbtfw/iwmbtfw.8 b/usr.sbin/bluetooth/iwmbtfw/iwmbtfw.8 index 2ce828cb5ebe..87f34435d3f4 100644 --- a/usr.sbin/bluetooth/iwmbtfw/iwmbtfw.8 +++ b/usr.sbin/bluetooth/iwmbtfw/iwmbtfw.8 @@ -36,7 +36,7 @@ .Nm .Op Fl DI .Fl d Ar device_name -.Fl f Ar firmware_path +.Op Fl f Ar firmware_path .Nm .Fl h .Sh DESCRIPTION @@ -66,6 +66,8 @@ configuration to load in at runtime. .Pp The options are as follows: .Bl -tag -width "-f firmware_path" +.It Fl I +Enable informational debugging. .It Fl D Enable verbose debugging. .It Fl d Ar device_name @@ -76,8 +78,6 @@ device name. Specify the directory containing the firmware files to search and upload. .It Fl h Display usage message and exit. -.It Fl I -Enable informational debugging. .El .Sh EXIT STATUS .Ex -std diff --git a/usr.sbin/bluetooth/iwmbtfw/main.c b/usr.sbin/bluetooth/iwmbtfw/main.c index 7af07bb68322..b27c5ad62239 100644 --- a/usr.sbin/bluetooth/iwmbtfw/main.c +++ b/usr.sbin/bluetooth/iwmbtfw/main.c @@ -369,10 +369,11 @@ static void usage(void) { fprintf(stderr, - "Usage: iwmbtfw (-D) -d ugenX.Y (-f firmware path) (-I)\n"); + "Usage: iwmbtfw [-DI] -d ugenX.Y [-f firmware path]\n"); fprintf(stderr, " -D: enable debugging\n"); fprintf(stderr, " -d: device to operate upon\n"); - fprintf(stderr, " -f: firmware path, if not default\n"); + fprintf(stderr, " -f: firmware path (defaults to %s)\n", + _DEFAULT_IWMBT_FIRMWARE_PATH); fprintf(stderr, " -I: enable informational output\n"); exit(127); } @@ -652,7 +653,7 @@ main(int argc, char *argv[]) enum iwmbt_device iwmbt_device; /* Parse command line arguments */ - while ((n = getopt(argc, argv, "Dd:f:hIm:p:v:")) != -1) { + while ((n = getopt(argc, argv, "Dd:f:hI")) != -1) { switch (n) { case 'd': /* ugen device name */ devid_set = 1;