Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36;
Date:   Thu, 26 Oct 2023 18:24:26 +0200
From:   Juerg Haefliger <juerg.haefliger@canonical.com>
To:     linux-bluetooth@vger.kernel.org
Subject: bluez: btmgmt --index broken
Message-ID: <20231026182426.032a776d@gollum>
Organization: Canonical Ltd
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/8n_V7_y2uqdC0n1YRNs_fhT";
 protocol="application/pgp-signature"; micalg=pgp-sha512
Precedence: bulk

--Sig_/8n_V7_y2uqdC0n1YRNs_fhT
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

Hi,

Commit 648b4362521b ("shared/shell: Add support for -i/--init-script")
introduced a short option namespace collision with btmgmt's --index option,
both of which use '-i'.

As a result, a provided --index is treated as an init-script...

$ sudo btmgmt --index 0 info
Unable to open 0: No such file or directory (2)


On a separate note, should btmgmt actually support --init-script since it
doesn't seem to do anything and just enters interactive mode?

$ cat test
help
info
quit

$ btmgmt --init-script test
[mgmt]#


Simple fix for the first issue, use -s/--init-script instead:

diff --git a/src/shared/shell.c b/src/shared/shell.c
index db79c882c..fbccff5b5 100644
--- a/src/shared/shell.c
+++ b/src/shared/shell.c
@@ -1128,7 +1128,7 @@ static void rl_init(void)
 static const struct option main_options[] =3D {
        { "version",    no_argument, 0, 'v' },
        { "help",       no_argument, 0, 'h' },
-       { "init-script", required_argument, 0, 'i' },
+       { "init-script", required_argument, 0, 's' },
        { "timeout",    required_argument, 0, 't' },
        { "monitor",    no_argument, 0, 'm' },
        { "zsh-complete",       no_argument, 0, 'z' },
@@ -1169,9 +1169,9 @@ void bt_shell_init(int argc, char **argv, const struc=
t bt_shell_opt *opt)
        if (opt) {
                memcpy(options + offset, opt->options,
                                sizeof(struct option) * opt->optno);
-               snprintf(optstr, sizeof(optstr), "+mhvi:t:%s", opt->optstr);
+               snprintf(optstr, sizeof(optstr), "+mhvs:t:%s", opt->optstr);
        } else
-               snprintf(optstr, sizeof(optstr), "+mhvi:t:");
+               snprintf(optstr, sizeof(optstr), "+mhvs:t:");
=20
        data.name =3D strrchr(argv[0], '/');
        if (!data.name)
@@ -1193,7 +1193,7 @@ void bt_shell_init(int argc, char **argv, const struc=
t bt_shell_opt *opt)
                        data.argv =3D &cmplt;
                        data.mode =3D 1;
                        goto done;
-               case 'i':
+               case 's':
                        if (optarg)
                                data.init_fd =3D open(optarg, O_RDONLY);
                        if (data.init_fd < 0)

--Sig_/8n_V7_y2uqdC0n1YRNs_fhT
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCgAdFiEEhZfU96IuprviLdeLD9OLCQumQrcFAmU6kroACgkQD9OLCQum
Qrf4AQ/9HUSjhxA+MQhpVbraq5m/P36d2jALkWXorPq7ByFc7UYlfvLhndkQHR4+
0C7zcZEL8ElsrpKHgL+AAHqUm5QwFCimHhiE/PLYygI4yYhuOI62rPORRYp43ONu
hZNaYZj4vtOcFCvqWV7ePKW54xJPLxfrBf7rHtHzYAXCqpUjhF76t4wqPk8LWb1X
dzBKJz/BdZ1ETHQKc3CWqsEQbFUROI474lrtLzGdRWFeYrGC70OgC3SgGavCkcoC
SHpMThl+v+gt1PekKvYPTZw532zTltdJEpocNIa4G1l5Misth9c737yZPax3b03N
hcLGLAEy0mMxpCWGPROWo9SjwK6qKmRkx4MhhT6i8AGg/MD2yGEzBoFsvtVAIsIW
Ls1BoFc04guj2Y7QaZncpxUYO+NU0Xuco0/DCOwjFa6i3JvXvBYJDLCOWNUzGUCG
pV6M2n7Plo4gWix4JHgGr27wIjrLtkRVGGNkzjl81hz6JEMSShAn1nvhZmTOPMVs
QttfMP2iNvgojjOVhKHpzUOiyJqwI7esRfib/Lchu/zEBlS0WSnLiAzWQzXM/n2X
WuTR1xEqMmha8H7P0ZL2f6JYnK5yq/ffvz9XFFKTPjAJy62XJXF+ccC+l5/K9xjs
hGgt4KojFCIAG1UHvxFEP7o5Dx2eE0jG7b3IMLcTCGPFkrkY/wA=
=zrDR
-----END PGP SIGNATURE-----

--Sig_/8n_V7_y2uqdC0n1YRNs_fhT--