X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=xfonts-traditional.git;a=blobdiff_plain;f=update-xfonts-traditional;h=494d637969ddcf53db31e94c9201ccc45d3518c0;hp=619e2faca737ba00378e20d854de4a11d050a679;hb=fbafd43c60babe5532e3b18ee5d1abdd412fbee9;hpb=1bbbeaf42afa4e7af424db60b2385fde0fb8ff48

diff --git a/update-xfonts-traditional b/update-xfonts-traditional
index 619e2fa..494d637 100755
--- a/update-xfonts-traditional
+++ b/update-xfonts-traditional
@@ -16,6 +16,7 @@ our @fonttrees=qw(/usr/share/fonts/X11 /usr/local/share/fonts/X11);
 our $donefile="$package.done";
 our $logfile="$package.log";
 our $fontprefix="trad--";
+our $bdfnorm="bdfnorm";
 our @rulespath;
 our $mode;
 our %foundrymap;
@@ -23,6 +24,8 @@ our $verbose=0;
 our $reportfh;
 our $foundryinfo;
 our %props;
+our $tolerate_bad_fonts=1;
+our $always_reprocess;
 our $wanted_parallel;
 
 sub reportloaded {
@@ -53,13 +56,15 @@ sub loadrules ($) {
 }
 
 sub processbdf ($$$$) {
-    my ($inbdf,$outbdf,$logfile,$what) = @_;
+    my ($inbdf,$outbdf,$logfh,$what) = @_;
     my $state='idle';
     my ($foundry,$font);
     my ($w,$h,$xo,$yo,$y,$bitmap,$glyph);
     my $modified=0;
     %props = ();
+    my $anyinput=0;
     while (<$inbdf>) {
+	$anyinput=1;
 	if ($state eq 'bitmap' && $y==$h) {
 	    $glyph = uc $glyph;
 	    $glyph =~ s/\;$//;
@@ -124,11 +129,13 @@ sub processbdf ($$$$) {
     die $! if $inbdf->error;
     die $! if $outbdf->error or !$outbdf->flush;
     die unless $state eq 'idle';
+    return 'no bdf data' # also special cased in processpcfgz
+	if !$anyinput;
     if ($modified) {
-	printf $logfile "%s: %d glyphs changed\n", $what, $modified
+	printf $logfh "%s: %d glyphs changed\n", $what, $modified
 	    or die $!;
     } else {
-	printf $logfile "%s: unchanged - no rules matched\n", $what
+	printf $logfh "%s: unchanged - no rules matched\n", $what
 	    or die $!;
     }
     return $modified;
@@ -154,7 +161,7 @@ sub loadfoundries () {
 	while (<$f>) {
 	    s/^\s*//; s/\s+$//;
 	    next if m/^\#/;
-	    m/^(\w+)\s+(\w+)$/ or die;
+	    m/^([.0-9A-Za-z]+)\s+([.0-9A-Za-z]+)$/ or die;
 	    my $k = lc $1;
 	    next if exists $foundrymap{$k};
 	    $foundrymap{$k}=$2;
@@ -165,15 +172,24 @@ sub loadfoundries () {
     die "no foundry maps\n" unless %foundrymap;
 }
 
-sub processpcfgz ($$$$) {
-    my ($inpcfgz,$outpcfgz,$logfile,$what) = @_;
-    print $reportfh "processing $inpcfgz to $outpcfgz\n" if $verbose>=2;
-    my $current = new IO::File $inpcfgz, '<' or die "$inpcfgz $!";
-    my ($usread,$uswrite);
+our %ch;
+
+sub filter_st_isok ($) {
+    my ($ch) = @_;
+    my $st = $ch->{St};
+    return !$st || $ch->{SigOK}{($st & ~128)};
+}
+
+sub process_filter ($$$$$$$$) {
+    my ($rr, $input, $output,$what,$logfh,
+	$procs, $sigpipeok, $after_hook) = @_;
     my ($reader,$writer);
     my @children;
-    foreach my $proc (['gunzip'], ['pcf2bdf'], [],
-		      ['bdftopcf'],['',qw(gzip -1 -n)]) {
+    my ($usread,$uswrite);
+
+    my $current = $input;
+
+    foreach my $proc (@$procs) {
 	my $isfinal = (@$proc && $proc->[0] eq '');
 	if (!$isfinal) {
 	    $reader = new IO::Handle or die $!;
@@ -182,7 +198,7 @@ sub processpcfgz ($$$$) {
 	} else {
 	    shift @$proc;
 	    $reader = undef;
-	    $writer = new IO::File $outpcfgz, '>' or die "$outpcfgz $!";
+	    $writer = $output;
 	}
 	if (@$proc) {
 	    my $exe = $proc->[0];
@@ -197,7 +213,14 @@ sub processpcfgz ($$$$) {
 		close $uswrite or die $! if $uswrite;
 		exec $exe @$proc or die "$exe $!";
 	    }
-	    push @children, [ $child, $exe, defined $usread ];
+	    my $ch = {
+		Pid => $child,
+		Exe => $exe,
+		Stage => (!$exe ? 'self' : defined $usread ? 'out' : 'in'),
+		SigOK => { },
+	    };
+	    push @children, $ch;
+	    $ch{$exe} = $ch;
 	    close $current or die $!;
 	    close $writer or die $!;
 	    $current = $reader;
@@ -207,28 +230,85 @@ sub processpcfgz ($$$$) {
 	    $current = $reader;
 	}
     }
-    my $r = processbdf($usread,$uswrite,$logfile,$what);
-    my $none = $r !~ m/^\d/;
-    if ($none) {
+    $$rr = processbdf($usread,$uswrite,$logfh,$what);
+    my $none = $$rr !~ m/^\d/;
+
+    $ch{$_}{SigOK}{13} = 1 foreach @$sigpipeok;
+
+    if ($none || !$$rr) {
+	# We're not going to install or use this so we can kill our
+	# input and output filters.  We kill the input filters so that
+	# we don't risk waiting for them.  (If the input filter died
+	# for some other reason then sending it a KILL now won't
+	# affect its exit status.)  We kill the output filters (before
+	# we close the output pipe) so we don't produce messages from
+	# our output filters about corrupted data.  And we tolerate
+	# SIGPIPE in all the input filters.
 	flush $uswrite or die $!;
-    } else {
-	close $uswrite or die $!;
-    }
-    close $usread or die $!;
-    foreach my $chinfo (@children) {
-	my ($child,$exe,$isoutput)=@$chinfo;
-	my $sigok = 0;
-	if ($none) {
-	    if ($isoutput) {
-		$sigok = 9;
-		kill 9, $child or die "$child $!";
+
+	my $filterkind = 'input';
+	foreach my $ch (@children) {
+	    if ($ch->{Stage} ne 'self') {
+		kill 9, $ch->{Pid} or die "$ch->{Pid} $ch->{Exe} $!";
+		$ch->{SigOK}{9} = 1;
 	    } else {
-		$sigok = 13;
+		$filterkind = 'output';
+		next;
+	    }
+	    if ($filterkind eq 'input') {
+		$ch->{SigOK}{13} = 1;
 	    }
 	}
-	$!=0; waitpid($child, 0) == $child or die "$child $!";
-	!$? or ($?&~128)==$sigok or die "$exe [$child] $sigok $?";
+	# ... we might not have read all the output from pcf2bdf, which is OK
     }
+
+    close $uswrite or die $!;
+    close $usread or die $!;
+
+    foreach my $ch (@children) {
+	$!=0; waitpid($ch->{Pid}, 0) == $ch->{Pid} or
+	    die "$ch->{Pid} $ch->{Exe} $!";
+	$ch->{St} = $?;
+    }
+
+    $after_hook->();
+
+    foreach my $ch (@children) {
+	if (!filter_st_isok($ch)) {
+	    die "update-xfonts-traditional:".
+		" $ch->{Exe} [$ch->{Pid}] for $what".
+		" failed $ch->{St}".
+		" (".(join ' ', keys %{ $ch->{SigOK} })." ok)\n";
+	}
+    }
+}
+
+sub processpcfgz ($$$$) {
+    my ($inpcfgz,$outpcfgz,$logfh,$what) = @_;
+    print $reportfh "processing $inpcfgz to $outpcfgz\n" if $verbose>=2;
+    my $input = new IO::File $inpcfgz, '<' or die "$inpcfgz $!";
+    my $output = new IO::File $outpcfgz, '>' or die "$outpcfgz $!";
+
+    my $r;
+    process_filter(\$r, $input, $output, $inpcfgz, $logfh,
+        [
+	    ['gunzip'], ['pcf2bdf'], [$bdfnorm],
+	    [],
+	    ['bdftopcf'],['',qw(gzip -1 -n)]
+	],
+        [qw(gunzip)],
+	# ... we never care if pcf2bdf didn't want all the data
+        sub {
+	    if ($tolerate_bad_fonts &&
+		$r eq 'no bdf data' &&
+		filter_st_isok($ch{'gunzip'}) &&
+		($ch{'pcf2bdf'}{St} & ~128) == 6)
+	    {
+		$r = "pcf2bdf failed ($ch{'pcf2bdf'}{St})";
+		print STDERR "warning: $r: skipping $inpcfgz\n";
+		$ch{'pcf2bdf'}{SigOK}{6} = 1;
+	    }
+    });
     return $r;
 }
 
@@ -239,14 +319,17 @@ sub processfontdir ($) {
 	return;
     }
     my $changed = 0;
-    my $olddone = do "$fontdir/$donefile";
-    if (!$olddone) {
-	die "$fontdir $! $@ " unless $!==&ENOENT;
-    } elsif ($olddone->{''} ne $foundryinfo) {
-	our $repro_reported;
-	print $reportfh "reprocessing fonts (rules updated)\n" or die $!
-	    unless $repro_reported++;
-	$olddone = undef;
+    my $olddone;
+    if (!$always_reprocess) {
+	$olddone = do "$fontdir/$donefile";
+	if (!$olddone) {
+	    die "$fontdir $! $@ " unless $!==&ENOENT;
+	} elsif ($olddone->{''} ne $foundryinfo) {
+	    our $repro_reported;
+	    print $reportfh "reprocessing fonts (rules updated)\n" or die $!
+		unless $repro_reported++;
+	    $olddone = undef;
+	}
     }
     if (!$olddone) {
 	$olddone = { };
@@ -260,7 +343,7 @@ sub processfontdir ($) {
 
     my $logpath = "$fontdir/$logfile";
     unlink "$logpath" or $!==&ENOENT or die "$logpath $!";
-    my $log = new IO::File $logpath, ">>" or die "$logpath $!";
+    my $logfh = new IO::File $logpath, ">>" or die "$logpath $!";
 
     if (!$wanted_parallel) {
 	$wanted_parallel = Sys::CPU::cpu_count();
@@ -284,7 +367,8 @@ sub processfontdir ($) {
 	    $outfiles{$outdent} |= 3;
 	} elsif ($?==2*256) {
 	} else {
-	    die "[$child] $dent $outdent $?";
+	    die "update-xfonts-traditional: processing of".
+		" $fontdir/$dent [$child] failed ($?)\n";
 	}
 	$newdone->{$dent} = $stats;
 	$changed = 1;
@@ -326,10 +410,10 @@ sub processfontdir ($) {
 	if (!$child) {
 	    my $r = processpcfgz("$fontdir/$dent",
 				 "$fontdir/$outdent.new",
-				 $log, $dent);
+				 $logfh, $dent);
 	    my $rc;
 	    if ($r !~ m/^\d/) {
-		printf $log "%s: unchanged - %s\n", $dent, $r;
+		printf $logfh "%s: unchanged - %s\n", $dent, $r;
 		unlink "$fontdir/$outdent.new" or die "$fontdir $outdent $!";
 		$rc = 2;
 	    } else {
@@ -337,7 +421,7 @@ sub processfontdir ($) {
 		    or die "$fontdir $outdent $!";
 		$rc = 0;
 	    }
-	    $log->flush or die "$logpath $!";
+	    $logfh->flush or die "$logpath $!";
 	    exit $rc;
 	}
 	$inprogress{$child} = {
@@ -404,6 +488,8 @@ our (@options)=(
     'share-dir=s' => \$sharedir,
     'verbose|v+' => \$verbose,
     'j|parallel=i' => \$wanted_parallel,
+    'always-reprocess!' => \$always_reprocess,
+    'tolerate-bad-fonts!' => \$tolerate_bad_fonts,
     );
 
 sub define_mode ($$) {
@@ -463,6 +549,7 @@ Getopt::Long::Configure(qw(bundling));
 GetOptions(@options) or exit 127;
 
 push @rulespath, "$sharedir/rules";
+$bdfnorm = "$sharedir/$bdfnorm";
 
 die "need a mode\n" unless $mode;