fix typo

[xfonts-traditional.git] / update-xfonts-traditional

diff --git a/update-xfonts-traditional b/update-xfonts-traditional
index 619e2faca737ba00378e20d854de4a11d050a679..63e9040d4a5572a8e14ba842526a48644c0a0621 100755 (executable)
--- a/update-xfonts-traditional
+++ b/update-xfonts-traditional
@@ -23,6 +23,7 @@ our $verbose=0;
 our $reportfh;
 our $foundryinfo;
 our %props;
+our $tolerate_bad_fonts=1;
 our $wanted_parallel;
 
 sub reportloaded {
@@ -59,7 +60,9 @@ sub processbdf ($$$$) {
     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,6 +127,8 @@ 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
            or die $!;
@@ -172,6 +177,7 @@ sub processpcfgz ($$$$) {
     my ($usread,$uswrite);
     my ($reader,$writer);
     my @children;
+    my %ch;
     foreach my $proc (['gunzip'], ['pcf2bdf'], [],
                      ['bdftopcf'],['',qw(gzip -1 -n)]) {
        my $isfinal = (@$proc && $proc->[0] eq '');
@@ -197,7 +203,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;
@@ -209,25 +222,60 @@ sub processpcfgz ($$$$) {
     }
     my $r = processbdf($usread,$uswrite,$logfile,$what);
     my $none = $r !~ m/^\d/;
-    if ($none) {
+
+    $ch{'gunzip'}{SigOK}{13} = 1;
+    # ... we never care if pcf2bdf didn't want all the output from gunzip
+
+    if ($none || !$r) {
+       # 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.
        flush $uswrite or die $!;
-    } else {
-       close $uswrite or die $!;
+
+       foreach my $ch (@children) {
+           if ($ch->{Stage} ne 'self') {
+               kill 9, $ch->{Pid} or die "$ch->{Pid} $ch->{Exe} $!";
+               $ch->{SigOK}{9} = 1;
+           }
+       }
+       $ch{'pcf2bdf'}{SigOK}{13} = 1;
+       # ... we might not have read all the output from pcf2bdf, which is OK
     }
+    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 $!";
-           } else {
-               $sigok = 13;
-           }
+
+    foreach my $ch (@children) {
+       $!=0; waitpid($ch->{Pid}, 0) == $ch->{Pid} or
+           die "$ch->{Pid} $ch->{Exe} $!";
+       $ch->{St} = $?;
+    }
+
+    my $st_isok = sub {
+       my ($ch) = @_;
+       my $st = $ch->{St};
+       return !$st || $ch->{SigOK}{($st & ~128)};
+    };
+
+    if ($tolerate_bad_fonts &&
+       $r eq 'no bdf data' &&
+       $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;
+    }
+    foreach my $ch (@children) {
+       if (!$st_isok->($ch)) {
+           die "update-xfonts-traditional:".
+               " $ch->{Exe} [$ch->{Pid}] for $inpcfgz".
+               " failed $ch->{St}".
+               " (".(join ' ', keys %{ $ch->{SigOK} })." ok)\n";
        }
-       $!=0; waitpid($child, 0) == $child or die "$child $!";
-       !$? or ($?&~128)==$sigok or die "$exe [$child] $sigok $?";
     }
     return $r;
 }
@@ -284,7 +332,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;
@@ -404,6 +453,7 @@ our (@options)=(
     'share-dir=s' => \$sharedir,
     'verbose|v+' => \$verbose,
     'j|parallel=i' => \$wanted_parallel,
+    'tolerate-bad-fonts!' => \$tolerate_bad_fonts,
     );
 
 sub define_mode ($$) {