move config files to ~/.config/

4 files changed, 13 insertions, 7 deletions

diff --git a/fbi.c b/fbi.c
index 9ba65a0..6d5d49f 100644
--- a/fbi.c
+++ b/fbi.c
@@ -1235,7 +1235,7 @@ int main(int argc, char *argv[])
 #endif
 
     setlocale(LC_ALL,"");
-    fbi_read_config(".fbirc");
+    fbi_read_config(".config/fbi.conf", ".fbirc");
     cfg_parse_cmdline(&argc,argv,fbi_cmd);
     cfg_parse_cmdline(&argc,argv,fbi_cfg);
 
diff --git a/fbiconfig.c b/fbiconfig.c
index a986c3b..a8244a1 100644
--- a/fbiconfig.c
+++ b/fbiconfig.c
@@ -262,7 +262,7 @@ struct cfg_cmdline fbpdf_cfg[] = {
 
 static char *fbi_config = NULL;
 
-static void init_config(const char *name)
+static void init_config(const char *name, const char *old_name)
 {
     char *home;
 
@@ -270,13 +270,19 @@ static void init_config(const char *name)
     if (NULL == home)
 	return;
 
+    fbi_config = malloc(strlen(home) + strlen(old_name) + 2);
+    sprintf(fbi_config, "%s/%s", home, old_name);
+    if (access(fbi_config, F_OK) == 0)
+        return;
+
+    free(fbi_config);
     fbi_config = malloc(strlen(home) + strlen(name) + 2);
-    sprintf(fbi_config,"%s/%s", home, name);
+    sprintf(fbi_config, "%s/%s", home, name);
 }
 
-void fbi_read_config(const char *name)
+void fbi_read_config(const char *name, const char *old_name)
 {
-    init_config(name);
+    init_config(name, old_name);
     if (fbi_config)
 	cfg_parse_file("config", fbi_config);
 }
diff --git a/fbiconfig.h b/fbiconfig.h
index 67003b2..3787e24 100644
--- a/fbiconfig.h
+++ b/fbiconfig.h
@@ -75,6 +75,6 @@ extern struct cfg_cmdline fbi_cmd[];
 extern struct cfg_cmdline fbi_cfg[];
 extern struct cfg_cmdline fbpdf_cmd[];
 extern struct cfg_cmdline fbpdf_cfg[];
-void fbi_read_config(const char *name);
+void fbi_read_config(const char *name, const char *old_name);
 void fbi_write_config(void);
 
diff --git a/fbpdf.c b/fbpdf.c
index 68af11b..ed73d3a 100644
--- a/fbpdf.c
+++ b/fbpdf.c
@@ -253,7 +253,7 @@ int main(int argc, char *argv[])
 
     setlocale(LC_ALL,"");
 
-    fbi_read_config(".fbpdf.rc");
+    fbi_read_config(".config/fbpdf.conf", ".fbpdf.rc");
     cfg_parse_cmdline(&argc,argv,fbpdf_cmd);
     cfg_parse_cmdline(&argc,argv,fbpdf_cfg);