Using the new detect_file in karadata

src/config.cpp

@@ -348,11 +348,11 @@ extern "C"
         if (access(*conf, R_OK))
             goto found;
 
-found:
-        return 0;
 error:
         if (is_malloc)
             free(*conf);
         return 1;
+found:
+        return 0;
     }
 }

src/main/metadata.c

@@ -324,30 +324,21 @@ main(int argc, char *argv[])
     sqlite3 *db;
     bool ret = true;
     lkt_config_t conf;
-    char conf_file[PATH_MAX], *homedir, *xdg_config_home, kara_dir[PATH_MAX], *db_path;
-    struct passwd *pw = getpwuid(getuid());
+    char conf_file[PATH_MAX], kara_dir[PATH_MAX], *db_path;
 
     if (argc < 2)
         goto print_help;
 
     /* Read the config file. */
 
-    memset(conf_file, 0, PATH_MAX * sizeof(char));
-
-    if (NULL == (homedir = getenv("HOME")))
-        homedir = pw->pw_dir;
-
-    if (NULL == (xdg_config_home = getenv("XDG_CONFIG_HOME"))) {
-        strcpy(conf_file, homedir);
-        strncat(conf_file, "/.config/lektor/config", PATH_MAX - 1);
-    } else {
-        strcpy(conf_file, xdg_config_home);
-        strncat(conf_file, "/lektor/config", PATH_MAX - 1);
+    if (config_detect_file((char **) &conf_file, PATH_MAX)) {
+        fprintf(stderr, " ! error while searching for a config file\n");
+        return 1;
     }
 
     if (config_new(conf_file, &conf)) {
-        fprintf(stderr, " ! using default configuration file setted by the build because could not read file %s\n",
-                conf_file);
+        fprintf(stderr, " ! error while loading file %s\n", conf_file);
+        return 1;
     }
 
     /* Arguments handle. */