Ticket #285: mc-4.6.2-cfg_dir.patch

edit/editwidget.c

@@ -170 +170 @@
 int
 edit_file (const char *_file, int line)
 {
-    static int made_directory = 0;
     Dlg_head *edit_dlg;
     WButtonBar *edit_bar;
 
-    if (!made_directory) {
+    {
         char *dir = mhl_str_dir_plus_file (home_dir, EDIT_DIR);
-        made_directory = (mkdir (dir, 0700) != -1 || errno == EEXIST);
+        if (g_mkdir_with_parents (dir, 0700)) {
+            return 0;
+        }
         g_free (dir);
     }
 

src/profile.c

@@ -29 +29 @@
 
 #include <sys/types.h>
 
+#include "fileloc.h"
 #include "global.h"
 #include "profile.h"
 
@@ -403 +404 @@
     if (!p)
         return;
     dump_profile (p->link);
+    {
+        char *dir = concat_dir_and_file (home_dir, MC_USERCONF_DIR);
+        if (g_mkdir_with_parents (dir, 0700)) {
+            return;
+        }
+        g_free (dir);
+    }
     /* .ado: p->FileName can be empty, it's better to jump over */
     if (p->FileName[0] != (char) 0)
       if ((profile = fopen (p->FileName, "w")) != NULL){

src/setup.h

@@ -1 +1 @@
 #ifndef MC_SETUP_H
 #define MC_SETUP_H
 
+#include "fileloc.h"
 #include "panel.h"
 
 char *setup_init (void);
@@ -26 +27 @@
 extern int startup_right_mode;
 extern int verbose;
 
-#define PROFILE_NAME     ".mc/ini"
-#define HOTLIST_FILENAME ".mc/hotlist"
+#define PROFILE_NAME     MC_USERCONF_DIR PATH_SEP_STR MC_CONFIG_FILE
+#define HOTLIST_FILENAME MC_USERCONF_DIR PATH_SEP_STR MC_HOTLIST_FILE
 
 #endif