debian/notmuch
1
0
Fork 0
mirror of https://git.notmuchmail.org/git/notmuch synced 2024-12-04 16:38:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

CLI: pass --config to external commands via NOTMUCH_CONFIG.

Browse source 
This makes `notmuch --config foo external-subcommand` work
consistently with the built in subcommands.
This commit is contained in:
David Bremner 2022-05-31 08:50:59 -03:00
parent eaa5199f5b
commit 5cbddf7e7a
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
notmuch.c
View file

@ -429,11 +429,18 @@ notmuch_command (notmuch_database_t *notmuch,
* false on errors. * false on errors.
*/ */
static bool static bool
try_external_command (char *argv[]) try_external_command (const char *config_file_name, char *argv[])
{ {
char *old_argv0 = argv[0]; char *old_argv0 = argv[0];
bool ret = true; bool ret = true;
if (config_file_name) {
if (setenv ("NOTMUCH_CONFIG", config_file_name, 1)) {
perror ("setenv");
exit (1);
}
}
argv[0] = talloc_asprintf (NULL, "notmuch-%s", old_argv0); argv[0] = talloc_asprintf (NULL, "notmuch-%s", old_argv0);
/* /*
@ -493,7 +500,7 @@ main (int argc, char *argv[])
/* if command->function is NULL, try external command */ /* if command->function is NULL, try external command */
if (! command || ! command->function) { if (! command || ! command->function) {
/* This won't return if the external command is found. */ /* This won't return if the external command is found. */
if (try_external_command (argv + opt_index)) if (try_external_command (config_file_name, argv + opt_index))
fprintf (stderr, "Error: Unknown command '%s' (see \"notmuch help\")\n", fprintf (stderr, "Error: Unknown command '%s' (see \"notmuch help\")\n",
command_name); command_name);
ret = EXIT_FAILURE; ret = EXIT_FAILURE;

1
test/T405-external.sh
View file

@ -44,7 +44,6 @@ EOF
test_expect_equal_file_nonempty EXPECTED OUTPUT test_expect_equal_file_nonempty EXPECTED OUTPUT
test_begin_subtest "NOTMUCH_CONFIG is set by --config" test_begin_subtest "NOTMUCH_CONFIG is set by --config"
test_subtest_known_broken
cp "${NOTMUCH_CONFIG}" "${NOTMUCH_CONFIG}.alternate" cp "${NOTMUCH_CONFIG}" "${NOTMUCH_CONFIG}.alternate"
cat <<EOF > EXPECTED cat <<EOF > EXPECTED
${NOTMUCH_CONFIG}.alternate ${NOTMUCH_CONFIG}.alternate