GKeyFile *file)
{
notmuch_status_t status = NOTMUCH_STATUS_SUCCESS;
- gchar **groups, **keys, *val;
+ gchar **groups = NULL, **keys, *val;
if (notmuch->config == NULL)
notmuch->config = _notmuch_string_map_create (notmuch);
goto DONE;
}
- for (groups = g_key_file_get_groups (file, NULL); *groups; groups++) {
- for (keys = g_key_file_get_keys (file, *groups, NULL, NULL); *keys; keys++) {
- char *absolute_key = talloc_asprintf (notmuch, "%s.%s", *groups, *keys);
- val = g_key_file_get_value (file, *groups, *keys, NULL);
+ groups = g_key_file_get_groups (file, NULL);
+ for (gchar **grp = groups; *grp; grp++) {
+ keys = g_key_file_get_keys (file, *grp, NULL, NULL);
+ for (gchar **keys_p = keys; *keys_p; keys_p++) {
+ char *absolute_key = talloc_asprintf (notmuch, "%s.%s", *grp, *keys_p);
+ val = g_key_file_get_value (file, *grp, *keys_p, NULL);
if (! val) {
status = NOTMUCH_STATUS_FILE_ERROR;
goto DONE;
}
_notmuch_string_map_set (notmuch->config, absolute_key, val);
+ g_free (val);
talloc_free (absolute_key);
if (status)
goto DONE;
}
+ g_strfreev (keys);
}
DONE:
+ if (groups)
+ g_strfreev (groups);
+
return status;
}
switch (key) {
case NOTMUCH_CONFIG_DATABASE_PATH:
return "database.path";
+ case NOTMUCH_CONFIG_MAIL_ROOT:
+ return "database.mail_root";
case NOTMUCH_CONFIG_HOOK_DIR:
return "database.hook_dir";
case NOTMUCH_CONFIG_EXCLUDE_TAGS:
}
static const char *
-_notmuch_config_default (void *ctx, notmuch_config_key_t key)
+_notmuch_config_default (notmuch_database_t *notmuch, notmuch_config_key_t key)
{
char *path;
case NOTMUCH_CONFIG_DATABASE_PATH:
path = getenv ("MAILDIR");
if (path)
- path = talloc_strdup (ctx, path);
+ path = talloc_strdup (notmuch, path);
else
- path = talloc_asprintf (ctx, "%s/mail",
+ path = talloc_asprintf (notmuch, "%s/mail",
getenv ("HOME"));
return path;
+ case NOTMUCH_CONFIG_MAIL_ROOT:
+ /* by default, mail root is the same as database path */
+ return notmuch_database_get_path (notmuch);
case NOTMUCH_CONFIG_EXCLUDE_TAGS:
return "";
case NOTMUCH_CONFIG_NEW_TAGS:
void
_notmuch_config_cache (notmuch_database_t *notmuch, notmuch_config_key_t key, const char *val)
{
+ if (notmuch->config == NULL)
+ notmuch->config = _notmuch_string_map_create (notmuch);
+
_notmuch_string_map_set (notmuch->config, _notmuch_config_key_to_string (key), val);
}