Handle saved_configpath in get_config_path, fix memleak in current_configpath handling, update atoms after reloading (Thanks fernandotcl)

include/config.h

@@ -22,7 +22,7 @@
 #include "i3.h"
 
 typedef struct Config Config;
-extern const char *current_configpath;
+extern char *current_configpath;
 extern Config config;
 extern SLIST_HEAD(modes_head, Mode) modes;
 

include/x.h

@@ -79,4 +79,10 @@ void x_raise_con(Con *con);
  */
 void x_set_name(Con *con, const char *name);
 
+/**
+ * Sets up i3 specific atoms (I3_SOCKET_PATH and I3_CONFIG_PATH)
+ *
+ */
+void x_set_i3_atoms();
+
 #endif

src/cmdparse.y

@@ -346,6 +346,7 @@ reload:
     {
         printf("reloading\n");
         load_configuration(conn, NULL, true);
+        x_set_i3_atoms();
         /* Send an IPC event just in case the ws names have changed */
         ipc_send_event("workspace", I3_IPC_EVENT_WORKSPACE, "{\"change\":\"reload\"}");
     }

src/config.c

@@ -19,7 +19,7 @@
 
 #include "all.h"
 
-const char *current_configpath = NULL;
+char *current_configpath = NULL;
 Config config;
 struct modes_head modes;
 
@@ -170,14 +170,26 @@ void switch_mode(xcb_connection_t *conn, const char *new_mode) {
 }
 
 /*
- * Get the path of the first configuration file found. Checks the home directory
+ * Get the path of the first configuration file found. If override_configpath
- * first, then the system directory first, always taking into account the XDG
+ * is specified, that path is returned and saved for further calls. Otherwise,
- * Base Directory Specification ($XDG_CONFIG_HOME, $XDG_CONFIG_DIRS)
+ * checks the home directory first, then the system directory first, always
+ * taking into account the XDG Base Directory Specification ($XDG_CONFIG_HOME,
+ * $XDG_CONFIG_DIRS)
  *
  */
-static char *get_config_path() {
+static char *get_config_path(const char *override_configpath) {
     char *xdg_config_home, *xdg_config_dirs, *config_path;
 
+    static const char *saved_configpath = NULL;
+
+    if (override_configpath != NULL) {
+        saved_configpath = override_configpath;
+        return sstrdup(saved_configpath);
+    }
+
+    if (saved_configpath != NULL)
+        return sstrdup(saved_configpath);
+
     /* 1: check the traditional path under the home directory */
     config_path = resolve_tilde("~/.i3/config");
     if (path_exists(config_path))
@@ -233,25 +245,11 @@ static char *get_config_path() {
  *
  */
 static void parse_configuration(const char *override_configpath) {
-    static const char *saved_configpath = NULL;
+    char *path = get_config_path(override_configpath);
-
-    if (override_configpath != NULL) {
-        saved_configpath = override_configpath;
-        current_configpath = override_configpath;
-        parse_file(override_configpath);
-        return;
-    }
-    else if (saved_configpath != NULL) {
-        current_configpath = saved_configpath;
-        parse_file(saved_configpath);
-        return;
-    }
-
-    char *path = get_config_path();
     DLOG("Parsing configfile %s\n", path);
+    FREE(current_configpath);
     current_configpath = path;
     parse_file(path);
-    free(path);
 }
 
 /*

src/main.c

@@ -351,11 +351,7 @@ int main(int argc, char *argv[]) {
     xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, A__NET_WM_NAME, A_UTF8_STRING, 8, strlen("i3"), "i3");
 
     /* Set up i3 specific atoms like I3_SOCKET_PATH and I3_CONFIG_PATH */
-    xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, A_I3_SOCKET_PATH, A_UTF8_STRING, 8,
+    x_set_i3_atoms();
-                        (config.ipc_socket_path != NULL ? strlen(config.ipc_socket_path) : 0),
-                        config.ipc_socket_path);
-    xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, A_I3_CONFIG_PATH, A_UTF8_STRING, 8,
-                        strlen(current_configpath), current_configpath);
 
     keysyms = xcb_key_symbols_alloc(conn);
 

src/x.c

@@ -703,3 +703,15 @@ void x_set_name(Con *con, const char *name) {
     FREE(state->name);
     state->name = sstrdup(name);
 }
+
+/*
+ * Sets up i3 specific atoms (I3_SOCKET_PATH and I3_CONFIG_PATH)
+ *
+ */
+void x_set_i3_atoms() {
+    xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, A_I3_SOCKET_PATH, A_UTF8_STRING, 8,
+                        (config.ipc_socket_path != NULL ? strlen(config.ipc_socket_path) : 0),
+                        config.ipc_socket_path);
+    xcb_change_property(conn, XCB_PROP_MODE_REPLACE, root, A_I3_CONFIG_PATH, A_UTF8_STRING, 8,
+                        strlen(current_configpath), current_configpath);
+}