Register binary package if unpacking was successful.

--HG--
extra : convert_revision : ac984d640acb340e3a8db2ac07e41d15b1eea89e

lib/install.c

@@ -32,13 +32,86 @@
 
 #include <xbps_api.h>
 
+int
+xbps_install_binary_pkg_from_repolist(prop_object_t obj, void *arg,
+				      bool *loop_done)
+{
+	prop_dictionary_t repod, pkgrd;
+	const char *pkgname = arg, *version, *desc;
+	char plist[PATH_MAX];
+	int rv = 0;
+
+	/*
+	 * Get the dictionary from a repository's index file.
+	 */
+	memset(plist, 0, sizeof(&plist));
+	if (!xbps_append_full_path(plist,
+	    prop_string_cstring_nocopy(obj), XBPS_PKGINDEX))
+		return EINVAL;
+
+	repod = prop_dictionary_internalize_from_file(plist);
+	if (repod == NULL)
+		return EINVAL;
+
+	/*
+	 * Get the package dictionary from current repository.
+	 */
+	pkgrd = xbps_find_pkg_in_dict(repod, pkgname);
+	if (pkgrd == NULL) {
+		prop_object_release(repod);
+		return XBPS_PKG_ENOTINREPO;
+	}
+
+	prop_dictionary_get_cstring_nocopy(pkgrd, "version", &version);
+	prop_dictionary_get_cstring_nocopy(pkgrd, "short_desc", &desc);
+	assert(version != NULL);
+	assert(desc != NULL);
+
+	/*
+	 * Check if this package needs dependencies.
+	 */
+	if (!xbps_pkg_has_rundeps(pkgrd)) {
+		/* pkg has no deps, just install it. */
+		rv = xbps_unpack_binary_pkg(repod, pkgrd,
+		    xbps_unpack_archive_cb);
+		if (rv == 0) {
+			rv = xbps_register_pkg(pkgname, version, desc);
+			if (rv == EEXIST)
+				rv = 0;
+		}
+		prop_object_release(repod);
+		*loop_done = true;
+		return rv;
+	}
+
+	/*
+	 * Install all required dependencies.
+	 */
+	rv = xbps_install_pkg_deps(pkgrd);
+	if (rv != 0) {
+		prop_object_release(repod);
+		return rv;
+	}
+	/*
+	 * Finally install the package, now that all
+	 * required dependencies were installed.
+	 */
+	rv = xbps_unpack_binary_pkg(repod, pkgrd, xbps_unpack_archive_cb);
+	if (rv == 0) {
+		rv = xbps_register_pkg(pkgname, version, desc);
+		if (rv == EEXIST)
+			rv = 0;
+	}
+	prop_object_release(repod);
+	*loop_done = true;
+
+	return rv;
+}
+
 int
 xbps_install_binary_pkg(const char *pkgname, const char *destdir)
 {
-	prop_array_t array;
-	prop_dictionary_t repolistd, repod, pkgrd;
-	prop_object_t obj;
-	prop_object_iterator_t iter;
+	prop_dictionary_t repolistd;
 	char plist[PATH_MAX];
 	int rv = 0;
 
@@ -48,7 +121,10 @@ xbps_install_binary_pkg(const char *pkgname, const char *destdir)
 			return XBPS_PKG_ECHDIRDEST;
 	}
 
-	/* Get the dictionary with list of repositories. */
+	/*
+	 * Get the dictionary with the list of registered
+	 * repositories.
+	 */
 	if (!xbps_append_full_path(plist, NULL, XBPS_REPOLIST))
 		return EINVAL;
 
@@ -56,98 +132,128 @@ xbps_install_binary_pkg(const char *pkgname, const char *destdir)
 	if (repolistd == NULL)
 		return EINVAL;
 
-	/* Iterate over the list of repositories to find a pkg. */
-	array = prop_dictionary_get(repolistd, "repository-list");
-	if (array == NULL || prop_array_count(array) == 0) {
-		prop_object_release(repolistd);
-		return EINVAL;
-	}
-
-	iter = prop_array_iterator(array);
-	if (iter == NULL) {
-		prop_object_release(repolistd);
-		return ENOMEM;
-	}
-
-	while ((obj = prop_object_iterator_next(iter)) != NULL) {
-		/*
-		 * Get the dictionary from a repository's index file.
-		 */
-		assert(prop_object_type(obj) == PROP_TYPE_STRING);
-		memset(plist, 0, sizeof(&plist));
-		if (!xbps_append_full_path(plist,
-		    prop_string_cstring_nocopy(obj), XBPS_PKGINDEX)) {
-			prop_object_iterator_release(iter);
-			prop_object_release(repolistd);
-			return EINVAL;
-		}
-		repod = prop_dictionary_internalize_from_file(plist);
-		if (repod == NULL) {
-			prop_object_iterator_release(iter);
-			prop_object_release(repolistd);
-			return EINVAL;
-		}
-
-		/*
-		 * Get the package dictionary from current repository.
-		 */
-		pkgrd = xbps_find_pkg_in_dict(repod, pkgname);
-		if (pkgrd == NULL) {
-			prop_object_release(repod);
-			continue;
-		}
-
-		/*
-		 * Check if pkg needs deps.
-		 */
-		if (!xbps_pkg_has_rundeps(pkgrd)) {
-			/* pkg has no deps, just install it. */
-			rv = xbps_unpack_binary_pkg(repod, pkgrd,
-			    xbps_unpack_archive_cb);
-			prop_object_release(repolistd);
-			prop_object_release(repod);
-			break;
-		}
-
-		/*
-		 * Install all required dependencies.
-		 */
-		rv = xbps_install_pkg_deps(array, pkgrd);
-		if (rv != 0) {
-			prop_object_release(repolistd);
-			prop_object_release(repod);
-			break;
-		}
-		/*
-		 * Finally install the package, now that all
-		 * required dependencies were installed.
-		 */
-		rv = xbps_unpack_binary_pkg(repod, pkgrd,
-		     xbps_unpack_archive_cb);
-		prop_object_release(repolistd);
-		prop_object_release(repod);
-		break;
-	}
-
-	prop_object_iterator_release(iter);
+	/*
+	 * Iterate over the repositories to find the binary packages
+	 * required by this package.
+	 */
+	rv = xbps_callback_array_iter_in_dict(repolistd, "repository-list",
+	    xbps_install_binary_pkg_from_repolist, (void *)pkgname);
+	prop_object_release(repolistd);
 
 	return rv;
 }
 
