Received-SPF: pass (google.com: domain of linux-bluetooth+bounces-4-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Date: Tue, 7 Nov 2023 10:37:27 +0200
From: Juerg Haefliger <juerg.haefliger@canonical.com>
To: Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Cc: linux-bluetooth@vger.kernel.org
Subject: Re: [PATCH v2] shared/shell: Fix --init-script commandline option
Message-ID: <20231107103727.3ca230ee@smeagol>
In-Reply-To: <CABBYNZKkRtuTfT002ehf1QVq_enbJn_MhBnnAkNgxsMy5MJu_w@mail.gmail.com>
References: <20231027055423.13617-1-juerg.haefliger@canonical.com>
	<20231030065341.8998-1-juerg.haefliger@canonical.com>
	<CABBYNZKkRtuTfT002ehf1QVq_enbJn_MhBnnAkNgxsMy5MJu_w@mail.gmail.com>
Organization: Canonical Ltd
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/8KkkfoPLmUw5r3G4.=v4rp.";
 protocol="application/pgp-signature"; micalg=pgp-sha512

--Sig_/8KkkfoPLmUw5r3G4.=v4rp.
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

Hi Luiz,

> Hi Juerg,
>=20
> On Mon, Oct 30, 2023 at 2:54=E2=80=AFAM Juerg Haefliger
> <juerg.haefliger@canonical.com> wrote:
> >
> > The newly added option -i/--init-script introduced a short option
> > namespace collision with btmgmt's --index, both of which use '-i'.
> >
> > As a result, a provided --index is treated as a file name:
> >
> > $ sudo btmgmt --index 0 info =20
>=20
> Perhaps we could remove this --index since btmgmt supports setting the
> index via select command; it doesn't seem very useful to have 2
> different forms of selecting the index.

That would break a potentially large number of existing scripts, which is b=
ad.
--index has been around for a long time and is also supported by other bluez
commands. It would require some warning first that it's going away to give
people time to transition.

I'd rather fix the new option which hasn't been released yet and introduced
this regression.

...Juerg

=20
> > Unable to open 0: No such file or directory (2)
> >
> > Fix this by using '-s' for --init-script.
> >
> > Fixes: https://github.com/bluez/bluez/issues/639
> > Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
> >
> > ---
> > v2:
> >   - Replace reference to broken commit with reference to github issue.
> > ---
> >  src/shared/shell.c | 8 ++++----
> >  1 file changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/src/shared/shell.c b/src/shared/shell.c
> > index db79c882ca3a..fbccff5b54d9 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 s=
truct bt_shell_opt *opt)
> >         if (opt) {
> >                 memcpy(options + offset, opt->options,
> >                                 sizeof(struct option) * opt->optno);
> > -               snprintf(optstr, sizeof(optstr), "+mhvi:t:%s", opt->opt=
str);
> > +               snprintf(optstr, sizeof(optstr), "+mhvs:t:%s", opt->opt=
str);
> >         } else
> > -               snprintf(optstr, sizeof(optstr), "+mhvi:t:");
> > +               snprintf(optstr, sizeof(optstr), "+mhvs:t:");
> >
> >         data.name =3D strrchr(argv[0], '/');
> >         if (!data.name)
> > @@ -1193,7 +1193,7 @@ void bt_shell_init(int argc, char **argv, const s=
truct 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)
> > --
> > 2.39.2
> > =20
>=20
>=20


--Sig_/8KkkfoPLmUw5r3G4.=v4rp.
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQIzBAEBCgAdFiEEhZfU96IuprviLdeLD9OLCQumQrcFAmVJ90cACgkQD9OLCQum
Qre9rw//TugVkvtdhBQUusdabmENd157jJDHsSkMPDNUhcjX5LHIOFU0lxT4g55O
2H2VI1beG/C+H0/49VlG+7QTpS55yJtO04HnvZK9SUMeTh2pxCQNb1vj9Wttfi0/
x1boepnFnTNRbgcyW/nHGGDqkirPGYE2UMKUpjvs11rA7sz3EEzp39vgphZk5RXf
XX+fPTyak6+3CGDVaUoF74ZHcJtkmxgSofGNS5Kp2W3G3+29xf84kKdZys1sN72K
jIIxsXH56MqG+9FpaREPJWnDUGA3USSVqmkYyblZcr0N0rvFKe+VkkBqmnvF3Ra9
c/aUsja1sGfOmXXxVq9Ohfncp7GFrq/i6Xq8g+RaWBCkIrgG3ozeJH5ZoUaLvxmE
uA2/4slMWalIu888AWYnsYXYx5Cl3fEMADtBf7reQnOFPf1ucONbUNe8h1hCFxbs
YLiCBuBABwYCo42hg3dC9onCSPqQMtosjPIHEE4zRlU9OuzqNp4sg3AGfNDuM5jV
yiisNJbWkKQTOgs623VYatTvW78ZqY/INcr5Th9zK5VLA3bW6R/dzLO5KRZEZTwC
M/lcuM+qKua59pM+HfPVfiQ1yUDh2/3M/SdU1ATaIb68AmZ+D7Diu08TeCAYPxPY
+3FpiyqeV88+Fj3v1LKnyqKBOpQbvkb2x+bHftvF20IKkAVkhkQ=
=G3Qb
-----END PGP SIGNATURE-----

--Sig_/8KkkfoPLmUw5r3G4.=v4rp.--