Integrate:

[ 23051]
Add some missing authors and remove 1 duplicate

[ 23127]
glob('*.c') to find documentation is dangerous when run in unclean
trees, so isntead use MANIFEST to only scan the legitimate source
files.
p4raw-link: @23127 on //depot/perl: 69e39a9aeaf661e41da7db0001d9c91f3c2c89c7
p4raw-link: @23051 on //depot/perl: 1fa274e723b2a6cc579f684c3c92992016a8667c

p4raw-id: //depot/maint-5.8/perl@23131
p4raw-integrated: from //depot/perl@23119 'copy in' AUTHORS (@22649..)
	autodoc.pl (@22875..)

diff --git a/AUTHORS b/AUTHORS
index e5f45c7..7eea705 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -85,6 +85,7 @@ Billy Constantine             <wdconsta@cs.adelaide.edu.au>
 Blair Zajac                    <blair@orcaware.com>
 Bob Dalgleish                  <Robert.Dalgleish@sk.sympatico.ca>
 Bob Wilkinson
+Boris Zentner                  <bzm@2bz.de>
 Boyd Gerber                    <gerberb@zenez.com>
 Brad Appleton                  <bradapp@enteract.com>
 Brad Howerter                  <bhower@wgc.woodward.com>
@@ -187,6 +188,7 @@ David Couture
 David D. Kilzer                        <ddkilzer@lubricants-oil.com>
 David Denholm                  <denholm@conmat.phys.soton.ac.uk>
 David Dyck                     <dcd@tc.fluke.com>
+David Cannings                 <lists@edeca.net>
 David F. Haertig               <dfh@dwroll.lucent.com>
 David Favor                    <david@davidfavor.com>
 David Filo
@@ -294,7 +296,6 @@ Hans Ginzel                 <hans@kolej.mff.cuni.cz>
 Hans Mulder                    <hansmu@xs4all.nl>
 Hans Ranke                     <Hans.Ranke@ei.tum.de>
 Harmon S. Nine                 <hnine@netarx.com>
-Harold O Morris                        <hom00@utsglobal.com>
 Harri Pasanen                  <harri.pasanen@trema.com>
 Harry Edmon                    <harry@atmos.washington.edu>
 Helmut Jarausch                        <jarausch@numa1.igpm.rwth-aachen.de>
@@ -592,6 +593,7 @@ Patrick O'Brien                     <pdo@cs.umd.edu>
 Paul A Sand                    <pas@unh.edu>
 Paul David Fardy               <pdf@morgan.ucs.mun.ca>
 Paul Eggert                    <eggert@twinsun.com>
+Paul Fenwick                   <pjf@perltraining.com.au>
 Paul Green                     <Paul.Green@stratus.com>
 Paul Hoffman                   <phoffman@proper.com>
 Paul Holser                    <Paul.Holser.pholser@nortelnetworks.com>

diff --git a/autodoc.pl b/autodoc.pl
index da05962..c87f114 100644 (file)
--- a/autodoc.pl
+++ b/autodoc.pl
@@ -6,7 +6,7 @@ require 5.003;  # keep this compatible, an old perl is all we may have before
 BEGIN {
   push @INC, 'lib';
   require 'regen_lib.pl';
-}      # glob() below requires File::Glob
+}
 
 
 #
@@ -140,7 +140,15 @@ removed without notice.\n\n" if $flags =~ /x/;
 }
 
 my $file;
-for $file (glob('*.c'), glob('*.h')) {
+# glob() picks up docs from extra .c or .h files that may be in unclean
+# development trees.
+my $MANIFEST = do {
+  local ($/, *FH);
+  open FH, "MANIFEST" or die "Can't open MANIFEST: $!";
+  <FH>;
+};
+
+for $file (($MANIFEST =~ /^(\S+\.c)\t/gm), ($MANIFEST =~ /^(\S+\.h)\t/gm)) {
     open F, "< $file" or die "Cannot open $file for docs: $!\n";
     $curheader = "Functions in file $file\n";
     autodoc(\*F,$file);