processfontdir: better message for failures

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

diff --git a/update-xfonts-traditional b/update-xfonts-traditional
index 8e04e603196197b4a964a174784d4a7f68c82c95..8791e2273d10e119bab207895395d0059bef7576 100755 (executable)
--- a/update-xfonts-traditional
+++ b/update-xfonts-traditional
@@ -59,14 +59,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 +84,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 +126,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 $!;
@@ -284,7 +288,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;