Commitb188a8a

Artur Zakirov

committed

Fix handling of unrecognized options

1 parentb8640a7 commitb188a8aCopy full SHA for b188a8a

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ static pgut_option options[] =`
`75`	`75`	`{'s',5,"inclusive",&target_inclusive,SOURCE_CMDLINE },`
`76`	`76`	`{'u',6,"timeline",&target_tli,SOURCE_CMDLINE },`
`77`	`77`	`/* delete options */`
`78`		`-{'b',12,"wal",&delete_wal },`
	`78`	`+{'b',12,"wal",&delete_wal,SOURCE_CMDLINE },`
`79`	`79`	`/* retention options */`
`80`	`80`	`{'u',13,"redundancy",&retention_redundancy,SOURCE_CMDLINE },`
`81`	`81`	`{'u',14,"window",&retention_window,SOURCE_CMDLINE },`

Lines changed: 2 additions & 1 deletion

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`

Comments

(0)