 6bbfd1fa98
			
		
	
	6bbfd1fa98
	
	
	
		
			
			parse_long_opt always matches both --opt and --no-opt for any option "opt", and only get_value checks whether --no-opt is actually valid. Since the options for git branch contains both "no-merged" and "merged" there are two matches for --no-merge, but no exact match. With this patch the negation of a NONEG option is rejected earlier, but it changes the error message from "option `no-opt' isn't available" to "unknown option `no-opt'". [jk: added test] Signed-off-by: Andreas Schwab <schwab@linux-m68k.org> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
		
			
				
	
	
		
			93 lines
		
	
	
		
			3.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			93 lines
		
	
	
		
			3.0 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
| #include "cache.h"
 | |
| #include "parse-options.h"
 | |
| 
 | |
| static int boolean = 0;
 | |
| static int integer = 0;
 | |
| static unsigned long timestamp;
 | |
| static int abbrev = 7;
 | |
| static int verbose = 0, dry_run = 0, quiet = 0;
 | |
| static char *string = NULL;
 | |
| static char *file = NULL;
 | |
| static int ambiguous;
 | |
| 
 | |
| static int length_callback(const struct option *opt, const char *arg, int unset)
 | |
| {
 | |
| 	printf("Callback: \"%s\", %d\n",
 | |
| 		(arg ? arg : "not set"), unset);
 | |
| 	if (unset)
 | |
| 		return 1; /* do not support unset */
 | |
| 
 | |
| 	*(int *)opt->value = strlen(arg);
 | |
| 	return 0;
 | |
| }
 | |
| 
 | |
| static int number_callback(const struct option *opt, const char *arg, int unset)
 | |
| {
 | |
| 	*(int *)opt->value = strtol(arg, NULL, 10);
 | |
| 	return 0;
 | |
| }
 | |
| 
 | |
| int main(int argc, const char **argv)
 | |
| {
 | |
| 	const char *prefix = "prefix/";
 | |
| 	const char *usage[] = {
 | |
| 		"test-parse-options <options>",
 | |
| 		NULL
 | |
| 	};
 | |
| 	struct option options[] = {
 | |
| 		OPT_BOOLEAN('b', "boolean", &boolean, "get a boolean"),
 | |
| 		OPT_BIT('4', "or4", &boolean,
 | |
| 			"bitwise-or boolean with ...0100", 4),
 | |
| 		OPT_NEGBIT(0, "neg-or4", &boolean, "same as --no-or4", 4),
 | |
| 		OPT_GROUP(""),
 | |
| 		OPT_INTEGER('i', "integer", &integer, "get a integer"),
 | |
| 		OPT_INTEGER('j', NULL, &integer, "get a integer, too"),
 | |
| 		OPT_SET_INT(0, "set23", &integer, "set integer to 23", 23),
 | |
| 		OPT_DATE('t', NULL, ×tamp, "get timestamp of <time>"),
 | |
| 		OPT_CALLBACK('L', "length", &integer, "str",
 | |
| 			"get length of <str>", length_callback),
 | |
| 		OPT_FILENAME('F', "file", &file, "set file to <FILE>"),
 | |
| 		OPT_GROUP("String options"),
 | |
| 		OPT_STRING('s', "string", &string, "string", "get a string"),
 | |
| 		OPT_STRING(0, "string2", &string, "str", "get another string"),
 | |
| 		OPT_STRING(0, "st", &string, "st", "get another string (pervert ordering)"),
 | |
| 		OPT_STRING('o', NULL, &string, "str", "get another string"),
 | |
| 		OPT_SET_PTR(0, "default-string", &string,
 | |
| 			"set string to default", (unsigned long)"default"),
 | |
| 		OPT_GROUP("Magic arguments"),
 | |
| 		OPT_ARGUMENT("quux", "means --quux"),
 | |
| 		OPT_NUMBER_CALLBACK(&integer, "set integer to NUM",
 | |
| 			number_callback),
 | |
| 		{ OPTION_BOOLEAN, '+', NULL, &boolean, NULL, "same as -b",
 | |
| 		  PARSE_OPT_NOARG | PARSE_OPT_NONEG | PARSE_OPT_NODASH },
 | |
| 		{ OPTION_BOOLEAN, 0, "ambiguous", &ambiguous, NULL,
 | |
| 		  "positive ambiguity", PARSE_OPT_NOARG | PARSE_OPT_NONEG },
 | |
| 		{ OPTION_BOOLEAN, 0, "no-ambiguous", &ambiguous, NULL,
 | |
| 		  "negative ambiguity", PARSE_OPT_NOARG | PARSE_OPT_NONEG },
 | |
| 		OPT_GROUP("Standard options"),
 | |
| 		OPT__ABBREV(&abbrev),
 | |
| 		OPT__VERBOSE(&verbose),
 | |
| 		OPT__DRY_RUN(&dry_run),
 | |
| 		OPT__QUIET(&quiet),
 | |
| 		OPT_END(),
 | |
| 	};
 | |
| 	int i;
 | |
| 
 | |
| 	argc = parse_options(argc, argv, prefix, options, usage, 0);
 | |
| 
 | |
| 	printf("boolean: %d\n", boolean);
 | |
| 	printf("integer: %u\n", integer);
 | |
| 	printf("timestamp: %lu\n", timestamp);
 | |
| 	printf("string: %s\n", string ? string : "(not set)");
 | |
| 	printf("abbrev: %d\n", abbrev);
 | |
| 	printf("verbose: %d\n", verbose);
 | |
| 	printf("quiet: %s\n", quiet ? "yes" : "no");
 | |
| 	printf("dry run: %s\n", dry_run ? "yes" : "no");
 | |
| 	printf("file: %s\n", file ? file : "(not set)");
 | |
| 
 | |
| 	for (i = 0; i < argc; i++)
 | |
| 		printf("arg %02d: %s\n", i, argv[i]);
 | |
| 
 | |
| 	return 0;
 | |
| }
 |