X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?p=xfonts-traditional.git;a=blobdiff_plain;f=update-xfonts-traditional;h=895be6d5671bcda3db31455eccac0c2da3373572;hp=8e04e603196197b4a964a174784d4a7f68c82c95;hb=2d9539f97699336be426dc3554309b3e52ff4079;hpb=60a64b7f4871c5e58537ab8d63a44c8a1141bffc

diff --git a/update-xfonts-traditional b/update-xfonts-traditional
index 8e04e60..895be6d 100755
--- a/update-xfonts-traditional
+++ b/update-xfonts-traditional
@@ -23,6 +23,8 @@ our $verbose=0;
 our $reportfh;
 our $foundryinfo;
 our %props;
+our $tolerate_bad_fonts=1;
+our $always_reprocess;
 our $wanted_parallel;
 
 sub reportloaded {
@@ -59,14 +61,16 @@ 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/\;$//;
 	    local ($_) = $glyph;
 	    my $key= sprintf "%s,%d,%d,%d,%d", $foundry,$w,$h,$xo,$yo;
 	    my $rules= loadrules($key);
-	    return (0,'no rules') if !$rules;
+	    return 'no rules' if !$rules;
 	    $rules->();
 	    $modified += ($_ ne $glyph);
 	    print $outbdf $_,"\n" or die $!
@@ -82,22 +86,22 @@ sub processbdf ($$$$) {
 	}
 	if ($state eq 'idle' && m/^FOUNDRY\s+/) {
 	    die if defined $foundry;
-	    return (0,'foundry syntax') unless m/^FOUNDRY\s+\"(\w+)\"\s+/;
+	    return 'foundry syntax' unless m/^FOUNDRY\s+\"(\w+)\"\s+/;
 	    $foundry = $foundrymap{lc $1};
-	    return (0,'no foundry') unless defined $foundry;
+	    return 'no foundry' unless defined $foundry;
 	    $_ = "FOUNDRY \"$foundry\"\n";
 	}
 	if ($state eq 'idle' && m/^FONT\s+/) {
 	    die if defined $font;
-	    return (0,'simple font name') unless m/^(FONT\s+)\-(\w+)\-/;
+	    return 'simple font name' unless m/^(FONT\s+)\-(\w+)\-/;
 	    $font = $foundrymap{lc $2};
-	    return (0,'no foundry') unless defined $font;
+	    return 'no foundry' unless defined $font;
 	    $_ = "FONT -$font-$'";
 	}
 	if ($state eq 'idle' && m/^STARTCHAR\s/) {
 	    die unless defined $foundry;
 	    die unless defined $font;
-	    return (0,'foundry != font') unless $foundry eq $font;
+	    return 'foundry != font' unless $foundry eq $font;
 	    $state='startchar';
 	    $w=undef;
 	}
@@ -124,6 +128,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 +178,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 +204,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 +223,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;
 }
@@ -239,14 +288,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 = { };
@@ -284,7 +336,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 +457,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 ($$) {