lib/package_alternatives.c: use xbps_alternative_link

Author: Duncaen

lib/package_alternatives.c

@@ -77,110 +77,34 @@ xbps_alternative_link(const char *alternative,
 	return 0;
 }
 
-static char *
-left(const char *str)
-{
-	char *p;
-	size_t len;
-
-	p = strdup(str);
-	len = strlen(p) - strlen(strchr(p, ':'));
-	p[len] = '\0';
-
-	return p;
-}
-
-static const char *
-right(const char *str)
-{
-	return strchr(str, ':') + 1;
-}
-
-static const char *
-normpath(char *path)
-{
-	char *seg, *p;
-
-	for (p = path, seg = NULL; *p; p++) {
-		if (strncmp(p, "/../", 4) == 0 || strncmp(p, "/..", 4) == 0) {
-			memmove(seg ? seg : p, p+3, strlen(p+3) + 1);
-			return normpath(path);
-		} else if (strncmp(p, "/./", 3) == 0 || strncmp(p, "/.", 3) == 0) {
-			memmove(p, p+2, strlen(p+2) + 1);
-		} else if (strncmp(p, "//", 2) == 0 || strncmp(p, "/", 2) == 0) {
-			memmove(p, p+1, strlen(p+1) + 1);
-		}
-		if (*p == '/')
-			seg = p;
-	}
-	return path;
-}
-
-static char *
-relpath(char *from, char *to)
-{
-	int up;
-	char *p = to, *rel;
-
-	assert(from[0] == '/');
-	assert(to[0] == '/');
-	normpath(from);
-	normpath(to);
-
-	for (; *from == *to && *to; from++, to++) {
-		if (*to == '/')
-			p = to;
-	}
-
-	for (up = -1, from--; from && *from; from = strchr(from + 1, '/'), up++);
-
-	rel = calloc(3 * up + strlen(p), 1);
-	if (!rel)
-		return NULL;
-
-	while (up--)
-		strcat(rel, "../");
-	if (*p)
-		strcat(rel, p+1);
-	return rel;
-}
-
 static int
 remove_symlinks(struct xbps_handle *xhp, xbps_array_t a, const char *grname)
 {
-	unsigned int i, cnt;
+	char path[PATH_MAX];
 	struct stat st;
 
-	cnt = xbps_array_count(a);
-	for (i = 0; i < cnt; i++) {
-		xbps_string_t str;
-		char *l, *lnk;
-
-		str = xbps_array_get(a, i);
-		l = left(xbps_string_cstring_nocopy(str));
-		assert(l);
-		if (l[0] != '/') {
-			const char *tgt;
-			char *tgt_dup, *tgt_dir;
-			tgt = right(xbps_string_cstring_nocopy(str));
-			tgt_dup = strdup(tgt);
-			assert(tgt_dup);
-			tgt_dir = dirname(tgt_dup);
-			lnk = xbps_xasprintf("%s%s/%s", xhp->rootdir, tgt_dir, l);
-			free(tgt_dup);
-		} else {
-			lnk = xbps_xasprintf("%s%s", xhp->rootdir, l);
+	for (unsigned int i = 0; i < xbps_array_count(a); i++) {
+		const char *alternative;
+		int r;
+
+		xbps_array_get_cstring_nocopy(a, i, &alternative);
+
+		r = xbps_alternative_link(alternative, path, sizeof(path), NULL, 0);
+		if (r < 0) {
+			/* XXX: print error, but don't abort transaction */
+			continue;
 		}
-		if (lstat(lnk, &st) == -1 || !S_ISLNK(st.st_mode)) {
-			free(lnk);
-			free(l);
+		if (xbps_path_prepend(path, sizeof(path), xhp->rootdir) == -1) {
+			/* XXX: print error, but don't abort transaction */
 			continue;
 		}
+
+		if (lstat(path, &st) == -1 || !S_ISLNK(st.st_mode))
+			continue;
+
 		xbps_set_cb_state(xhp, XBPS_STATE_ALTGROUP_LINK_REMOVED, 0, NULL,
-		    "Removing '%s' alternatives group symlink: %s", grname, l);
-		unlink(lnk);
-		free(lnk);
-		free(l);
+		    "Removing '%s' alternatives group symlink: %s", grname, path);
+		unlink(path);
 	}
 
 	return 0;
@@ -189,84 +113,80 @@ remove_symlinks(struct xbps_handle *xhp, xbps_array_t a, const char *grname)
 static int
 create_symlinks(struct xbps_handle *xhp, xbps_array_t a, const char *grname)
 {
-	int rv;
-	unsigned int i, n;
-	char *alternative, *tok1, *tok2, *linkpath, *target, *dir, *p;
-
-	n = xbps_array_count(a);
+	char path[PATH_MAX];
+	char target[PATH_MAX];
+	char dir[PATH_MAX];
+	int rv = 0;
 
-	for (i = 0; i < n; i++) {
-		alternative = xbps_string_cstring(xbps_array_get(a, i));
+	for (unsigned int i = 0; i < xbps_array_count(a); i++) {
+		const char *alt;
+		char *p;
+		int r;
+		xbps_array_get_cstring_nocopy(a, i, &alt);
 
-		if (!(tok1 = strtok(alternative, ":")) ||
-		    !(tok2 = strtok(NULL, ":"))) {
-			free(alternative);
-			return -1;
+		r = xbps_alternative_link(alt, path, sizeof(path), target, sizeof(target));
+		if (r < 0) {
+			/* XXX: print error, but don't abort transaction */
+			continue;
+		}
+		if (xbps_path_prepend(path, sizeof(path), xhp->rootdir) == -1) {
+			/* XXX: print error, but don't abort transaction */
+			continue;
 		}
 
-		target = strdup(tok2);
-		dir = dirname(tok2);
-
-		/* add target dir to relative links */
-		if (tok1[0] != '/')
-			linkpath = xbps_xasprintf("%s/%s/%s", xhp->rootdir, dir, tok1);
-		else
-			linkpath = xbps_xasprintf("%s/%s", xhp->rootdir, tok1);
-
+		p = strrchr(path, '/');
+		if (!p) {
+			/* XXX: print error, but don't abort transaction */
+			continue;
+		}
+		strncpy(dir, path, p-path);
+		dir[p-path] = '\0';
 		/* create target directory, necessary for dangling symlinks */
-		dir = xbps_xasprintf("%s/%s", xhp->rootdir, dir);
 		if (strcmp(dir, ".") && xbps_mkpath(dir, 0755) && errno != EEXIST) {
 			rv = errno;
 			xbps_dbg_printf(xhp,
 			    "failed to create target dir '%s' for group '%s': %s\n",
 			    dir, grname, strerror(errno));
-			free(dir);
-			goto err;
+			continue;
 		}
-		free(dir);
-
+		if (xbps_path_append(dir, sizeof(dir), target) == -1) {
+			rv = errno;
+			xbps_dbg_printf(xhp,
+			    "failed to create target symlink\n");
+			continue;
+		}
+		p= strrchr(dir, '/');
+		if (!p) {
+			rv = EINVAL;
+			continue;
+		}
+		*p = '\0';
 		/* create link directory, necessary for dangling symlinks */
-		p = strdup(linkpath);
-		dir = dirname(p);
 		if (strcmp(dir, ".") && xbps_mkpath(dir, 0755) && errno != EEXIST) {
 			rv = errno;
 			xbps_dbg_printf(xhp,
 			    "failed to create symlink dir '%s' for group '%s': %s\n",
 			    dir, grname, strerror(errno));
-			free(p);
-			goto err;
+			continue;
 		}
-		free(p);
 
+		/* skip the rootdir in the status callback */
+		p = path;
+		if (strcmp(xhp->rootdir, "/") != 0)
+			p += strlen(xhp->rootdir);
 		xbps_set_cb_state(xhp, XBPS_STATE_ALTGROUP_LINK_ADDED, 0, NULL,
 		    "Creating '%s' alternatives group symlink: %s -> %s",
-		    grname, tok1, target);
+		    grname, p, target);
 
-		if (target[0] == '/') {
-			p = relpath(linkpath + strlen(xhp->rootdir), target);
-			free(target);
-			target = p;
-		}
-
-		unlink(linkpath);
-		if ((rv = symlink(target, linkpath)) != 0) {
-			xbps_dbg_printf(xhp,
-			    "failed to create alt symlink '%s' for group '%s': %s\n",
-			    linkpath, grname,  strerror(errno));
-			goto err;
+		(void) unlink(path);
+		if (symlink(target, path) != 0) {
+			rv = errno;
+			xbps_error_printf(
+			    "Failed to create alternative symlink '%s' for group '%s': %s\n",
+			    path, grname, strerror(errno));
 		}
-
-		free(alternative);
-		free(target);
-		free(linkpath);
 	}
 
-	return 0;
-
-err:
-	free(alternative);
-	free(target);
-	free(linkpath);
 	return rv;
 }
 
@@ -551,7 +471,9 @@ remove_obsoletes(struct xbps_handle *xhp, const char *pkgname, const char *pkgve
 			if (array2) {
 				xbps_array_get_cstring_nocopy(array2, 0, &first);
 				if (strcmp(pkgname, first) == 0) {
+#if 0
 					remove_symlinks(xhp, array_repo, keyname);
+#endif
 				}
 			}
 		}
@@ -577,9 +499,7 @@ xbps_alternatives_register(struct xbps_handle *xhp, xbps_dictionary_t pkg_repod)
 	int rv = 0;
 
 	assert(xhp);
-
-	if (xhp->pkgdb == NULL)
-		return EINVAL;
+	assert(xhp->pkgdb);
 
 	alternatives = xbps_dictionary_get(xhp->pkgdb, "_XBPS_ALTERNATIVES_");
 	if (alternatives == NULL) {
@@ -624,8 +544,8 @@ xbps_alternatives_register(struct xbps_handle *xhp, xbps_dictionary_t pkg_repod)
 				}
 				/* already registered, update symlinks */
 				rv = create_symlinks(xhp,
-					xbps_dictionary_get(pkg_alternatives, keyname),
-					keyname);
+				    xbps_dictionary_get(pkg_alternatives, keyname),
+				    keyname);
 				if (rv != 0)
 					break;
 			} else {