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

notmuch-restore: check for extra arguments.

Browse source 
We consider it an error to pass more than one file to restore, since
extra ones are ignored.
This commit is contained in:
David Bremner 2011-10-21 15:46:54 -03:00
parent a77d9adcac
commit 903fe63986
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
notmuch-restore.c
View file

@ -77,6 +77,13 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[])
optind++; optind++;
} }
if (optind < 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 /* Dump output is one line per message. We match a sequence of
* non-space characters for the message-id, then one or more * non-space characters for the message-id, then one or more
* spaces, then a list of space-separated tags as a sequence of * spaces, then a list of space-separated tags as a sequence of

1
test/dump-restore
View file

@ -50,7 +50,6 @@ test_expect_success 'Restore with nothing to do, III' \
test_cmp dump.expected dump.actual' test_cmp dump.expected dump.actual'
# notmuch restore currently only considers the first argument. # notmuch restore currently only considers the first argument.
test_subtest_known_broken
test_expect_success 'Invalid restore invocation' \ test_expect_success 'Invalid restore invocation' \
'test_must_fail notmuch restore dump.expected another_one' 'test_must_fail notmuch restore dump.expected another_one'