+static prop_dictionary_t
+make_dict_from_pkg(const char *name, const char *ver, const char *desc)
+{
+	prop_dictionary_t dict;
+
+	dict = prop_dictionary_create();
+	assert(dict != NULL);
+
+	prop_dictionary_set_cstring_nocopy(dict, "pkgname", name);
+	prop_dictionary_set_cstring_nocopy(dict, "version", ver);
+	prop_dictionary_set_cstring_nocopy(dict, "short_desc", desc);
+
+	return dict;
+}
+
+int
+xbps_register_pkg(const char *pkgname, const char *version, const char *desc)
+{
+	prop_dictionary_t dict, pkgd;
+	prop_array_t array;
+	char plist[PATH_MAX];
+	int rv = 0;
+
+	assert(pkgname != NULL);
+	assert(version != NULL);
+	assert(desc != NULL);
+
+	if (!xbps_append_full_path(plist, NULL, XBPS_REGPKGDB))
+		return EINVAL;
+
+	dict = prop_dictionary_internalize_from_file(plist);
+	if (dict == NULL) {
+		/* No packages registered yet. */
+		dict = prop_dictionary_create();
+		if (dict == NULL)
+			return ENOMEM;
+
+		array = prop_array_create();
+		if (array == NULL) {
+			prop_object_release(dict);
+			return ENOMEM;
+		}
+
+		pkgd = make_dict_from_pkg(pkgname, version, desc);
+
+		if (!xbps_add_obj_to_array(array, pkgd)) {
+			prop_object_release(array);
+			prop_object_release(dict);
+			prop_object_release(pkgd);
+			return EINVAL;
+		}
+
+		if (!xbps_add_obj_to_dict(dict, array, "packages")) {
+			prop_object_release(array);
+			prop_object_release(dict);
+			return EINVAL;
+		}
+
+	} else {
+		/* Check if package is already registered. */
+		pkgd = xbps_find_pkg_in_dict(dict, pkgname);
+		if (pkgd != NULL) {
+			prop_object_release(dict);
+			return EEXIST;
+		}
+
+		pkgd = make_dict_from_pkg(pkgname, version, desc);
+		array = prop_dictionary_get(dict, "packages");
+		assert(array != NULL);
+
+		if (!xbps_add_obj_to_array(array, pkgd)) {
+			prop_object_release(pkgd);
+			prop_object_release(dict);
+			return EINVAL;
+		}
+	}
+
+
+	if (!prop_dictionary_externalize_to_file(dict, plist))
+		rv = errno;
+
+	prop_object_release(dict);
+
+	return rv;
+}
+
+/*
+ * Flags for extracting files in binary packages.
+ */
+#define EXTRACT_FLAGS	ARCHIVE_EXTRACT_OWNER | ARCHIVE_EXTRACT_PERM | \
+			ARCHIVE_EXTRACT_TIME | \
+			ARCHIVE_EXTRACT_SECURE_NODOTDOT | \
+			ARCHIVE_EXTRACT_SECURE_SYMLINKS | \
+			ARCHIVE_EXTRACT_UNLINK
+
 int
 xbps_unpack_archive_cb(struct archive *ar)
 {
 	struct archive_entry *entry;
-	static bool first;
-	int rv = 0;
+	int rv = 0, flags;
+
+	if (geteuid() == 0)
+		flags = EXTRACT_FLAGS;
+	else
+		flags = 0;
 
 	while (archive_read_next_header(ar, &entry) == ARCHIVE_OK) {
-		if ((rv = archive_read_extract(ar, entry, 0)) != 0) {
-			if (!first)
-				printf("\n");
-			first = true;
-			printf("couldn't write %s (%s), ignoring!\n",
+		if ((rv = archive_read_extract(ar, entry, flags)) != 0) {
+			printf("\ncouldn't unpack %s (%s), exiting!\n",
 			    archive_entry_pathname(entry), strerror(errno));
+			break;
 		}
 	}