autoscan -v produces gigabytes of output - take 2

[Pavel Roskin]

The same as the previous patch, but all $verbose code in scan_files() is
put in one block, and %programs is printed out only once.

_______________________________________
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,11 @@
+2001-02-01  Pavel Roskin  <address@hidden>
+
+       * autoscan.pl (scan_c_file): When in verbose mode, don't print
+       out hashes common for the whole package. Do it in scan_files()
+       instead.
+       (scan_makefile): Likewise.
+       (scan_sh_file): Likewise.
+
 2001-01-30  Ralf Corsepius <address@hidden>

        * acgeneral.m4 (_AC_OUTPUT_SUBDIRS): Remove configure.ac
--- autoscan.pl
+++ autoscan.pl
@@ -235,13 +235,6 @@
       $initfile = $cfiles[0];          # Pick one at random.
     }

-  if ($verbose)
-    {
-      print "cfiles:", join(" ", @cfiles), "\n";
-      print "makefiles:", join(" ", @makefiles), "\n";
-      print "shfiles:", join(" ", @shfiles), "\n";
-    }
-
   foreach $file (@cfiles)
     {
       push (@{$programs{"cc"}}, $file);
@@ -257,6 +250,51 @@
     {
       scan_sh_file ($file);
     }
+
+  if ($verbose)
+    {
+      my $word;
+
+      print "cfiles:", join(" ", @cfiles), "\n";
+      print "makefiles:", join(" ", @makefiles), "\n";
+      print "shfiles:", join(" ", @shfiles), "\n";
+
+      print "\nfunctions:\n";
+      foreach $word (sort keys %functions)
+       {
+         print "$word: @{$functions{$word}}\n";
+       }
+
+      print "\nidentifiers:\n";
+      foreach $word (sort keys %identifiers)
+       {
+         print "$word: @{$identifiers{$word}}\n";
+       }
+
+      print "\nheaders:\n";
+      foreach $word (sort keys %headers)
+       {
+         print "$word: @{$headers{$word}}\n";
+       }
+
+      print "\nmakevars:\n";
+      foreach $word (sort keys %makevars)
+       {
+         print "$word: @{$makevars{$word}}\n";
+       }
+
+      print "\nlibraries:\n";
+      foreach $word (sort keys %libraries)
+       {
+         print "$word: @{$libraries{$word}}\n";
+       }
+
+      print "\nprograms:\n";
+      foreach $word (sort keys %programs)
+       {
+         print "$word: @{$programs{$word}}\n";
+       }
+    }
 }


@@ -313,29 +351,6 @@
        }
     }
   close(CFILE);
-
-  if ($verbose)
-    {
-      my ($word);
-
-      print "\n$file functions:\n";
-      foreach $word (sort keys %functions)
-       {
-         print "$word: @{$functions{$word}}\n";
-       }
-
-      print "\n$file identifiers:\n";
-      foreach $word (sort keys %identifiers)
-       {
-         print "$word: @{$identifiers{$word}}\n";
-       }
-
-      print "\n$file headers:\n";
-      foreach $word (sort keys %headers)
-       {
-         print "$word: @{$headers{$word}}\n";
-       }
-    }
 }


@@ -371,29 +386,6 @@
        }
     }
   close(MFILE);
-
-  if ($verbose)
-    {
-      my ($word);
-
-      print "\n$file makevars:\n";
-      foreach $word (sort keys %makevars)
-       {
-         print "$word: @{$makevars{$word}}\n";
-       }
-
-      print "\n$file libraries:\n";
-      foreach $word (sort keys %libraries)
-       {
-         print "$word: @{$libraries{$word}}\n";
-       }
-
-      print "\n$file programs:\n";
-      foreach $word (sort keys %programs)
-       {
-         print "$word: @{$programs{$word}}\n";
-       }
-    }
 }


@@ -418,17 +410,6 @@
        }
     }
   close(MFILE);
-
-  if ($verbose)
-    {
-      my ($word);
-
-      print "\n$file programs:\n";
-      foreach $word (sort keys %programs)
-       {
-         print "$word: @{$programs{$word}}\n";
-       }
-    }
 }


_______________________________________