X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Flook.pl;h=e8dc8aacb6a2001451a012b8e1550495bcb0d25f;hb=d6a06c6b3ce238e0862e09fdca0c17e9d40e9b2c;hp=ebbaa73a3d61d613becdd7426fa1c6d713b87413;hpb=a687059cbaf2c6fdccb5e0fae2aee80ec15625a8;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/look.pl b/lib/look.pl
index ebbaa73..e8dc8aa 100644
--- a/lib/look.pl
+++ b/lib/look.pl
@@ -4,24 +4,22 @@
 ;# (stringwise) to $key.  Pass flags for dictionary order and case folding.
 
 sub look {
-    local(*FH,$key,$fold) = @_;
+    local(*FH,$key,$dict,$fold) = @_;
     local($max,$min,$mid,$_);
     local($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size,$atime,$mtime,$ctime,
        $blksize,$blocks) = stat(FH);
     $blksize = 8192 unless $blksize;
     $key =~ s/[^\w\s]//g if $dict;
-    $key =~ y/A-Z/a-z/ if $fold;
-    $max = $size + $blksize - 1;
-    $max -= $size % $blksize;
-    while ($max - $min > $blksize) {
-	$mid = ($max + $min) / 2;
-	die "look: internal error"  if $mid % $blksize;
-	seek(FH,$mid,0);
-	$_ = <FH>;		# probably a partial line
+    $key = lc $key if $fold;
+    $max = int($size / $blksize);
+    while ($max - $min > 1) {
+	$mid = int(($max + $min) / 2);
+	seek(FH,$mid * $blksize,0);
+	$_ = <FH> if $mid;		# probably a partial line
 	$_ = <FH>;
 	chop;
 	s/[^\w\s]//g if $dict;
-	y/A-Z/a-z/ if $fold;
+	$_ = lc $_ if $fold;
 	if ($_ lt $key) {
 	    $min = $mid;
 	}
@@ -29,11 +27,13 @@ sub look {
 	    $max = $mid;
 	}
     }
+    $min *= $blksize;
     seek(FH,$min,0);
+    <FH> if $min;
     while (<FH>) {
 	chop;
 	s/[^\w\s]//g if $dict;
-	y/A-Z/a-z/ if $fold;
+	$_ = lc $_ if $fold;
 	last if $_ ge $key;
 	$min = tell(FH);
     }