emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xbps_symlink_target: fix bb977c7 (v3).

Browse Source
This commit is contained in:
Juan RP 2016-02-02 11:07:02 +01:00
parent 377ec33ecf
commit b81b9ab379
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/util.c
View File

@ -482,24 +482,24 @@ xbps_symlink_target(struct xbps_handle *xhp, const char *path, const char *tgt)
} }
if (strstr(lnk, "./") || lnk[0] != '/') { if (strstr(lnk, "./") || lnk[0] != '/') {
char *p, *p1, *dname, lnkrs[PATH_MAX]; char *p, *p1, *dname, buf[PATH_MAX];
/* relative */ /* relative */
p = strdup(path); p = strdup(path);
assert(p); assert(p);
dname = dirname(p); dname = dirname(p);
assert(dname); assert(dname);
snprintf(lnkrs, sizeof(lnkrs), "%s/%s", dname, lnk); snprintf(buf, sizeof(buf), "%s/%s", dname, lnk);
free(p); free(p);
p = xbps_sanitize_path(lnkrs); p = xbps_sanitize_path(buf);
assert(p); assert(p);
if ((strstr(p, "./")) && (p1 = realpath(p, NULL))) { if ((strstr(p, "./")) && (p1 = realpath(p, buf))) {
if (strcmp(xhp->rootdir, "/") == 0) { if (strcmp(xhp->rootdir, "/") == 0) {
res = strdup(p1); res = p1;
} else { } else {
res = strdup(p1 + strlen(xhp->rootdir)); res = strdup(p1 + strlen(xhp->rootdir));
free(p1);
} }
assert(res); assert(res);
free(p1);
free(p); free(p);
} }
if (res == NULL) { if (res == NULL) {