fix bug when process '--' argument

Signed-off-by: Jianhong Yin <[email protected]>
tcler · Apr 27, 2018 · 3cdeaf9 · 3cdeaf9
1 parent 83abecd
commit 3cdeaf9
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/getOpt-3.0/getOpt.tcl b/getOpt-3.0/getOpt.tcl
@@ -50,9 +50,8 @@ proc ::getOpt::argparse {optionList argvVar optVar optArgVar} {
 		return $::getOpt::flag(NOTOPT)
 	}
 	if {$rarg in {--}} {
-		set optArg [lrange $argv 1 end]
-		set argv [list]
-		return $::getOpt::flag(NOTOPT)
+		set argv [lrange $argv 1 end]
+		return $::getOpt::flag(END)
 	}
 
 	set argv [lrange $argv 1 end]
@@ -227,7 +226,8 @@ proc ::getOpt::getOptions {optLists argv validOptionVar invalidOptionVar notOpti
 			#unknown options
 			set invalidOption($opt) "unkown options"
 		} elseif {$ret == $::getOpt::flag(END)} {
-			#end of nargv
+			#end of nargv or get --
+			set notOption [concat $notOption $nargv]
 			break
 		}
 	}