X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fgetopt.pl;h=f871e418501181fd54ec825c254d658692f0f821;hb=3937c24e3f4ed26beafd7a2fbe3a20466bfc2b2d;hp=4832233ed2fed0c77c1a7305ab9dde8d9465492c;hpb=378cc40b38293ffc7298c6a7ed3cd740ad79be52;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/getopt.pl b/lib/getopt.pl
index 4832233..f871e41 100644
--- a/lib/getopt.pl
+++ b/lib/getopt.pl
@@ -1,4 +1,4 @@
-;# $Header: getopt.pl,v 2.0 88/06/05 00:16:22 root Exp $
+;# $RCSfile: getopt.pl,v $$Revision: 4.1 $$Date: 92/08/07 18:23:58 $
 
 ;# Process single-character switches with switch clustering.  Pass one argument
 ;# which is a string containing all switches that take an argument.  For each
@@ -12,27 +12,30 @@
 sub Getopt {
     local($argumentative) = @_;
     local($_,$first,$rest);
+    local($[) = 0;
 
-    while (($_ = $ARGV[0]) =~ /^-(.)(.*)/) {
+    while (@ARGV && ($_ = $ARGV[0]) =~ /^-(.)(.*)/) {
 	($first,$rest) = ($1,$2);
 	if (index($argumentative,$first) >= $[) {
 	    if ($rest ne '') {
-		shift;
+		shift(@ARGV);
 	    }
 	    else {
-		shift;
-		$rest = shift;
+		shift(@ARGV);
+		$rest = shift(@ARGV);
 	    }
-	    eval "\$opt_$first = \$rest;";
+	    ${"opt_$first"} = $rest;
 	}
 	else {
-	    eval "\$opt_$first = 1;";
+	    ${"opt_$first"} = 1;
 	    if ($rest ne '') {
 		$ARGV[0] = "-$rest";
 	    }
 	    else {
-		shift;
+		shift(@ARGV);
 	    }
 	}
     }
 }
+
+1;