4fc3af1 Long options. — HardenedBSD-pkg

rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9

HardenedBSD Package Manager

Long options.

Matthew Seaman committed 11 years ago

commit 4fc3af1288237b756eb2d9b0cb24f10a49b2992f
parent d88ed02

1 file changed +17 -2

modified src/main.c

@@ -45,6 +45,7 @@

 #include <ctype.h>
 #include <err.h>
 #include <errno.h>
 #include <getopt.h>
 #include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>

@@ -649,6 +650,20 @@ main(int argc, char **argv)

 	int		  newargvl;
 	int		  j;
 	struct option longopts[] = {
 		{ "debug",		no_argument,		NULL,	'd' },
 #ifdef HAVE_LIBJAIL
 		{ "jail",		required_argument,	NULL,	'j' },
 #endif
 		{ "chroot",		required_argument,	NULL,	'c' },
 		{ "config",		required_argument,	NULL,	'C' },
 		{ "repo-conf-dir",	required_argument,	NULL,	'R' },
 		{ "list",		no_argument,		NULL,	'l' },
 		{ "check-activation",	no_argument,		NULL,	'N' },
 		{ "version",		no_argument,		NULL,	'v' },
 		{ "option",		required_argument,	NULL,	'o' },
 	};
 	/* Set stdout unbuffered */
 	setvbuf(stdout, NULL, _IONBF, 0);

@@ -658,9 +673,9 @@ main(int argc, char **argv)

 		usage(NULL, NULL, stderr, PKG_USAGE_INVALID_ARGUMENTS, "not enough arguments");
 #ifdef HAVE_LIBJAIL
 	while ((ch = getopt(argc, argv, "dj:c:C:R:lNvqo:")) != -1) {
 	while ((ch = getopt_long(argc, argv, "dj:c:C:R:lNvo:", longopts, NULL)) != -1) {
 #else
 	while ((ch = getopt(argc, argv, "dc:C:R:lNvqo:")) != -1) {
 	while ((ch = getopt_long(argc, argv, "dc:C:R:lNvo:", longopts, NULL)) != -1) {
 #endif
 		switch (ch) {
 		case 'd':