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

unpack: handle another case of relative symlink.

Browse Source
This commit is contained in:
Juan RP 2012-10-26 14:17:31 +02:00
parent a5707e5b8d
commit 7fdae2d6dc
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/package_unpack.c
View File

@ -196,7 +196,7 @@ unpack_archive(struct xbps_handle *xhp,
size_t i, entry_idx = 0; size_t i, entry_idx = 0;
const char *file, *entry_pname, *transact, *pkgname; const char *file, *entry_pname, *transact, *pkgname;
const char *version, *pkgver, *fname, *tgtlnk; const char *version, *pkgver, *fname, *tgtlnk;
char *buf, *buf2, *p, *p2, *pkgfilesd = NULL, *pkgpropsd = NULL; char *dname, *buf, *buf2, *p, *p2, *pkgfilesd = NULL, *pkgpropsd = NULL;
int ar_rv, rv, rv_stat, flags; int ar_rv, rv, rv_stat, flags;
bool preserve, update, conf_file, file_exists, skip_obsoletes; bool preserve, update, conf_file, file_exists, skip_obsoletes;
bool softreplace, skip_extract; bool softreplace, skip_extract;
@ -454,17 +454,31 @@ unpack_archive(struct xbps_handle *xhp,
if (file_exists) { if (file_exists) {
buf = realpath(entry_pname, NULL); buf = realpath(entry_pname, NULL);
assert(buf); assert(buf);
if (strcmp(xhp->rootdir, "/"))
p = strlen(xhp->rootdir) + buf; p = strlen(xhp->rootdir) + buf;
else
p = buf;
assert(p); assert(p);
tgtlnk = find_pkg_symlink_target(filesd, tgtlnk = find_pkg_symlink_target(filesd,
entry_pname); entry_pname);
assert(tgtlnk); assert(tgtlnk);
if (strncmp(tgtlnk, "./", 2) == 0) {
dname = dirname(__UNCONST(entry_pname));
p2 = xbps_xasprintf("%s/%s", dname, tgtlnk);
assert(p2);
} else {
p2 = xbps_xasprintf(".%s", tgtlnk); p2 = xbps_xasprintf(".%s", tgtlnk);
assert(p2); assert(p2);
}
printf("p %s tgtlink %s p2 %s\n", p, tgtlnk, p2);
buf2 = realpath(p2, NULL); buf2 = realpath(p2, NULL);
assert(buf2); assert(buf2);
free(p2); free(p2);
if (strcmp(xhp->rootdir, "/"))
p2 = strlen(xhp->rootdir) + buf2; p2 = strlen(xhp->rootdir) + buf2;
else
p2 = buf2;
if (strcmp(p, p2) == 0) { if (strcmp(p, p2) == 0) {
xbps_dbg_printf(xhp, "%s-%s: symlink " xbps_dbg_printf(xhp, "%s-%s: symlink "
"%s matched, skipping...\n", "%s matched, skipping...\n",