our $donefile="$package.done";
our $logfile="$package.log";
our $fontprefix="trad--";
+our $bdfnorm="bdfnorm";
our @rulespath;
our $mode;
our %foundrymap;
}
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);
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;
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;
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;
- my %ch;
- 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 $!;
} else {
shift @$proc;
$reader = undef;
- $writer = new IO::File $outpcfgz, '>' or die "$outpcfgz $!";
+ $writer = $output;
}
if (@$proc) {
my $exe = $proc->[0];
$current = $reader;
}
}
- my $r = processbdf($usread,$uswrite,$logfile,$what);
- my $none = $r !~ m/^\d/;
+ $$rr = processbdf($usread,$uswrite,$logfh,$what);
+ my $none = $$rr !~ m/^\d/;
- $ch{'gunzip'}{SigOK}{13} = 1;
- # ... we never care if pcf2bdf didn't want all the output from gunzip
+ $ch{$_}{SigOK}{13} = 1 foreach @$sigpipeok;
- if ($none || !$r) {
+ 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.
+ # our output filters about corrupted data. And we tolerate
+ # SIGPIPE in all the input filters.
flush $uswrite or die $!;
+ 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 {
+ $filterkind = 'output';
+ next;
+ }
+ if ($filterkind eq 'input') {
+ $ch->{SigOK}{13} = 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 $!;
$ch->{St} = $?;
}
- my $st_isok = sub {
- my ($ch) = @_;
- my $st = $ch->{St};
- return !$st || $ch->{SigOK}{($st & ~128)};
- };
+ $after_hook->();
- 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)) {
+ if (!filter_st_isok($ch)) {
die "update-xfonts-traditional:".
- " $ch->{Exe} [$ch->{Pid}] for $inpcfgz".
+ " $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;
}
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();
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 {
or die "$fontdir $outdent $!";
$rc = 0;
}
- $log->flush or die "$logpath $!";
+ $logfh->flush or die "$logpath $!";
exit $rc;
}
$inprogress{$child} = {
GetOptions(@options) or exit 127;
push @rulespath, "$sharedir/rules";
+$bdfnorm = "$sharedir/$bdfnorm";
die "need a mode\n" unless $mode;
~ian / xfonts-traditional.git / blobdiff