"files" are now excluded from "ignores"

diff --git a/bin/cvsutil b/bin/cvsutil
index cd999a5..fd833d5 100755 (executable)
--- a/bin/cvsutil
+++ b/bin/cvsutil
@@ -120,6 +120,17 @@ sub localdircore
        fordirs \&localdir,@dir_dirs;
 }
 
+sub filterout
+{
+my($from,@what)=@_;
+
+       my %hash=map { $_=>1; } @$from;
+       for (@what) {
+               delete $hash{$_};
+               }
+       return keys %hash;
+}
+
 sub localreaddir
 {
        local *E;
@@ -148,6 +159,7 @@ sub localreaddir
                                }
                        }
                close I;
+               @dir_ignores=filterout \@dir_ignores,@dir_dirs,@dir_files;
                }
        else {
                mayfatal "File \"".CVSIGNORE."\" cannot be opened" if !$!{ENOENT};
@@ -158,13 +170,8 @@ sub localreaddir
                mayfatal "Cannot read directory \".\"";
                return 0;
                }
-       @dir_workings=readdir D;
+       @dir_workings=filterout [readdir D],@dir_dirs,@dir_files,@dir_ignores,@all_ignore,".","..";
        closedir D;
-       my %delworkings=map { $_=>1; } @dir_workings;
-       for (@dir_dirs,@dir_files,@dir_ignores,@all_ignore,".","..") {
-               delete $delworkings{$_};
-               }
-       @dir_workings=keys %delworkings;
        return 1;
 }