Re: [BlueZ 3/3] shared/shell: Exit after printing the help

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Bastien,

On Thu, Sep 12, 2024 at 5:29 AM Bastien Nocera <hadess@xxxxxxxxxx> wrote:
>
> Exit after handling --help, so as to avoid the daemon waiting to
> communicate with a D-Bus service that might not be running.
> ---
>  src/shared/shell.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/src/shared/shell.c b/src/shared/shell.c
> index c31487190d0f..f7e8b3300373 100644
> --- a/src/shared/shell.c
> +++ b/src/shared/shell.c
> @@ -1324,9 +1324,7 @@ void bt_shell_init(int argc, char **argv, const struct bt_shell_opt *opt)
>                         return;
>                 case 'h':
>                         usage(argc, argv, opt);
> -                       data.argc = 1;
> -                       data.argv = &cmplt;
> -                       data.mode = 1;
> +                       exit(EXIT_SUCCESS);

This would undo shared/shell: Print commands when --help option is
given, so you might want to add print_cmds call.

>                         goto done;
>                 case 's':
>                         if (optarg && data.init_fd < 0) {
> --
> 2.46.0
>
>


-- 
Luiz Augusto von Dentz





[Index of Archives]     [Bluez Devel]     [Linux Wireless Networking]     [Linux Wireless Personal Area Networking]     [Linux ATH6KL]     [Linux USB Devel]     [Linux Media Drivers]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [Big List of Linux Books]

  Powered by Linux