From nobody Sun Jul 20 09:12:27 2025 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 4blHqH2vkNz61q6q; Sun, 20 Jul 2025 09:12:27 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4blHqH2Cq0z3hDP; Sun, 20 Jul 2025 09:12:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753002747; 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=sNK8AAf0rKVh2kObBUIFY+NtJLmOPg1SXSCln85W5QE=; b=AuMOj9YyVxtwryeuaR/BKETXErJfrWX6118AfnJ3YLGFCFeeZSt7sTTAHeT4/OCjBDze33 ljzDNQamScbm/b/gmxWvKAaIVMxb1DqdP5qvMVFAXLjPRdHsvVfwpK/bYMcSa9S/todRIo 30rM+G4qu0Y8sGBpDgMTgnk2Juph1GPGJBtyL/grct273OsqMHKw7TwzYRbXpOdGrLW/M0 /DyljNE2ou9TcMidJl6WnltAw1MWN8ovihYOoV319KiUGZf8Bs01dub04v2KCVNuPx7bbc feD6iAhsxcdWi88mgn6izkucs97iiDQp33fArmJxZ+5KxasKyw9p0Q5/WRqQYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1753002747; 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=sNK8AAf0rKVh2kObBUIFY+NtJLmOPg1SXSCln85W5QE=; b=r5GaSbYfSD/3wEC95lrZw31j3inU6NAeInqVqI1luYAc/liS/9Ckry1ykOvhZvYfKVXdFm W94kYJLvk+B4QeMAMM05XaBQeKiI45SzKEpm3fAKpaR8ihohxBS6bEcP1ot0j2DKSdOmIE sJOHzF0OfeJvTwf34GCLg9bu6lq7WPBW6oLoyQT8LIhWrIKOI9bQkMTcBFLBTuUZS4M4Wt lj/cupN/ZkdrFOX5l7MNScVx7PUMSdhcPpLd9I41fK3nfJzEacPOyp/j6mpm4pnIGgQ7WT 3R/UGuJFS45DJVsQIH2L284s3VfvykvaHSzIukmHFLv2lRLLr23ltqXAEu9hTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1753002747; a=rsa-sha256; cv=none; b=PJ67etqNN36zl+cvGVT2o5a/iUQ5ZSAtd+5bVF4ZstTGOqZof+zQX32WVlvC3ZVrElj65O zQzbJzFSV5gdmWDxj/vHDVUMI346+nw1mMRCgIEbUen6ovRu+KGuR8/xWDMOuwDbGNflJk gG2MjQ1MM/82UXD7kckM1rlSx54nIacu4jzroXtGx+k5LPbnXmB32/1xSN4B6k6ZCO9g2j aaxyKYYRGCbTzczM2K70nTbQIyk1wrC8QaKD8QwJTAjHiWGLsQ2DfMSQMRlLcqpAVGhh7R ZBCcUPvwos1RTfgoM6yc3fI65iCHBSQ6IZCO2hA5DlatpGE8loukA80HuyOi+g== 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 4blHqH1lfWz15mZ; Sun, 20 Jul 2025 09:12:27 +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 56K9CR9g091879; Sun, 20 Jul 2025 09:12:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56K9CRh9091876; Sun, 20 Jul 2025 09:12:27 GMT (envelope-from git) Date: Sun, 20 Jul 2025 09:12:27 GMT Message-Id: <202507200912.56K9CRh9091876@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Lars Engels Subject: git: da5827a63ce5 - stable/13 - bluetooth-config: Fix command line parsing 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lme X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: da5827a63ce5065e485ffd3f11a194e516fd9ee2 Auto-Submitted: auto-generated The branch stable/13 has been updated by lme: URL: https://cgit.FreeBSD.org/src/commit/?id=da5827a63ce5065e485ffd3f11a194e516fd9ee2 commit da5827a63ce5065e485ffd3f11a194e516fd9ee2 Author: Dirk Engling AuthorDate: 2025-07-13 09:25:24 +0000 Commit: Lars Engels CommitDate: 2025-07-20 09:12:16 +0000 bluetooth-config: Fix command line parsing This addresses the problems encountered when parsing options in bluetooth-config. - the optional parameters were not properly shifted after consumption - the command line parameter count was checked before getopts and not after Reported by: sjg Approved by: kp MFC after: 7 days Event: Berlin Hackathon 202507 Differential Revision: (cherry picked from commit 5031da20599bb1163f0e8d1c4b415ab3bbebce00) --- usr.sbin/bluetooth/bluetooth-config/bluetooth-config.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bluetooth/bluetooth-config/bluetooth-config.sh b/usr.sbin/bluetooth/bluetooth-config/bluetooth-config.sh index 48a399a82fc7..148325fcecbc 100755 --- a/usr.sbin/bluetooth/bluetooth-config/bluetooth-config.sh +++ b/usr.sbin/bluetooth/bluetooth-config/bluetooth-config.sh @@ -17,7 +17,7 @@ main() { unset node device started bdaddresses retry # Only one command at the moment is scan (+ add) -[ "$#" -eq 1 -a "$1" = "scan" ] || print_syntax +[ "$1" = "scan" ] || print_syntax shift # Get command line options @@ -28,6 +28,12 @@ while getopts :d:n: arg; do ?) print_syntax;; esac done +shift "$((OPTIND-1))" + +# If there's leftover parameters, print usage +[ "$#" -eq 0 ] || print_syntax +shift + # No use running without super user rights if [ $( id -u ) -ne 0 ]; then