Use wordexp to resolve variables like $HOME in path like settings

dunst-project · Oct 23, 2023 · ece52ce · ece52ce
1 parent 19865c0
commit ece52ce
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/src/utils.c b/src/utils.c
@@ -13,6 +13,7 @@
 #include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>
+#include <wordexp.h>
 
 #include "log.h"
 #include "settings_data.h"
@@ -179,16 +180,19 @@ int string_array_length(char **s)
 /* see utils.h */
 char *string_to_path(char *string)
 {
+        ASSERT_OR_RET(string, string);
 
-        if (string && STRN_EQ(string, "~/", 2)) {
-                char *home = g_strconcat(user_get_home(), "/", NULL);
-
-                string = string_replace_at(string, 0, 2, home);
-
-                g_free(home);
+        wordexp_t we;
+        if (wordexp(string, &we, WRDE_NOCMD | WRDE_UNDEF) != 0) {
+                LOG_W("Expansion of \"%s\" failed.", string);
+                return string;
         }
+        g_free(string);
+
+        char *res = g_strjoinv(" ", we.we_wordv);
+        wordfree(&we);
 
-        return string;
+        return res;
 }
 
 /* see utils.h */

diff --git a/test/option_parser.c b/test/option_parser.c
@@ -521,16 +521,23 @@ TEST test_string_to_path(void)
                 "/path/p argument",
                 "p with multiple arguments",
                 "~/p/p",
+                "$HOME/p/p",
+                "$TEST_ENV/p/p",
         };
 
+        setenv("TEST_ENV", "foobar", 1);
+
         char *expanded_home = g_strconcat(user_get_home(), "/", "p/p", NULL);
+        char *expanded_env = g_strconcat("foobar", "/p/p", NULL);
         const char* results[] = {
                 "/bin/something",
                 "something",
                 "/path/path/path/",
                 "/path/p argument",
                 "p with multiple arguments",
                 expanded_home,
+                expanded_home,
+                expanded_env,
         };
 
         const char* results2[][5] = {
@@ -540,6 +547,8 @@ TEST test_string_to_path(void)
                 {"/path/p", "argument", NULL},
                 {"p", "with", "multiple", "arguments", NULL},
                 {expanded_home},
+                {expanded_home},
+                {expanded_env},
         };
 
         ARRAY_SAME_LENGTH(inputs, results);
@@ -557,6 +566,7 @@ TEST test_string_to_path(void)
         }
 
         g_free(val);
+        g_free(expanded_env);
         g_free(expanded_home);
         g_strfreev(val2);
         PASS();