X-Git-Url: https://git.notmuchmail.org/git?a=blobdiff_plain;f=notmuch.c;h=0a05e1afd864768b77a79c0535e48d48fcd70850;hb=c037dc5e537f06f90323cf9414da95ed5b44167a;hp=e98b14395ba8341db174d844b1ae873c04caa1b5;hpb=e58d85dd7589351955e220351bb68e777cfc0f88;p=notmuch diff --git a/notmuch.c b/notmuch.c index e98b1439..0a05e1af 100644 --- a/notmuch.c +++ b/notmuch.c @@ -54,6 +54,8 @@ typedef struct command { } command_t; typedef struct { + int ignore_read_only_directories; + int total_files; int processed_files; int added_messages; @@ -142,32 +144,35 @@ add_files_print_progress (add_files_state_t *state) * same function. * * o Tell the database to update its time of 'path' to 'path_mtime' + * + * The 'struct stat *st' must point to a structure that has already + * been initialized for 'path' by calling stat(). */ notmuch_status_t -add_files (notmuch_database_t *notmuch, const char *path, - add_files_state_t *state) +add_files_recursive (notmuch_database_t *notmuch, + const char *path, + struct stat *st, + add_files_state_t *state) { DIR *dir = NULL; struct dirent *e, *entry = NULL; int entry_length; int err; char *next = NULL; - struct stat st; time_t path_mtime, path_dbtime; notmuch_status_t status, ret = NOTMUCH_STATUS_SUCCESS; - 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; + /* If we're told to, we bail out on encountering a read-only + * directory, (with this being a clear clue from the user to + * Notmuch that new mail won't be arriving there and we need not + * look. */ + if (state->ignore_read_only_directories && + (st->st_mode & S_IWUSR) == 0) + { + goto DONE; } - path_mtime = st.st_mtime; + path_mtime = st->st_mtime; path_dbtime = notmuch_database_get_timestamp (notmuch, path); @@ -215,17 +220,17 @@ add_files (notmuch_database_t *notmuch, const char *path, next = g_strdup_printf ("%s/%s", path, entry->d_name); - if (stat (next, &st)) { + if (stat (next, st)) { fprintf (stderr, "Error reading %s: %s\n", next, strerror (errno)); ret = NOTMUCH_STATUS_FILE_ERROR; continue; } - if (S_ISREG (st.st_mode)) { + if (S_ISREG (st->st_mode)) { /* If the file hasn't been modified since the last * add_files, then we need not look at it. */ - if (st.st_mtime > path_dbtime) { + if (st->st_mtime > path_dbtime) { state->processed_files++; status = notmuch_database_add_message (notmuch, next); @@ -255,8 +260,8 @@ add_files (notmuch_database_t *notmuch, const char *path, if (state->processed_files % 1000 == 0) add_files_print_progress (state); } - } else if (S_ISDIR (st.st_mode)) { - status = add_files (notmuch, next, state); + } else if (S_ISDIR (st->st_mode)) { + status = add_files_recursive (notmuch, next, st, state); if (status && ret == NOTMUCH_STATUS_SUCCESS) ret = status; } @@ -278,6 +283,32 @@ add_files (notmuch_database_t *notmuch, const char *path, return ret; } +/* This is the top-level entry point for add_files. It does a couple + * of error checks, and then calls into the recursive function, + * (avoiding the repeating of these error checks at every + * level---which would be useless becaues we already do a stat() at + * the level above). */ +static notmuch_status_t +add_files (notmuch_database_t *notmuch, + const char *path, + add_files_state_t *state) +{ + struct stat st; + + 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; + } + + return add_files_recursive (notmuch, path, &st, state); +} + /* Recursively count all regular files in path and all sub-direcotries * of path. The result is added to *count (which should be * initialized to zero by the top-level caller before calling @@ -429,6 +460,7 @@ setup_command (int argc, char *argv[]) printf ("Next, we'll inspect the messages and create a database of threads:\n"); + add_files_state.ignore_read_only_directories = FALSE; add_files_state.total_files = count; add_files_state.processed_files = 0; add_files_state.added_messages = 0; @@ -457,8 +489,12 @@ setup_command (int argc, char *argv[]) } printf ("When new mail is delivered to %s in the future,\n" - "run \"notmuch new\" to add it to the database.\n", + "run \"notmuch new\" to add it to the database.\n\n", mail_directory); + printf ("And if you have any sub-directories that are archives (that is,\n" + "they will never receive new mail), marking these directores as\n" + "read-only (chmod u-w /path/to/dir) will make \"notmuch new\"\n" + "much more efficient (it won't even look in those directories).\n\n"); if (ret) { printf ("Note: At least one error was encountered: %s\n", @@ -492,6 +528,7 @@ new_command (int argc, char *argv[]) mail_directory = notmuch_database_get_path (notmuch); + add_files_state.ignore_read_only_directories = TRUE; add_files_state.total_files = 0; add_files_state.processed_files = 0; add_files_state.added_messages = 0; @@ -733,11 +770,15 @@ restore_command (int argc, char *argv[]) command_t commands[] = { { "setup", setup_command, - "Interactively setup notmuch for first use.\n" + "Interactively setup notmuch for first use.\n\n" "\t\tInvoking notmuch with no command argument will run setup if\n" "\t\tthe setup command has not previously been completed." }, { "new", new_command, - "Find and import any new messages."}, + "Find and import any new messages.\n\n" + "\t\tScans all sub-directories of the database, adding new files\n" + "\t\tthat are found. Note: \"notmuch new\" will skip any\n" + "\t\tread-only directories, so you can use that to mark\n" + "\t\tdirectories that will not receive any new mail."}, { "search", search_command, " [...]\n\n" "\t\tSearch for threads matching the given search terms.\n"