X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=notmuch-new.c;h=432d126286fba8fd070ad75d18850ecca38caef9;hb=39e81ca431906370d0fee351419e1314e57a7c58;hp=3f8b7fcf89840ce13b941132f26599dac002293f;hpb=3fa2385f7cc367725ea74a08237158bd5a4163d7;p=notmuch

diff --git a/notmuch-new.c b/notmuch-new.c
index 3f8b7fcf..432d1262 100644
--- a/notmuch-new.c
+++ b/notmuch-new.c
@@ -229,10 +229,11 @@ add_files_recursive (notmuch_database_t *notmuch,
 	return NOTMUCH_STATUS_FILE_ERROR;
     }
 
-    if (! S_ISDIR (st.st_mode)) {
-	fprintf (stderr, "Error: %s is not a directory.\n", path);
-	return NOTMUCH_STATUS_FILE_ERROR;
-    }
+    /* This is not an error since we may have recursed based on a
+     * symlink to a regular file, not a directory, and we don't know
+     * that until this stat. */
+    if (! S_ISDIR (st.st_mode))
+	return NOTMUCH_STATUS_SUCCESS;
 
     fs_mtime = st.st_mtime;
 
@@ -262,7 +263,7 @@ add_files_recursive (notmuch_database_t *notmuch,
 
 	entry = fs_entries[i];
 
-	if (entry->d_type != DT_DIR)
+	if (entry->d_type != DT_DIR && entry->d_type != DT_LNK)
 	    continue;
 
 	/* Ignore special directories to avoid infinite recursion.
@@ -333,8 +334,27 @@ add_files_recursive (notmuch_database_t *notmuch,
 	    notmuch_filenames_advance (db_subdirs);
 	}
 
-	if (entry->d_type != DT_REG)
+	/* If we're looking at a symlink, we only want to add it if it
+	 * links to a regular file, (and not to a directory, say). */
+	if (entry->d_type == DT_LNK) {
+	    int err;
+
+	    next = talloc_asprintf (notmuch, "%s/%s", path, entry->d_name);
+	    err = stat (next, &st);
+	    talloc_free (next);
+	    next = NULL;
+
+	    /* Don't emit an error for a link pointing nowhere, since
+	     * the directory-traversal pass will have already done
+	     * that. */
+	    if (err)
+		continue;
+
+	    if (! S_ISREG (st.st_mode))
+		continue;
+	} else if (entry->d_type != DT_REG) {
 	    continue;
+	}
 
 	/* Don't add a file that we've added before. */
 	if (notmuch_filenames_has_more (db_files) &&
@@ -344,7 +364,7 @@ add_files_recursive (notmuch_database_t *notmuch,
 	    continue;
 	}
 
-	/* We're not looking at a regular file that doesn't yet exist
+	/* We're now looking at a regular file that doesn't yet exist
 	 * in the database, so add it. */
 	next = talloc_asprintf (notmuch, "%s/%s", path, entry->d_name);
 
@@ -447,6 +467,7 @@ add_files (notmuch_database_t *notmuch,
     struct sigaction action;
     struct itimerval timerval;
     notmuch_bool_t timer_is_active = FALSE;
+    struct stat st;
 
     if (state->output_is_a_tty && ! debugger_is_active () && ! state->verbose) {
 	/* Setup our handler for SIGALRM */
@@ -466,6 +487,17 @@ add_files (notmuch_database_t *notmuch,
 	timer_is_active = TRUE;
     }
 
+    if (stat (path, &st)) {
+	fprintf (stderr, "Error reading directory %s: %s\n",
+		 path, strerror (errno));
+	return NOTMUCH_STATUS_FILE_ERROR;
+    }
+
+    if (! S_ISDIR (st.st_mode)) {
+	fprintf (stderr, "Error: %s is not a directory.\n", path);
+	return NOTMUCH_STATUS_FILE_ERROR;
+    }
+
     status = add_files_recursive (notmuch, path, state);
 
     if (timer_is_active) {
@@ -567,6 +599,8 @@ notmuch_new_command (void *ctx, int argc, char *argv[])
     char *dot_notmuch_path;
     struct sigaction action;
     _filename_node_t *f;
+    int renamed_files, removed_files;
+    notmuch_status_t status;
     int i;
 
     add_files_state.verbose = 0;
@@ -628,8 +662,14 @@ notmuch_new_command (void *ctx, int argc, char *argv[])
 
     ret = add_files (notmuch, db_path, &add_files_state);
 
+    removed_files = 0;
+    renamed_files = 0;
     for (f = add_files_state.removed_files->head; f; f = f->next) {
-	notmuch_database_remove_message (notmuch, f->filename);
+	status = notmuch_database_remove_message (notmuch, f->filename);
+	if (status == NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID)
+	    renamed_files++;
+	else
+	    removed_files++;
     }
 
     for (f = add_files_state.removed_directories->head; f; f = f->next) {
@@ -646,7 +686,11 @@ notmuch_new_command (void *ctx, int argc, char *argv[])
 
 	    absolute = talloc_asprintf (ctx, "%s/%s", f->filename,
 					notmuch_filenames_get (files));
-	    notmuch_database_remove_message (notmuch, absolute);
+	    status = notmuch_database_remove_message (notmuch, absolute);
+	    if (status == NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID)
+		renamed_files++;
+	    else
+		removed_files++;
 	    talloc_free (absolute);
 	}
 
@@ -659,6 +703,7 @@ notmuch_new_command (void *ctx, int argc, char *argv[])
     gettimeofday (&tv_now, NULL);
     elapsed = notmuch_time_elapsed (add_files_state.tv_start,
 				    tv_now);
+
     if (add_files_state.processed_files) {
 	printf ("Processed %d %s in ", add_files_state.processed_files,
 		add_files_state.processed_files == 1 ?
@@ -671,15 +716,30 @@ notmuch_new_command (void *ctx, int argc, char *argv[])
 	    printf (".                    \n");
 	}
     }
+
     if (add_files_state.added_messages) {
-	printf ("Added %d new %s to the database.\n",
+	printf ("Added %d new %s to the database.",
 		add_files_state.added_messages,
 		add_files_state.added_messages == 1 ?
 		"message" : "messages");
     } else {
-	printf ("No new mail.\n");
+	printf ("No new mail.");
+    }
+
+    if (removed_files) {
+	printf (" Removed %d %s.",
+		removed_files,
+		removed_files == 1 ? "message" : "messages");
     }
 
+    if (renamed_files) {
+	printf (" Detected %d file %s.",
+		renamed_files,
+		renamed_files == 1 ? "rename" : "renames");
+    }
+
+    printf ("\n");
+
     if (ret) {
 	printf ("\nNote: At least one error was encountered: %s\n",
 		notmuch_status_to_string (ret));