X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=i3-config-wizard%2Fmain.c;h=673259b9e96b56ac49809320583b1674e58eb15e;hb=4daed31c3e0bfb314f83050fe77a310eec11eb5a;hp=35770dc9fa807c38feda80b71c3c97425e5a12f5;hpb=d5f329694d8cea70a7005729f4eea08ff9ad33a7;p=i3%2Fi3 diff --git a/i3-config-wizard/main.c b/i3-config-wizard/main.c index 35770dc9..673259b9 100644 --- a/i3-config-wizard/main.c +++ b/i3-config-wizard/main.c @@ -461,38 +461,6 @@ void errorlog(char *fmt, ...) { void debuglog(char *fmt, ...) { } -/* - * This function resolves ~ in pathnames. - * It may resolve wildcards in the first part of the path, but if no match - * or multiple matches are found, it just returns a copy of path as given. - * - */ -static char *resolve_tilde(const char *path) { - static glob_t globbuf; - char *head, *tail, *result; - - tail = strchr(path, '/'); - head = strndup(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 = strdup(path); - else if (res != 0) { - err(1, "glob() failed"); - } else { - head = globbuf.gl_pathv[0]; - result = calloc(1, strlen(head) + (tail ? strlen(tail) : 0) + 1); - strncpy(result, head, strlen(head)); - if (tail) - strncat(result, tail, strlen(tail)); - } - globfree(&globbuf); - - return result; -} - /* * Handles expose events, that is, draws the window contents. *