[PATCH] cli/new: Avoid printing "\033[K" to non-terminal output

classic Classic list List threaded Threaded
3 messages Options
Łukasz Stelmach-2 Łukasz Stelmach-2
Reply | Threaded
Open this post in threaded view
|

[PATCH] cli/new: Avoid printing "\033[K" to non-terminal output

---
 notmuch-new.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/notmuch-new.c b/notmuch-new.c
index 1321263..44174ad 100644
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -905,10 +905,9 @@ print_results (const add_files_state_t *state)
  state->processed_files == 1 ? "file" : "total files");
  notmuch_time_print_formatted_seconds (elapsed);
  if (elapsed > 1)
-    printf (" (%d files/sec.).\033[K\n",
+    printf (" (%d files/sec.)",
     (int) (state->processed_files / elapsed));
- else
-    printf (".\033[K\n");
+ printf(".%s\n", (state->output_is_a_tty) ? "\033[K" : "");
     }
 
     if (state->added_messages)
--
2.1.4

_______________________________________________
notmuch mailing list
[hidden email]
https://notmuchmail.org/mailman/listinfo/notmuch
Łukasz Stelmach-2 Łukasz Stelmach-2
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] cli/new: Avoid printing "\033[K" to non-terminal output

Tomi Ollila wrote:

>It was <2017-03-09 czw 13:35>, when David Bremner wrote:
>> Łukasz Stelmach <[hidden email]> writes:
>>
>>> ---
>>>  notmuch-new.c | 5 ++---
>>>  1 file changed, 2 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/notmuch-new.c b/notmuch-new.c
>>> index 1321263..44174ad 100644
>>> --- a/notmuch-new.c
>>> +++ b/notmuch-new.c
>>> @@ -905,10 +905,9 @@ print_results (const add_files_state_t *state)
>>>   state->processed_files == 1 ? "file" : "total files");
>>>   notmuch_time_print_formatted_seconds (elapsed);
>>>   if (elapsed > 1)
>>> -    printf (" (%d files/sec.).\033[K\n",
>>> +    printf (" (%d files/sec.)",
>>>      (int) (state->processed_files / elapsed));
>>> - else
>>> -    printf (".\033[K\n");
>>> + printf(".%s\n", (state->output_is_a_tty) ? "\033[K" : "");
>>>      }
>>
>> Other than missing a space after printf (which I can hopefully remember
>> to add when I commit it, this looks fine).
>
> I looked this briefly a while ago -- there were quite a few \033[K:s
> that were not taken care of... would those have needed to be...
As far as I can tell this is the only one left, that is not under the
condition of output_is_a_tty (at least in notmuch-new).

--
Łukasz Stelmach
Samsung R&D Institute Poland
Samsung Electronics

_______________________________________________
notmuch mailing list
[hidden email]
https://notmuchmail.org/mailman/listinfo/notmuch

signature.asc (482 bytes) Download Attachment
David Bremner-2 David Bremner-2
Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] cli/new: Avoid printing "\033[K" to non-terminal output

In reply to this post by Łukasz Stelmach-2
Łukasz Stelmach <[hidden email]> writes:

> ---
>  notmuch-new.c | 5 ++---
>  1 file changed, 2 insertions(+), 3 deletions(-)

pushed with whitespace change to master,

d
_______________________________________________
notmuch mailing list
[hidden email]
https://notmuchmail.org/mailman/listinfo/notmuch