From: minima <minima>
Date: Mon, 21 Mar 2005 19:52:06 +0000 (+0000)
Subject: fix command searching
X-Git-Tag: 1.53~140
X-Git-Url: http://dxcluster.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=121e8d518a57f693b0c71d8c959c644f5e950911;p=spider.git

fix command searching
---

diff --git a/perl/DXCommandmode.pm b/perl/DXCommandmode.pm
index eae67c72..332e3bad 100644
--- a/perl/DXCommandmode.pm
+++ b/perl/DXCommandmode.pm
@@ -632,40 +632,42 @@ sub search
 	my @parts = split '/', $short_cmd;
 	my $dirfn;
 	my $curdir = $path;
-	my $p;
-	my $i;
-	my @lparts;
 	
-	for ($i = 0; $i < @parts; $i++) {
-		my  $p = $parts[$i];
-		opendir(D, $curdir) or confess "can't open $curdir $!";
-		my @ls = readdir D;
-		closedir D;
-		my $l;
-		foreach $l (sort @ls) {
-			next if $l =~ /^\./;
-			if ($i < $#parts) {            	# we are dealing with directories
-				if ((-d "$curdir/$l") && $p eq substr($l, 0, length $p)) {
-					dbg("got dir: $curdir/$l\n") if isdbg('command');
-					$dirfn .= "$l/";
-					$curdir .= "/$l";
-					last;
-				}
-			} else {			# we are dealing with commands
-				@lparts = split /\./, $l;                  
-				next if $lparts[$#lparts] ne $suffix;        # only look for .$suffix files
-				if ($p eq substr($l, 0, length $p)) {
-					pop @lparts; #  remove the suffix
-					$l = join '.', @lparts;
-					#		  chop $dirfn;               # remove trailing /
-					$dirfn = "" unless $dirfn;
-					$cmd_cache{$short_cmd} = join(',', ($path, "$dirfn$l")); # cache it
-					dbg("got path: $path cmd: $dirfn$l\n") if isdbg('command');
-					return ($path, "$dirfn$l"); 
-				}
-			}
-		}
-	}
+        while (my $p = shift @parts) {
+                opendir(D, $curdir) or confess "can't open $curdir $!";
+                my @ls = readdir D;
+                closedir D;
+
+                # if this isn't the last part
+                if (@parts) {
+                        my $found;
+                        foreach my $l (sort @ls) {
+                                next if $l =~ /^\./;
+                                if ((-d "$curdir/$l") && $p eq substr($l, 0, length $p)) {
+                                        dbg("got dir: $curdir/$l\n") if isdbg('command');
+                                        $dirfn .= "$l/";
+                                        $curdir .= "/$l";
+                                        $found++;
+                                        last;
+                                }
+                        }
+                        # only proceed if we find the directory asked for
+                        return () unless $found;
+                } else {
+                        foreach my $l (sort @ls) {
+                                next if $l =~ /^\./;
+                                next unless $l =~ /\.$suffix$/;
+                                if ($p eq substr($l, 0, length $p)) {
+                                        $l =~ s/\.$suffix$//;
+                                        $dirfn = "" unless $dirfn;
+                                        $cmd_cache{$short_cmd} = join(',', ($path, "$dirfn$l")); # cache it
+                                        dbg("got path: $path cmd: $dirfn$l\n") if isdbg('command');
+                                        return ($path, "$dirfn$l");
+                                }
+                        }
+                }
+        }
+
 	return ();  
 }