Fix handling of unrecognized options

Artur Zakirov · Artur Zakirov · commit b188a8a5e3b2 · 2017-02-15T16:22:49.000+03:00
diff --git a/pg_probackup.c b/pg_probackup.c
@@ -75,7 +75,7 @@ static pgut_option options[] =
 	{ 's',  5, "inclusive",				&target_inclusive,	SOURCE_CMDLINE },
 	{ 'u',  6, "timeline",				&target_tli,		SOURCE_CMDLINE },
 	/* delete options */
-	{ 'b', 12, "wal",					&delete_wal },
+	{ 'b', 12, "wal",					&delete_wal,		SOURCE_CMDLINE },
 	/* retention options */
 	{ 'u', 13, "redundancy",			&retention_redundancy,	SOURCE_CMDLINE },
 	{ 'u', 14, "window",				&retention_window,		SOURCE_CMDLINE },
diff --git a/pgut/pgut.c b/pgut/pgut.c
@@ -631,9 +631,10 @@ pgut_getopt(int argc, char **argv, pgut_option options[])
 	while ((c = getopt_long(argc, argv, optstring, longopts, &optindex)) != -1)
 	{
 		opt = option_find(c, default_options, options);
-		if (opt->allowed < SOURCE_CMDLINE)
+		if (opt && opt->allowed < SOURCE_CMDLINE)
 			elog(ERROR, "option %s cannot be specified in command line",
 				 opt->lname);
+		/* Check 'opt == NULL' is performed in assign_option() */
 		assign_option(opt, optarg, SOURCE_CMDLINE);
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -631,9 +631,10 @@ pgut_getopt(int argc, char **argv, pgut_option options[])`
`631`	`631`	`while ((c = getopt_long(argc, argv, optstring, longopts, &optindex)) != -1)`
`632`	`632`	`{`
`633`	`633`	`opt = option_find(c, default_options, options);`
`634`		`- if (opt->allowed < SOURCE_CMDLINE)`
	`634`	`+ if (opt && opt->allowed < SOURCE_CMDLINE)`
`635`	`635`	`elog(ERROR, "option %s cannot be specified in command line",`
`636`	`636`	`opt->lname);`
	`637`	`+ /* Check 'opt == NULL' is performed in assign_option() */`
`637`	`638`	`assign_option(opt, optarg, SOURCE_CMDLINE);`
`638`	`639`	`}`
`639`	`640`