bin/xbps-uhelper: allow multiple arguments for many actions

classabbyamp · classabbyamp · commit 20a997708c25 · 2023-02-09T05:21:54.000-05:00
diff --git a/bin/xbps-uhelper/main.c b/bin/xbps-uhelper/main.c
@@ -103,7 +103,7 @@ main(int argc, char **argv)
 	struct xferstat xfer;
 	const char *version, *rootdir = NULL, *confdir = NULL;
 	char pkgname[XBPS_NAME_SIZE], *filename;
-	int flags = 0, c, rv = 0;
+	int flags = 0, c, rv = 0, i = 0;
 	const struct option longopts[] = {
 		{ NULL, 0, NULL, 0 }
 	};
@@ -160,59 +160,76 @@ main(int argc, char **argv)
 	}
 
 	if (strcmp(argv[0], "version") == 0) {
-		/* Prints version of an installed package */
-		if (argc != 2)
+		/* Prints version of installed packages */
+		if (argc < 2)
 			usage();
 
-		if ((((dict = xbps_pkgdb_get_pkg(&xh, argv[1])) == NULL)) &&
-		    (((dict = xbps_pkgdb_get_virtualpkg(&xh, argv[1])) == NULL)))
-			exit(EXIT_FAILURE);
-
-		xbps_dictionary_get_cstring_nocopy(dict, "pkgver", &version);
-		printf("%s\n", xbps_pkg_version(version));
+		for (i = 1; i < argc; i++) {
+			if ((((dict = xbps_pkgdb_get_pkg(&xh, argv[i])) == NULL)) &&
+				(((dict = xbps_pkgdb_get_virtualpkg(&xh, argv[i])) == NULL))) {
+				xbps_error_printf("Could not find package '%s'\n", argv[i])
+				rv = 1;
+			} else {
+				xbps_dictionary_get_cstring_nocopy(dict, "pkgver", &version);
+				printf("%s\n", xbps_pkg_version(version));
+			}
+		}
 	} else if (strcmp(argv[0], "real-version") == 0) {
-		/* Prints version of an installed real package, not virtual */
-		if (argc != 2)
+		/* Prints version of installed real packages, not virtual */
+		if (argc < 2)
 			usage();
 
-		if ((dict = xbps_pkgdb_get_pkg(&xh, argv[1])) == NULL)
-			exit(EXIT_FAILURE);
-
-		xbps_dictionary_get_cstring_nocopy(dict, "pkgver", &version);
-		printf("%s\n", xbps_pkg_version(version));
+		for (i = 1; i < argc; i++) {
+			if ((dict = xbps_pkgdb_get_pkg(&xh, argv[i])) == NULL) {
+				xbps_error_printf("Could not find package '%s'\n", argv[i])
+				rv = 1;
+			} else {
+				xbps_dictionary_get_cstring_nocopy(dict, "pkgver", &version);
+				printf("%s\n", xbps_pkg_version(version));
+			}
+		}
 	} else if (strcmp(argv[0], "getpkgversion") == 0) {
 		/* Returns the version of a pkg string */
-		if (argc != 2)
+		if (argc < 2)
 			usage();
 
-		version = xbps_pkg_version(argv[1]);
-		if (version == NULL) {
-			fprintf(stderr,
-			    "Invalid string, expected <string>-<version>_<revision>\n");
-			exit(EXIT_FAILURE);
+		for (i = 1; i < argc; i++) {
+			version = xbps_pkg_version(argv[i]);
+			if (version == NULL) {
+				xbps_error_printf(
+					"Invalid string '%s', expected <string>-<version>_<revision>\n", argv[i]);
+				rv = 1;
+			} else {
+				printf("%s\n", version);
+			}
 		}
-		printf("%s\n", version);
 	} else if (strcmp(argv[0], "getpkgname") == 0) {
 		/* Returns the name of a pkg string */
-		if (argc != 2)
+		if (argc < 2)
 			usage();
 
-		if (!xbps_pkg_name(pkgname, sizeof(pkgname), argv[1])) {
-			fprintf(stderr,
-			    "Invalid string, expected <string>-<version>_<revision>\n");
-			exit(EXIT_FAILURE);
+		for (i = 1; i < argc; i++) {
+			if (!xbps_pkg_name(pkgname, sizeof(pkgname), argv[i])) {
+				fprintf(stderr,
+					"Invalid string '%s', expected <string>-<version>_<revision>\n", argv[i]);
+				rv = 1;
+			} else {
+				printf("%s\n", pkgname);
+			}
 		}
-		printf("%s\n", pkgname);
 	} else if (strcmp(argv[0], "getpkgrevision") == 0) {
 		/* Returns the revision of a pkg string */
-		if (argc != 2)
+		if (argc < 2)
 			usage();
 
-		version = xbps_pkg_revision(argv[1]);
-		if (version == NULL)
-			exit(EXIT_SUCCESS);
-
-		printf("%s\n", version);
+		for (i = 1; i < argc; i++) {
+			version = xbps_pkg_revision(argv[1]);
+			if (version == NULL) {
+				rv = 1;
+			} else {
+				printf("%s\n", version);
+			}
+		}
 	} else if (strcmp(argv[0], "getpkgdepname") == 0) {
 		/* Returns the pkgname of a dependency */
 		if (argc != 2)
