From b73d40092ccab6ca6d4c8bf07bf6df826a5cca3d Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 5 Sep 2014 21:06:06 +0200
Subject: [PATCH] xbps-uhelper: new targets: binpkgarch and binpkgver.

- binpkgarch: returns the architecture component of a xbps filename.
- binpkgver: returns the pkgver component of a xbps filename.
---
 bin/xbps-uhelper/main.c | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/bin/xbps-uhelper/main.c b/bin/xbps-uhelper/main.c
index 711907a7..c867bffd 100644
--- a/bin/xbps-uhelper/main.c
+++ b/bin/xbps-uhelper/main.c
@@ -44,10 +44,13 @@ usage(void)
 	"usage: xbps-uhelper [options] [action] [args]\n"
 	"\n"
 	"  Available actions:\n"
-	"    cmpver, digest, fetch, getpkgdepname, getpkgname, getpkgrevision,\n"
-	"    getpkgversion, pkgmatch, version, real-version.\n"
+	"    binpkgarch, binpkgver, cmpver, digest, fetch, getpkgdepname,\n"
+	"    getpkgname, getpkgrevision, getpkgversion, pkgmatch, version,\n"
+	"    real-version.\n"
 	"\n"
 	"  Action arguments:\n"
+	"    binpkgarch\t<binpkg>\n"
+	"    binpkgver\t<binpkg>\n"
 	"    cmpver\t\t<instver> <reqver>\n"
 	"    digest\t\t<file> <file1+N>\n"
 	"    fetch\t\t<URL[>filename]> <URL1+N[>filename]>\n"
@@ -232,6 +235,30 @@ main(int argc, char **argv)
 		if (version == NULL)
 			exit(EXIT_FAILURE);
 
+		printf("%s\n", version);
+	} else if (strcmp(argv[0], "binpkgver") == 0) {
+		/* Returns the pkgver of a binpkg string */
+		if (argc != 2)
+			usage();
+
+		version = xbps_binpkg_pkgver(argv[1]);
+		if (version == NULL) {
+			fprintf(stderr,
+			    "Invalid string, expected <pkgname>-<version>_<revision>.<arch>.xbps\n");
+			exit(EXIT_FAILURE);
+		}
+		printf("%s\n", version);
+	} else if (strcmp(argv[0], "binpkgarch") == 0) {
+		/* Returns the arch of a binpkg string */
+		if (argc != 2)
+			usage();
+
+		version = xbps_binpkg_arch(argv[1]);
+		if (version == NULL) {
+			fprintf(stderr,
+			    "Invalid string, expected <pkgname>-<version>_<revision>.<arch>.xbps\n");
+			exit(EXIT_FAILURE);
+		}
 		printf("%s\n", version);
 	} else if (strcmp(argv[0], "pkgmatch") == 0) {
 		/* Matches a pkg with a pattern */