Changeset 445 in openpam

Timestamp:

10/22/11 02:45:26 (19 months ago)

Author:

des

Message:

Modernize, and add support for other authors than ThinkSec?.

File:

• trunk/misc/gendoc.pl (modified) (13 diffs)

trunk/misc/gendoc.pl

@@ -42 +42 @@
 use Getopt::Std;
 use POSIX qw(locale_h strftime);
-use vars qw($COPYRIGHT $TODAY %FUNCTIONS %PAMERR);
+use vars qw($COPYRIGHT %AUTHORS $TODAY %FUNCTIONS %PAMERR);
 
 $COPYRIGHT = ".\\\"-
@@ -78 +78 @@
 .\\\" SUCH DAMAGE.
 .\\\"
-.\\\" \$" . "P4" . "\$
+.\\\" \$" . "Id" . "\$
 .\\\"";
+
+%AUTHORS = (
+    THINKSEC => "ThinkSec AS and Network Associates Laboratories, the
+Security Research Division of Network Associates, Inc.\\& under
+DARPA/SPAWAR contract N66001-01-C-8035
+.Pq Dq CBOSS ,
+as part of the DARPA CHATS research program.",
+    DES => ".An Dag-Erling Sm\\(/orgrav Aq des\@FreeBSD.org .",
+);
 
 %PAMERR = (
@@ -129 +138 @@
     my %xref;
     my @errors;
+    my $author;
 
     if ($fn !~ m,\.c$,) {
@@ -135 +145 @@
     }
 
-    sysopen(FILE, $fn, O_RDONLY)
+    open(FILE, "<", "$fn")
         or die("$fn: open(): $!\n");
     $source = join('', <FILE>);
@@ -142 +152 @@
     return undef
         if ($source =~ m/^ \* NOPARSE\s*$/m);
+
+    $author = 'THINKSEC';
+    if ($source =~ s/^ \* AUTHOR\s+(.*?)\s*$//m) {
+        $author = $1;
+    }
 
     $func = $fn;
@@ -212 +227 @@
             next;
         }
-        if (s/^\s+(=?\w+):\s*/.It $1/) {
+        if (s/^\s+([=%]?\w+):\s*/.It $1/) {
             if ($inliteral) {
                 $man .= ".Ed\n";
@@ -264 +279 @@
             $man .= ".Ed\n";
         }
+        $man =~ s/\%/\\&\%/gs;
         $man =~ s/(\n\.[A-Z][a-z] [\w ]+)\n([\.,:;-]\S*)\s*/$1 $2\n/gs;
         $man =~ s/\s*$/\n/gm;
@@ -283 +299 @@
         'xref'          => \%xref,
         'errors'        => \@errors,
+        'author'        => $author,
     };
     if ($source =~ m/^ \* NODOC\s*$/m) {
@@ -446 +463 @@
 function and this manual page were developed for the
 .Fx
-Project by ThinkSec AS and Network Associates Laboratories, the
-Security Research Division of Network Associates, Inc.\\& under
-DARPA/SPAWAR contract N66001-01-C-8035
-.Pq Dq CBOSS ,
-as part of the DARPA CHATS research program.
-";
-
+Project by\n" . $AUTHORS{$func->{'author'} // 'THINKSEC_DARPA'} . "\n";
     $fn = "$func->{'name'}.3";
-    if (sysopen(FILE, $fn, O_RDWR|O_CREAT|O_TRUNC)) {
+    if (open(FILE, ">", $fn)) {
         print(FILE $mdoc);
         close(FILE);
@@ -468 +479 @@
     my %func;
 
-    sysopen(FILE, $fn, O_RDONLY)
+    open(FILE, "<", "$fn")
         or die("$fn: open(): $!\n");
     while (<FILE>) {
@@ -495 +506 @@
     my %xref;
 
-    sysopen(FILE, "$page.3", O_RDWR|O_CREAT|O_TRUNC)
+    open(FILE, ">", "$page.3")
         or die("$page.3: $!\n");
 
-    $upage = uc($page);
+    $page =~ m/(\w+)$/;
+    $upage = uc($1);
     print FILE "$COPYRIGHT
 .Dd $TODAY
@@ -571 +583 @@
 sub usage() {
 
-    print(STDERR "usage: gendoc [-s] source [...]\n");
+    print(STDERR "usage: gendoc [-op] source [...]\n");
     exit(1);
 }
@@ -580 +592 @@
     usage()
         unless (@ARGV && getopts("op", \%opts));
-    setlocale(LC_ALL, "en_US.ISO8859-1");
+    setlocale(LC_ALL, "en_US.UTF-8");
     $TODAY = strftime("%B %e, %Y", localtime(time()));
     $TODAY =~ s,\s+, ,g;