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

Accept relative rootdir via xbps_handle::rootdir (found by pancake).

Browse Source
This commit is contained in:
Juan RP 2012-11-19 12:12:38 +01:00
parent 37b7cccc83
commit b894a5eca3
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/initend.c
View File

@ -167,7 +167,23 @@ xbps_init(struct xbps_handle *xhp)
xhp->rootdir = "/"; xhp->rootdir = "/";
else else
xhp->rootdir = cfg_getstr(xhp->cfg, "rootdir"); xhp->rootdir = cfg_getstr(xhp->cfg, "rootdir");
} else {
if (xhp->rootdir[0] != '/') {
/* relative path */
char *buf, path[PATH_MAX-1];
size_t len;
if (getcwd(path, sizeof(path)) == NULL)
return ENOTSUP;
len = strlen(xhp->rootdir) + strlen(path) + 2;
buf = malloc(len);
assert(buf);
snprintf(buf, len, "%s/%s", path, xhp->rootdir);
xhp->rootdir = buf;
} }
}
if (xhp->cachedir == NULL) { if (xhp->cachedir == NULL) {
if (xhp->cfg == NULL) if (xhp->cfg == NULL)
xhp->cachedir = XBPS_CACHE_PATH; xhp->cachedir = XBPS_CACHE_PATH;