Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 463688 Details for
Bug 609306
=x11-wm/i3-4.13-r1 on musl - emake failed: resolve_tilde.c:28:26: error: use of undeclared identifier 'GLOB_TILDE'
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
i3 patch from Alpine Linux
i3-4.11-musl.patch (text/plain), 2.42 KB, created by
Johannes Rosenberger
on 2017-02-13 23:31:31 UTC
(
hide
)
Description:
i3 patch from Alpine Linux
Filename:
MIME Type:
Creator:
Johannes Rosenberger
Created:
2017-02-13 23:31:31 UTC
Size:
2.42 KB
patch
obsolete
>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); > }
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 609306
:
463682
|
463684
|
463686
| 463688