Merge pull request #23 from aurel32/toke-getopt

reinauer · web-flow · commit 08c51738fc8e · 2025-03-10T09:57:21.000-07:00
toke: fix getopt with invalid combined short options
diff --git a/toke/toke.c b/toke/toke.c
@@ -298,7 +298,7 @@ static void get_args( int argc, char **argv )
 			/*  Distinguish between a '?' from the user
 			 *  and one  getopt()  returned
 			 */
-			if ( argv[argindx][1] != '?' )
+			if ( optopt )
 			{
 			    inval_opt = TRUE;
 			    break;

Original file line number	Diff line number	Diff line change
`@@ -298,7 +298,7 @@ static void get_args( int argc, char **argv )`
`298`	`298`	`/* Distinguish between a '?' from the user`
`299`	`299`	`* and one getopt() returned`
`300`	`300`	`*/`
`301`		`- if ( argv[argindx][1] != '?' )`
	`301`	`+ if ( optopt )`
`302`	`302`	`{`
`303`	`303`	`inval_opt = TRUE;`
`304`	`304`	`break;`