ec30e49 Implement -T option for pkg version — HardenedBSD-pkg

HardenedBSD Package Manager

Implement -T option for pkg version

Chris Rees committed 14 years ago

commit ec30e499d14d540f315ba4da2f233985e4836c67
parent 566a4b1995c567366c21fda2a91335208e769eea

1 file changed +13 -4

modified pkg/version.c

@@ -12,6 +12,7 @@

 #include <string.h>
 #include <sysexits.h>
 #include <unistd.h>
 #include <fnmatch.h>
 #include "version.h"

@@ -208,9 +209,8 @@ exec_version(int argc, char **argv)

 			(opt == VERSION_TESTVERSION && argc < 2)) {
 		usage_version();
 		return (EX_USAGE);
 	}
 	else if (opt == VERSION_TESTVERSION) {
 	} else if (opt == VERSION_TESTVERSION) {
 		switch (pkg_version_cmp(argv[0], argv[1])) {
 			case -1:
 				printf("<\n");

@@ -273,6 +273,15 @@ exec_version(int argc, char **argv)

 			}
 		}
 	/* -T must be unique */
 	} else if (((opt & VERSION_TESTPATTERN) && opt != VERSION_TESTPATTERN) ||
 			(opt == VERSION_TESTPATTERN && argc != 2)) {
 		usage_version();
 		return (EX_USAGE);
 	} else if (opt == VERSION_TESTPATTERN) {
 		return fnmatch(argv[0], argv[1], 0);
 	} else  {
 		if (pkgdb_open(&db, PKGDB_DEFAULT) != EPKG_OK)
 			return (EX_IOERR);

@@ -302,7 +311,7 @@ exec_version(int argc, char **argv)

 			sbuf_delete(cmd);
 		}
 	}
 cleanup:
 	while (!SLIST_EMPTY(&indexhead)) {
 		entry = SLIST_FIRST(&indexhead);