Received-SPF: pass (google.com: best guess record for domain of linux-bluetooth-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
MIME-Version: 1.0
References: <20200118204423.494209-1-marijns95@gmail.com>
In-Reply-To: <20200118204423.494209-1-marijns95@gmail.com>
From:   Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Date:   Tue, 21 Jan 2020 16:32:41 -0800
Message-ID: <CABBYNZLmQK6+MXT1AQt_OYYFeXJmE+t+Mkw1hjSC0Gdss=+60g@mail.gmail.com>
Subject: Re: [BlueZ PATCH] shared: shell: Only omit consecutive duplicate
 history lines.
To:     Marijn Suijten <marijns95@gmail.com>
Cc:     "linux-bluetooth@vger.kernel.org" <linux-bluetooth@vger.kernel.org>,
        Luiz Augusto Von Dentz <luiz.von.dentz@intel.com>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-bluetooth-owner@vger.kernel.org
Precedence: bulk

Hi Marijn,

On Sat, Jan 18, 2020 at 12:46 PM Marijn Suijten <marijns95@gmail.com> wrote:
>
> From: Marijn Suijten <marijns95@gmail.com>
>
> Change rl_handler to append duplicate history, as long as it isn't
> identical to the last line. It prevents consecutive duplicates while
> still having an accurate overview of the most recent commands used,
> mimicking most modern shells.
>
> This addresses my only major gripe with bluetoothctl: pressing UP does
> not retrieve the last typed command when it is a duplicate of something
> else written (much) earlier in the history. It is especially noticeable
> when needing the same command repeatedly.
> ---
>  src/shared/shell.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
>
> diff --git a/src/shared/shell.c b/src/shared/shell.c
> index cfdcc76c4..2e094b8f1 100644
> --- a/src/shared/shell.c
> +++ b/src/shared/shell.c
> @@ -681,6 +681,7 @@ int bt_shell_release_prompt(const char *input)
>  static void rl_handler(char *input)
>  {
>         wordexp_t w;
> +       HIST_ENTRY *last;
>
>         if (!input) {
>                 rl_insert_text("quit");
> @@ -696,7 +697,9 @@ static void rl_handler(char *input)
>         if (!bt_shell_release_prompt(input))
>                 goto done;
>
> -       if (history_search(input, -1))
> +       last = history_get(history_length + history_base - 1);
> +       /* append only if input is different from previous command */
> +       if (!last || strcmp(input, last->line))
>                 add_history(input);
>
>         if (data.monitor)
> --
> 2.25.0

Applied, thanks.


-- 
Luiz Augusto von Dentz