aboutsummaryrefslogtreecommitdiffstats
path: root/testing/i3wm/musl.patch
blob: 82ad6195b8e5824e684a685ef2307da6b1aea18e (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
diff -urp i3-4.11/i3bar/src/main.c i3-4.11.new/i3bar/src/main.c
--- i3-4.11/i3bar/src/main.c	2015-09-30 07:55:10.000000000 +0100
+++ i3-4.11.new/i3bar/src/main.c	2016-02-08 20:03:41.777392482 +0000
@@ -45,14 +45,20 @@ void debuglog(char *fmt, ...) {
  *
  */
 char *expand_path(char *path) {
-    static glob_t globbuf;
-    if (glob(path, GLOB_NOCHECK | GLOB_TILDE, NULL, &globbuf) < 0) {
-        ELOG("glob() failed\n");
-        exit(EXIT_FAILURE);
+    char *home, *expanded;
+
+    if (strncmp(path, "~/", 2) == 0) {
+        home = getenv("HOME");
+        if (home != NULL) {
+            /* new length: sum - 1 (omit '~') + 1 (for '\0') */
+            expanded = scalloc(strlen(home)+strlen(path), 1);
+            strcpy(expanded, home);
+            strcat(expanded, path+1);
+            return expanded;
+        }
     }
-    char *result = sstrdup(globbuf.gl_pathc > 0 ? globbuf.gl_pathv[0] : path);
-    globfree(&globbuf);
-    return result;
+
+    return sstrdup(path);
 }
 
 void print_usage(char *elf_name) {
diff -urp i3-4.11/libi3/resolve_tilde.c i3-4.11.new/libi3/resolve_tilde.c
--- i3-4.11/libi3/resolve_tilde.c	2015-09-30 07:55:10.000000000 +0100
+++ i3-4.11.new/libi3/resolve_tilde.c	2016-02-08 20:03:47.849230953 +0000
@@ -19,27 +19,18 @@
  *
  */
 char *resolve_tilde(const char *path) {
-    static glob_t globbuf;
-    char *head, *tail, *result;
+    char *home, *expanded;
 
-    tail = strchr(path, '/');
-    head = sstrndup(path, tail ? (size_t)(tail - path) : strlen(path));
-
-    int res = glob(head, GLOB_TILDE, NULL, &globbuf);
-    free(head);
-    /* no match, or many wildcard matches are bad */
-    if (res == GLOB_NOMATCH || globbuf.gl_pathc != 1)
-        result = sstrdup(path);
-    else if (res != 0) {
-        err(EXIT_FAILURE, "glob() failed");
-    } else {
-        head = globbuf.gl_pathv[0];
-        result = scalloc(strlen(head) + (tail ? strlen(tail) : 0) + 1, 1);
-        strncpy(result, head, strlen(head));
-        if (tail)
-            strncat(result, tail, strlen(tail));
+    if (strncmp(path, "~/", 2) == 0) {
+        home = getenv("HOME");
+        if (home != NULL) {
+            /* new length: sum - 1 (omit '~') + 1 (for '\0') */
+            expanded = scalloc(strlen(home)+strlen(path), 1);
+            strcpy(expanded, home);
+            strcat(expanded, path+1);
+            return expanded;
+        }
     }
-    globfree(&globbuf);
 
-    return result;
+    return sstrdup(path);
 }