X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fgetopts.pl;h=852aae89b18d868694a7c07402ef3a20287d8398;hb=22fae026e9f4859841088a1c5609be12b0b1d4f3;hp=a0818d1e3a0a81c1d911315825e97c921da37a9d;hpb=8adcabd8d9cf3c71e660c45cb7165ae4694308d4;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/getopts.pl b/lib/getopts.pl
index a0818d1..852aae8 100644
--- a/lib/getopts.pl
+++ b/lib/getopts.pl
@@ -8,23 +8,22 @@ sub Getopts {
     local($argumentative) = @_;
     local(@args,$_,$first,$rest);
     local($errs) = 0;
-    local($[) = 0;
 
     @args = split( / */, $argumentative );
     while(@ARGV && ($_ = $ARGV[0]) =~ /^-(.)(.*)/) {
 	($first,$rest) = ($1,$2);
 	$pos = index($argumentative,$first);
-	if($pos >= $[) {
-	    if($args[$pos+1] eq ':') {
+	if($pos >= 0) {
+	    if($pos < $#args && $args[$pos+1] eq ':') {
 		shift(@ARGV);
 		if($rest eq '') {
 		    ++$errs unless @ARGV;
 		    $rest = shift(@ARGV);
 		}
-		eval "\$opt_$first = \$rest;";
+		${"opt_$first"} = $rest;
 	    }
 	    else {
-		eval "\$opt_$first = 1";
+		${"opt_$first"} = 1;
 		if($rest eq '') {
 		    shift(@ARGV);
 		}