When running "notmuch new --verbose", ANSI escapes are used. This may not be
desirable when the output of the command is *not* being sent to a terminal
(e.g. when piping output into another command). In that case each file
processed is printed in a new line and ANSI escapes are not used at all.
typedef struct {
int ignore_read_only_directories;
int saw_read_only_directory;
typedef struct {
int ignore_read_only_directories;
int saw_read_only_directory;
int verbose;
int total_files;
int verbose;
int total_files;
state->processed_files++;
if (state->verbose) {
state->processed_files++;
if (state->verbose) {
- printf ("\r\033[K%i/%i: %s\r",
+ if (state->output_is_a_tty)
+ printf("\r\033[K");
+
+ printf ("%i/%i: %s",
state->processed_files,
state->total_files,
next);
state->processed_files,
state->total_files,
next);
+
+ putchar((state->output_is_a_tty) ? '\r' : '\n');
return NOTMUCH_STATUS_FILE_ERROR;
}
return NOTMUCH_STATUS_FILE_ERROR;
}
- if (isatty (fileno (stdout)) && ! debugger_is_active ()
- && ! state->verbose)
- {
+ if (state->output_is_a_tty && ! debugger_is_active () && ! state->verbose) {
/* Setup our handler for SIGALRM */
memset (&action, 0, sizeof (struct sigaction));
action.sa_handler = handle_sigalrm;
/* Setup our handler for SIGALRM */
memset (&action, 0, sizeof (struct sigaction));
action.sa_handler = handle_sigalrm;
int i;
add_files_state.verbose = 0;
int i;
add_files_state.verbose = 0;
+ add_files_state.output_is_a_tty = isatty (fileno (stdout));
for (i = 0; i < argc && argv[i][0] == '-'; i++) {
if (STRNCMP_LITERAL (argv[i], "--verbose") == 0) {
for (i = 0; i < argc && argv[i][0] == '-'; i++) {
if (STRNCMP_LITERAL (argv[i], "--verbose") == 0) {