X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-new.c;h=0f50457eb8947bf76f1bdf838ccc700ea6e28550;hp=faeb8f0a5896a4e23b012c2ba6c0be986b5a01b4;hb=4dfcc8c9b2e1dbb965f69283dca50c7581c88050;hpb=f2ed177e6260d835b8a13d2a53e1c8d5fa76edf2 diff --git a/notmuch-new.c b/notmuch-new.c index faeb8f0a..0f50457e 100644 --- a/notmuch-new.c +++ b/notmuch-new.c @@ -44,7 +44,7 @@ enum verbosity { typedef struct { int output_is_a_tty; enum verbosity verbosity; - notmuch_bool_t debug; + bool debug; const char **new_tags; size_t new_tags_length; const char **new_ignore; @@ -60,7 +60,7 @@ typedef struct { _filename_list_t *removed_directories; _filename_list_t *directory_mtimes; - notmuch_bool_t synchronize_flags; + bool synchronize_flags; } add_files_state_t; static volatile sig_atomic_t do_print_progress = 0; @@ -234,7 +234,7 @@ _entries_resemble_maildir (const char *path, struct dirent **entries, int count) return 0; } -static notmuch_bool_t +static bool _special_directory (const char *entry) { return strcmp (entry, ".") == 0 || strcmp (entry, "..") == 0; @@ -242,16 +242,16 @@ _special_directory (const char *entry) /* Test if the file/directory is to be ignored. */ -static notmuch_bool_t +static bool _entry_in_ignore_list (const char *entry, add_files_state_t *state) { size_t i; for (i = 0; i < state->new_ignore_length; i++) if (strcmp (entry, state->new_ignore[i]) == 0) - return TRUE; + return true; - return FALSE; + return false; } /* Add a single file to the database. */ @@ -376,7 +376,7 @@ add_files (notmuch_database_t *notmuch, notmuch_filenames_t *db_subdirs = NULL; time_t stat_time; struct stat st; - notmuch_bool_t is_maildir; + bool is_maildir; if (stat (path, &st)) { fprintf (stderr, "Error reading directory %s: %s\n", @@ -452,6 +452,10 @@ add_files (notmuch_database_t *notmuch, for (i = 0; i < num_fs_entries && ! interrupted; i++) { entry = fs_entries[i]; + /* Ignore special directories to avoid infinite recursion. */ + if (_special_directory (entry->d_name)) + continue; + /* Ignore any files/directories the user has configured to * ignore. We do this before dirent_type both for performance * and because we don't care if dirent_type fails on entries @@ -477,12 +481,10 @@ add_files (notmuch_database_t *notmuch, continue; } - /* Ignore special directories to avoid infinite recursion. - * Also ignore the .notmuch directory and any "tmp" directory + /* Ignore the .notmuch directory and any "tmp" directory * that appears within a maildir. */ - if (_special_directory (entry->d_name) || - (is_maildir && strcmp (entry->d_name, "tmp") == 0) || + if ((is_maildir && strcmp (entry->d_name, "tmp") == 0) || strcmp (entry->d_name, ".notmuch") == 0) continue; @@ -519,6 +521,10 @@ add_files (notmuch_database_t *notmuch, for (i = 0; i < num_fs_entries && ! interrupted; i++) { entry = fs_entries[i]; + /* Ignore special directories early. */ + if (_special_directory (entry->d_name)) + continue; + /* Ignore files & directories user has configured to be ignored */ if (_entry_in_ignore_list (entry->d_name, state)) { if (state->debug) @@ -831,7 +837,7 @@ remove_filename (notmuch_database_t *notmuch, status = notmuch_database_remove_message (notmuch, path); if (status == NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID) { add_files_state->renamed_messages++; - if (add_files_state->synchronize_flags == TRUE) + if (add_files_state->synchronize_flags == true) notmuch_message_maildir_flags_to_tags (message); status = NOTMUCH_STATUS_SUCCESS; } else if (status == NOTMUCH_STATUS_SUCCESS) { @@ -935,7 +941,7 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[]) notmuch_database_t *notmuch; add_files_state_t add_files_state = { .verbosity = VERBOSITY_NORMAL, - .debug = FALSE, + .debug = false, .output_is_a_tty = isatty (fileno (stdout)), }; struct timeval tv_start; @@ -947,18 +953,18 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[]) _filename_node_t *f; int opt_index; unsigned int i; - notmuch_bool_t timer_is_active = FALSE; - notmuch_bool_t no_hooks = FALSE; - notmuch_bool_t quiet = FALSE, verbose = FALSE; + bool timer_is_active = false; + bool no_hooks = false; + bool quiet = false, verbose = false; notmuch_status_t status; notmuch_opt_desc_t options[] = { - { NOTMUCH_OPT_BOOLEAN, &quiet, "quiet", 'q', 0 }, - { NOTMUCH_OPT_BOOLEAN, &verbose, "verbose", 'v', 0 }, - { NOTMUCH_OPT_BOOLEAN, &add_files_state.debug, "debug", 'd', 0 }, - { NOTMUCH_OPT_BOOLEAN, &no_hooks, "no-hooks", 'n', 0 }, - { NOTMUCH_OPT_INHERIT, (void *) ¬much_shared_options, NULL, 0, 0 }, - { 0, 0, 0, 0, 0 } + { .opt_bool = &quiet, .name = "quiet" }, + { .opt_bool = &verbose, .name = "verbose" }, + { .opt_bool = &add_files_state.debug, .name = "debug" }, + { .opt_bool = &no_hooks, .name = "no-hooks" }, + { .opt_inherit = notmuch_shared_options }, + { } }; opt_index = parse_arguments (argc, argv, options, 1); @@ -981,7 +987,7 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[]) for (i = 0; i < add_files_state.new_tags_length; i++) { const char *error_msg; - error_msg = illegal_tag (add_files_state.new_tags[i], FALSE); + error_msg = illegal_tag (add_files_state.new_tags[i], false); if (error_msg) { fprintf (stderr, "Error: tag '%s' in new.tags: %s\n", add_files_state.new_tags[i], error_msg); @@ -1048,7 +1054,7 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[]) } if (notmuch_database_dump (notmuch, backup_name, "", - DUMP_FORMAT_BATCH_TAG, DUMP_INCLUDE_DEFAULT, TRUE)) { + DUMP_FORMAT_BATCH_TAG, DUMP_INCLUDE_DEFAULT, true)) { fprintf (stderr, "Backup failed. Aborting upgrade."); return EXIT_FAILURE; } @@ -1095,7 +1101,7 @@ notmuch_new_command (notmuch_config_t *config, int argc, char *argv[]) if (add_files_state.verbosity == VERBOSITY_NORMAL && add_files_state.output_is_a_tty && ! debugger_is_active ()) { setup_progress_printing_timer (); - timer_is_active = TRUE; + timer_is_active = true; } ret = add_files (notmuch, db_path, &add_files_state);