config = _xdg_dir (notmuch, "XDG_CONFIG_HOME", ".config", profile);
if (! config)
- return NOTMUCH_STATUS_PATH_ERROR;
+ return NOTMUCH_STATUS_PATH_ERROR;
hook_dir = talloc_asprintf (notmuch, "%s/hooks", config);
if (dir) {
path = talloc_asprintf (local, "%s/config", dir);
- if (access (path, R_OK) !=0)
+ if (access (path, R_OK) != 0)
path = NULL;
}
}
status = NOTMUCH_STATUS_NO_CONFIG;
}
-DONE:
+ DONE:
talloc_free (local);
return status;
}
static notmuch_status_t
-_choose_database_path (const char *config_path,
+_choose_database_path (void *ctx,
+ const char *config_path,
const char *profile,
GKeyFile **key_file,
const char **database_path,
{
notmuch_status_t status;
- status =_load_key_file (config_path, profile, key_file);
+ status = _load_key_file (config_path, profile, key_file);
if (status) {
*message = strdup ("Error: cannot load config file.\n");
return status;
}
- if (! *database_path && *key_file)
- *database_path = g_key_file_get_value (*key_file, "database", "path", NULL);
+ if (! *database_path && *key_file) {
+ char *path = g_key_file_get_value (*key_file, "database", "path", NULL);
+ if (path) {
+ *database_path = talloc_strdup (ctx, path);
+ g_free (path);
+ }
+ }
if (*database_path == NULL) {
*message = strdup ("Error: Cannot open a database for a NULL path.\n");
GKeyFile *key_file = NULL;
static int initialized = 0;
- if ((status = _choose_database_path (config_path, profile, &key_file, &database_path, &message)))
+ if ((status = _choose_database_path (local, config_path, profile, &key_file, &database_path,
+ &message)))
goto DONE;
if (! (notmuch_path = talloc_asprintf (local, "%s/%s", database_path, ".notmuch"))) {
notmuch->term_gen = new Xapian::TermGenerator;
notmuch->term_gen->set_stemmer (Xapian::Stem ("english"));
notmuch->value_range_processor = new Xapian::NumberRangeProcessor (NOTMUCH_VALUE_TIMESTAMP);
- notmuch->date_range_processor = new ParseTimeRangeProcessor (NOTMUCH_VALUE_TIMESTAMP, "date:");
- notmuch->last_mod_range_processor = new Xapian::NumberRangeProcessor (NOTMUCH_VALUE_LAST_MOD, "lastmod:");
+ notmuch->date_range_processor = new ParseTimeRangeProcessor (NOTMUCH_VALUE_TIMESTAMP,
+ "date:");
+ notmuch->last_mod_range_processor = new Xapian::NumberRangeProcessor (NOTMUCH_VALUE_LAST_MOD,
+ "lastmod:");
notmuch->query_parser->set_default_op (Xapian::Query::OP_AND);
notmuch->query_parser->set_database (*notmuch->xapian_db);
notmuch->query_parser->set_stemmer (Xapian::Stem ("english"));
DONE:
talloc_free (local);
+ if (key_file)
+ g_key_file_free (key_file);
+
if (message) {
if (status_string)
*status_string = message;
GKeyFile *key_file = NULL;
struct stat st;
int err;
+ void *local = talloc_new (NULL);
- if ((status = _choose_database_path (config_path, profile, &key_file, &database_path, &message)))
+ if ((status = _choose_database_path (local, config_path, profile, &key_file, &database_path,
+ &message)))
goto DONE;
err = stat (database_path, &st);
goto DONE;
}
- notmuch_path = talloc_asprintf (NULL, "%s/%s", database_path, ".notmuch");
+ notmuch_path = talloc_asprintf (local, "%s/%s", database_path, ".notmuch");
err = mkdir (notmuch_path, 0755);
if (err) {
}
DONE:
- if (notmuch_path)
- talloc_free (notmuch_path);
+ talloc_free (local);
+
+ if (key_file)
+ g_key_file_free (key_file);
if (message) {
if (status_string)