vim: place ... more inteligently when shortening 'from' list in search

[notmuch] / notmuch-new.c

diff --git a/notmuch-new.c b/notmuch-new.c
index a2b30bdc3c62fb42d3c97c6eca721af7fc73fa5d..e32b92a51de1b8c0c9bd7797edc84229e8424ff5 100644 (file)
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -159,6 +159,7 @@ add_files_recursive (notmuch_database_t *notmuch,
         * user specify files to be ignored. */
        if (strcmp (entry->d_name, ".") == 0 ||
            strcmp (entry->d_name, "..") == 0 ||
+           strcmp (entry->d_name, "tmp") == 0 ||
            strcmp (entry->d_name, ".notmuch") ==0)
        {
            continue;
@@ -180,10 +181,15 @@ add_files_recursive (notmuch_database_t *notmuch,
                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);
+
+                   putchar((state->output_is_a_tty) ? '\r' : '\n');
                    fflush (stdout);
                }
 
@@ -282,9 +288,7 @@ add_files (notmuch_database_t *notmuch,
        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;
@@ -405,6 +409,7 @@ notmuch_new_command (void *ctx, int argc, char *argv[])
     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) {