notmuch-config: ENOENT vs generic handling when file open fails.

When opening configuration file fails, ENOENT (file not found) is
handled specially -- in setup missing file is ok (often expected),
and otherwise user can be informed to run notmuch setup.

In any other case the the reason is unknown, so there is no other
option but to print generic error message to stderr.
This commit is contained in:
Tomi Ollila 2017-02-26 21:12:39 +02:00 committed by David Bremner
parent 80aeaf7f59
commit 5c0f1bd367

View file

@ -215,24 +215,23 @@ get_config_from_file (notmuch_config_t *config, notmuch_bool_t create_new)
FILE *fp = fopen(config->filename, "r");
if (fp == NULL) {
if (errno == ENOENT) {
/* If create_new is true, then the caller is prepared for a
* default configuration file in the case of FILE NOT FOUND.
*/
if (create_new) {
config->is_new = TRUE;
ret = TRUE;
goto out;
} else if (errno == ENOENT) {
} else {
fprintf (stderr, "Configuration file %s not found.\n"
"Try running 'notmuch setup' to create a configuration.\n",
config->filename);
goto out;
} else {
fprintf (stderr, "Error opening config file '%s': %s\n"
"Try running 'notmuch setup' to create a configuration.\n",
config->filename, strerror(errno));
goto out;
}
} else {
fprintf (stderr, "Error opening config file '%s': %s\n",
config->filename, strerror(errno));
}
goto out;
}
config_str = talloc_zero_array (config, char, config_bufsize);