notmuch_config_t *config;
notmuch_database_t *notmuch;
notmuch_bool_t synchronize_flags;
- FILE *input;
+ notmuch_bool_t accumulate = FALSE;
+ char *input_file_name = NULL;
+ FILE *input = stdin;
char *line = NULL;
size_t line_size;
ssize_t line_len;
regex_t regex;
int rerr;
+ int opt_index;
config = notmuch_config_open (ctx, NULL, NULL);
if (config == NULL)
synchronize_flags = notmuch_config_get_maildir_synchronize_flags (config);
- argc--; argv++; /* skip subcommand argument */
+ notmuch_opt_desc_t options[] = {
+ { NOTMUCH_OPT_POSITION, &input_file_name, 0, 0, 0 },
+ { NOTMUCH_OPT_BOOLEAN, &accumulate, "accumulate", 'a', 0 },
+ { 0, 0, 0, 0, 0 }
+ };
- if (argc) {
- input = fopen (argv[0], "r");
+ opt_index = parse_arguments (argc, argv, options, 1);
+
+ if (opt_index < 0) {
+ /* diagnostics already printed */
+ return 1;
+ }
+
+ if (input_file_name) {
+ input = fopen (input_file_name, "r");
if (input == NULL) {
fprintf (stderr, "Error opening %s for reading: %s\n",
- argv[0], strerror (errno));
+ input_file_name, strerror (errno));
return 1;
}
- } else {
- printf ("No filename given. Reading dump from stdin.\n");
- input = stdin;
+ optind++;
+ }
+
+ if (opt_index < argc) {
+ fprintf (stderr,
+ "Cannot read dump from more than one file: %s\n",
+ argv[optind]);
+ return 1;
}
/* Dump output is one line per message. We match a sequence of
* non-space characters for the message-id, then one or more
* spaces, then a list of space-separated tags as a sequence of
* characters within literal '(' and ')'. */
- xregcomp (®ex,
- "^([^ ]+) \\(([^)]*)\\)$",
- REG_EXTENDED);
+ if ( xregcomp (®ex,
+ "^([^ ]+) \\(([^)]*)\\)$",
+ REG_EXTENDED) )
+ INTERNAL_ERROR("compile time constant regex failed.");
while ((line_len = getline (&line, &line_size, input)) != -1) {
regmatch_t match[3];
goto NEXT_LINE;
}
+ /* In order to detect missing messages, this check/optimization is
+ * intentionally done *after* first finding the message. */
+ if (accumulate && (file_tags == NULL || *file_tags == '\0'))
+ {
+ goto NEXT_LINE;
+ }
+
db_tags_str = NULL;
for (db_tags = notmuch_message_get_tags (message);
notmuch_tags_valid (db_tags);
}
notmuch_message_freeze (message);
- notmuch_message_remove_all_tags (message);
+
+ if (!accumulate)
+ notmuch_message_remove_all_tags (message);
next = file_tags;
while (next) {