much improved functions for maknig directories, props to Logan

diff --git a/openbox/session.c b/openbox/session.c
index 8e8f2b7b34005cd967d1a535a81dfc5b625c2c6d..cedd3642515bbc96bfa5725ebe4f794003ac20a6 100644 (file)
--- a/openbox/session.c
+++ b/openbox/session.c
@@ -163,7 +163,9 @@ void session_startup(gint *argc, gchar ***argv)
 
     sm_sessions_path = g_build_filename(parse_xdg_data_home_path(),
                                         "openbox", "sessions", NULL);
-    parse_mkdir_path(sm_sessions_path, 0700);
+    if (!parse_mkdir_path(sm_sessions_path, 0700))
+        g_warning(_("unable to make directory '%s': %s"),
+                  sm_sessions_path, g_strerror(errno));
 
     if (save_file)
         session_load(save_file);

diff --git a/parser/parse.c b/parser/parse.c
index 69343a8e4c7c216ede2069b52ddbe0dc5ca1b3e5..f7ca9d708856922e7da0d894ead41a106574c03f 100644 (file)
--- a/parser/parse.c
+++ b/parser/parse.c
@@ -19,6 +19,7 @@
 #include "parse.h"
 #include <glib.h>
 #include <string.h>
+#include <errno.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
@@ -386,21 +387,45 @@ gchar *parse_expand_tilde(const gchar *f)
     return ret;
 }
 
-void parse_mkdir_path(const gchar *path, gint mode)
+gboolean parse_mkdir(const gchar *path, gint mode)
 {
-    gchar *c, *e;
+    gboolean ret = TRUE;
 
-    g_assert(path[0] == '/');
+    g_return_val_if_fail(path != NULL, FALSE);
+    g_return_val_if_fail(path[0] != '\0', FALSE);
 
-    c = g_strdup(path);
-    e = c;
-    while ((e = strchr(e + 1, '/'))) {
-        *e = '\0';
-        mkdir(c, mode);
-        *e = '/';
+    if (!g_file_test(path, G_FILE_TEST_IS_DIR))
+        if (mkdir(path, mode) == -1)
+            ret = FALSE;
+
+    return ret;
+}
+
+gboolean parse_mkdir_path(const gchar *path, gint mode)
+{
+    gboolean ret = TRUE;
+
+    g_return_val_if_fail(path != NULL, FALSE);
+    g_return_val_if_fail(path[0] == '/', FALSE);
+
+    if (!g_file_test(path, G_FILE_TEST_IS_DIR)) {
+        gchar *c, *e;
+
+        c = g_strdup(path);
+        e = c;
+        while ((e = strchr(e + 1, '/'))) {
+            *e = '\0';
+            if (!(ret = parse_mkdir(c, mode)))
+                goto parse_mkdir_path_end;
+            *e = '/';
+        }
+        ret = parse_mkdir(c, mode);
+
+    parse_mkdir_path_end:
+        g_free(c);
     }
-    mkdir(c, mode);
-    g_free(c);
+
+    return ret;
 }
 
 const gchar* parse_xdg_config_home_path()

diff --git a/parser/parse.h b/parser/parse.h
index 886b867de026b93e8a071e8c88104ce1ebb446fe..99780113d75a7e7b6ad4453f88d87b5ebad08d42 100644 (file)
--- a/parser/parse.h
+++ b/parser/parse.h
@@ -79,8 +79,10 @@ GSList* parse_xdg_data_dir_paths();
 /*! Expands the ~ character to the home directory throughout the given
   string */
 gchar *parse_expand_tilde(const gchar *f);
+/*! Makes a directory */
+gboolean parse_mkdir(const gchar *path, gint mode);
 /*! Makes a directory and all its parents */
-void parse_mkdir_path(const gchar *path, gint mode);
+gboolean parse_mkdir_path(const gchar *path, gint mode);
 
 G_END_DECLS