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

cli: config: fix config file save when the file does not exist

Browse source 
The use of realpath(3) in
commit 58ed67992d
Author: Jani Nikula <jani@nikula.org>
Date:   Sun Apr 7 20:15:03 2013 +0300

    cli: config: do not overwrite symlinks when saving config file

broke config file save when the file does not exist, which results in
'notmuch setup' always failing to create a new config file.

Fix by checking ENOENT from realpath(3).
This commit is contained in:
Jani Nikula 2013-05-05 22:18:20 +03:00 committed by David Bremner
parent 2c64c2e0eb
commit 9641fe1ce7
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
notmuch-config.c
View file

@ -456,10 +456,19 @@ notmuch_config_save (notmuch_config_t *config)
/* Try not to overwrite symlinks. */ /* Try not to overwrite symlinks. */
filename = realpath (config->filename, NULL); filename = realpath (config->filename, NULL);
if (! filename) { if (! filename) {
fprintf (stderr, "Error canonicalizing %s: %s\n", config->filename, if (errno == ENOENT) {
strerror (errno)); filename = strdup (config->filename);
g_free (data); if (! filename) {
return 1; fprintf (stderr, "Out of memory.\n");
g_free (data);
return 1;
}
} else {
fprintf (stderr, "Error canonicalizing %s: %s\n", config->filename,
strerror (errno));
g_free (data);
return 1;
}
} }
if (! g_file_set_contents (filename, data, length, &error)) { if (! g_file_set_contents (filename, data, length, &error)) {

1
test/setup
View file

@ -4,7 +4,6 @@ test_description='"notmuch setup"'
. ./test-lib.sh . ./test-lib.sh
test_begin_subtest "Create a new config interactively" test_begin_subtest "Create a new config interactively"
test_subtest_known_broken
notmuch --config=new-notmuch-config > /dev/null <<EOF notmuch --config=new-notmuch-config > /dev/null <<EOF
Test Suite Test Suite
test.suite@example.com test.suite@example.com