[svn] Another contributed fix.

diff --git a/ChangeLog b/ChangeLog
index 651881bfe86f940f0ced036bc23d225fd6d3078a..b7643e1130cd6580b25ec27069fc83059cd01bb8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-11-02  Matthew Seaman  <m.seaman@inpharmatica.co.uk>
+
+       * util/rmold.pl: Various fixes.
+
 2000-11-01  Hrvoje Niksic  <hniksic@arsdigita.com>
 
        * configure.in: Check for size of long and long long.

diff --git a/util/rmold.pl b/util/rmold.pl
index f68744b197d04bf8323d910b0fbbd44e76ee6177..a14f2dc2c997fcde6eeda309e730669c67fc92d6 100755 (executable)
--- a/util/rmold.pl
+++ b/util/rmold.pl
@@ -31,10 +31,8 @@ if (@ARGV && ($ARGV[0] eq '-v')) {
     $verbose = 1;
 }
 
-defined($dirs[0] = shift) || ($dirs[0] = '.');
-while (defined($_ = shift)) {
-    @dirs = (@dirs, $_);
-}
+(@dirs = @ARGV) || push (@dirs,'.');
+
 
 foreach $_ (@dirs) {
     &procdir($_);
@@ -44,7 +42,7 @@ foreach $_ (@dirs) {
 
 sub procdir
 {
-    local($dir = $_[0]);
+    local $dir = shift;
     local(@lcfiles, @lcdirs, %files, @fl);
 
     print STDERR "Processing directory '$dir':\n" if $verbose;
@@ -55,17 +53,17 @@ sub procdir
     # Read local files and directories.
     foreach $_ (readdir(DH)) {
         /^(\.listing|\.\.?)$/ && next;
-        if (-d "$dir/$_" || -l "$dir/$_") {
-            @lcdirs = (@lcdirs, $_);
+        lstat ("$dir/$_");
+        if (-d _) {
+            push (@lcdirs, $_);
         }
         else {
-            @lcfiles = (@lcfiles, $_);
+            push (@lcfiles, $_);
         }
     }
     closedir(DH);
     # Parse .listing
     if (open(FD, "<$dir/.listing")) {
-        @files = ();
         while (<FD>)
         {
             # Weed out the line beginning with 'total'