debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-11-22 02:48:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

notmuch-dump: convert to command-line-arguments

Browse source 
The output file is handled via positional arguments. There are
currently no "normal" options.
This commit is contained in:
David Bremner 2011-12-01 22:08:51 -08:00
parent 5800a44bd5
commit 7ced2e32d1
1 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
notmuch-dump.c
View file

@ -41,27 +41,34 @@ notmuch_dump_command (unused (void *ctx), int argc, char *argv[])
if (notmuch == NULL) if (notmuch == NULL)
return 1; return 1;
argc--; argv++; /* skip subcommand argument */ char *output_file_name = NULL;
int opt_index;
if (argc && strcmp (argv[0], "--") != 0) { notmuch_opt_desc_t options[] = {
{ NOTMUCH_OPT_POSITION, &output_file_name, 0, 0, 0 },
{ 0, 0, 0, 0, 0 }
};
opt_index = parse_arguments (argc, argv, options, 1);
if (opt_index < 0) {
/* diagnostics already printed */
return 1;
}
if (output_file_name) {
fprintf (stderr, "Warning: the output file argument of dump is deprecated.\n"); fprintf (stderr, "Warning: the output file argument of dump is deprecated.\n");
output = fopen (argv[0], "w"); output = fopen (output_file_name, "w");
if (output == NULL) { if (output == NULL) {
fprintf (stderr, "Error opening %s for writing: %s\n", fprintf (stderr, "Error opening %s for writing: %s\n",
argv[0], strerror (errno)); output_file_name, strerror (errno));
return 1; return 1;
} }
argc--;
argv++;
} }
if (argc && strcmp (argv[0], "--") == 0){
argc--;
argv++;
}
if (argc) { if (opt_index < argc) {
query_str = query_string_from_args (notmuch, argc, argv); query_str = query_string_from_args (notmuch, argc-opt_index, argv+opt_index);
if (query_str == NULL) { if (query_str == NULL) {
fprintf (stderr, "Out of memory.\n"); fprintf (stderr, "Out of memory.\n");
return 1; return 1;