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

alternatives: handle dirname() returning ".".

Browse Source
This commit is contained in:
Juan RP 2015-11-15 09:17:05 +01:00
parent d9f56c9cdf
commit 9ef83cfa69
1 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/package_alternatives.c
View File

@ -164,11 +164,12 @@ create_symlinks(struct xbps_handle *xhp, xbps_array_t a, const char *grname)
tgt_dup = strdup(tgt0); tgt_dup = strdup(tgt0);
assert(tgt_dup); assert(tgt_dup);
tgt_dir = dirname(tgt_dup); tgt_dir = dirname(tgt_dup);
if (strcmp(tgt_dir, ".")) {
tgt = xbps_xasprintf("%s%s", xhp->rootdir, tgt_dir); tgt = xbps_xasprintf("%s%s", xhp->rootdir, tgt_dir);
if (xbps_mkpath(tgt, 0755) != 0) { if (xbps_mkpath(tgt, 0755) != 0) {
if (errno != EEXIST) { if (errno != EEXIST) {
rv = errno; rv = errno;
xbps_dbg_printf(xhp, "failed to create symlink" xbps_dbg_printf(xhp, "failed to create "
"target dir '%s' for group '%s': %s\n", "target dir '%s' for group '%s': %s\n",
tgt, grname, strerror(errno)); tgt, grname, strerror(errno));
free(tgt_dup); free(tgt_dup);
@ -178,10 +179,12 @@ create_symlinks(struct xbps_handle *xhp, xbps_array_t a, const char *grname)
} }
} }
free(tgt); free(tgt);
}
/* always create link dir, for dangling symlinks */ /* always create link dir, for dangling symlinks */
lnk_dup = strdup(l); lnk_dup = strdup(l);
assert(lnk_dup); assert(lnk_dup);
lnk_dir = dirname(lnk_dup); lnk_dir = dirname(lnk_dup);
if (strcmp(lnk_dir, ".")) {
lnk = xbps_xasprintf("%s%s", xhp->rootdir, lnk_dir); lnk = xbps_xasprintf("%s%s", xhp->rootdir, lnk_dir);
if (xbps_mkpath(lnk, 0755) != 0) { if (xbps_mkpath(lnk, 0755) != 0) {
if (errno != EEXIST) { if (errno != EEXIST) {
@ -198,6 +201,7 @@ create_symlinks(struct xbps_handle *xhp, xbps_array_t a, const char *grname)
} }
} }
free(lnk); free(lnk);
}
free(lnk_dup); free(lnk_dup);
if (l[0] != '/') { if (l[0] != '/') {