69d5b0b Move limchar check earlier. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Move limchar check earlier.

jlaffaye committed 14 years ago

commit 69d5b0b9822790f297c5d6b3c8645b17005c44ee
parent f25cfea

1 file changed +9 -8

modified pkg/version.c

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

 	argc -= optind;
 	argv += optind;
 	if (opt & VERSION_STATUS) {
 			if (limchar != '<' &&
 					limchar != '>' &&
 					limchar != '=') {
 				usage_version();
 				return (EX_USAGE);
 			}
 	}
 	/* -t must be unique */
 	if (((opt & VERSION_TESTVERSION) && opt != VERSION_TESTVERSION) ||
 			(opt == VERSION_TESTVERSION && argc < 2)) {

@@ -149,14 +158,6 @@ exec_version(int argc, char **argv)

 		if (!indexfile)
 			err(EX_SOFTWARE, "Unable to open %s", indexpath);
 		if (opt & VERSION_STATUS)
 			if (limchar != '<' &&
 					limchar != '>' &&
 					limchar != '=') {
 				usage_version();
 				return (EX_USAGE);
 			}
 		while ((linelen = getline(&line, &linecap, indexfile)) > 0) {
 			/* line is pkgname|portdir|... */
 			buf = line;