2080ed8 Fix pkg info '' and pkg search '' — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Fix pkg info '' and pkg search ''

Baptiste Daroussin committed 13 years ago

commit 2080ed87fa7d8a048873efb382e16bcf3c962a11
parent e25d8e3

2 files changed +10 -1

modified pkg/info.c

@@ -196,6 +196,11 @@ exec_info(int argc, char **argv)

 	do {
 		gotone = false;
 		pkgname = argv[i];
 		if (pkgname[0] == '\0') {
 			fprintf(stderr, "Pattern should not be empty\n");
 			i++;
 			continue;
 		}
 		/*
 		 * allow to search for origin with a trailing /

modified pkg/search.c

@@ -59,7 +59,7 @@ exec_search(int argc, char **argv)

 	struct pkg *pkg = NULL;
 	bool atleastone = false;
 	while ((ch = getopt(argc, argv, "gxXcdr:fDsqop")) != -1) {
 	while ((ch = getopt(argc, argv, "agxXcdr:fDsqop")) != -1) {
 		switch (ch) {
 			case 'e':
 				match = MATCH_EXACT;

@@ -116,6 +116,10 @@ exec_search(int argc, char **argv)

 	}
 	pattern = argv[0];
 	if (pattern[0] == '\0') {
 		fprintf(stderr, "Pattern should not be empty\n");
 		return (EX_USAGE);
 	}
 	if (strchr(pattern, '/') != NULL)
 		field = FIELD_ORIGIN;