summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorphantom <phantom@FreeBSD.org>2003-11-26 10:43:05 +0000
committerphantom <phantom@FreeBSD.org>2003-11-26 10:43:05 +0000
commit3ad0860a53a594183a836401532fba3a2209c30f (patch)
tree697e405b7150af88d17b796c2ec672dbbcbec720 /tools
parent01a16a20fae56c1d82cd35b6f80e4535f38a049e (diff)
downloadFreeBSD-src-3ad0860a53a594183a836401532fba3a2209c30f.zip
FreeBSD-src-3ad0860a53a594183a836401532fba3a2209c30f.tar.gz
Learn about new world order
Diffstat (limited to 'tools')
-rw-r--r--tools/diag/ac/cknames.pl28
-rw-r--r--tools/diag/ac/ent.sh6
2 files changed, 22 insertions, 12 deletions
diff --git a/tools/diag/ac/cknames.pl b/tools/diag/ac/cknames.pl
index 4363f65..a3ffe31 100644
--- a/tools/diag/ac/cknames.pl
+++ b/tools/diag/ac/cknames.pl
@@ -1,6 +1,6 @@
#!/usr/bin/perl -w
#
-# Copyright (c) 2002 Alexey Zelkin <phantom@FreeBSD.org>
+# Copyright (c) 2002,2003 Alexey Zelkin <phantom@FreeBSD.org>
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -37,9 +37,15 @@ $debug = 0;
$accessfile = "CVSROOT/access";
$authorsfile = "doc/en_US.ISO8859-1/share/sgml/authors.ent";
-$cvsroot = $ENV{'CVSROOT'};
-$cvsroot = "/home/ncvs" if !$cvsroot;
-$cvs = "cvs -R -d $cvsroot co -p";
+@cvsroots = qw(
+ /home/ncvs
+ /home/pcvs
+ /home/dcvs
+);
+
+$doccvsroot = "/home/dcvs";
+$cvs_pfx = "cvs -Q -R -d ";
+$cvs_sfx = " co -p";
open(PASSWD, 'ypcat passwd |') || die "open passwd data: $!\n";
while (<PASSWD>) {
@@ -51,19 +57,23 @@ while (<PASSWD>) {
}
close PASSWD;
-print "$cvs $accessfile\n";
-open (ACCESS, "$cvs $accessfile |") || die "checkout $accessfile: $!\n";
-while (<ACCESS>) {
+foreach (@cvsroots) {
+ print "$cvs_pfx $_ $cvs_sfx $accessfile\n" if $debug;
+ open (ACCESS, "$cvs_pfx $_ $cvs_sfx $accessfile |") ||
+ die "checkout $accessfile: $!\n";
+ while (<ACCESS>) {
chomp;
next if /^#/;
($accuser, undef) = split /\s/;
$accuser =~ s/_//g;
print "access user: $accuser\n" if $debug;
$access{$accuser} = 1;
+ }
+ close ACCESS;
}
-close ACCESS;
-open (AUTHORS, "$cvs $authorsfile |") || die "checkout $authorsfile: $!\n";
+open (AUTHORS, "$cvs_pfx $doccvsroot $cvs_sfx $authorsfile |") ||
+ die "checkout $authorsfile: $!\n";
while (<AUTHORS>) {
$author = $1 if /ENTITY a\.([^ ]+)/;
next if !$author;
diff --git a/tools/diag/ac/ent.sh b/tools/diag/ac/ent.sh
index 83d5005..fbc2219 100644
--- a/tools/diag/ac/ent.sh
+++ b/tools/diag/ac/ent.sh
@@ -1,13 +1,13 @@
#!/bin/sh -x
-# Copyright (c) 2002 Alexey Zelkin <phantom@FreeBSD.org>
+# Copyright (c) 2002,2003 Alexey Zelkin <phantom@FreeBSD.org>
#
# ent.sh -- this script checks {authors,teams}.ent files for correctness
#
# $FreeBSD$
-: ${CVSROOT=/home/ncvs}
+: ${CVSROOT=/home/dcvs}
prefix=doc/en_US.ISO8859-1/share/sgml
-cvs='cvs -Q co -p'
+cvs='cvs -Q -R co -p'
diff='diff -u'
tmp=${TMPDIR-/tmp}/_entities
OpenPOWER on IntegriCloud