cirno/plan9port
1
0
Fork 0
mirror of https://github.com/9fans/plan9port.git synced 2025-01-12 11:10:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

src/cmd/fontsrv: pad subfile names to support correct file length

Browse source 
For fonts with subfiles that go beyond the xffff range, the font file size
calculation is incorrect, since lines beyond that range have additional
characters. This patch pads all of the ranges and subfont names with
leading zeros in order to keep them all lines the same length and fixes the
font file length calculation.
This commit is contained in:
Kyle Nusbaum 2022-01-10 16:19:54 -06:00 committed by Dan Cross
parent 686f5d035c
commit bb4b8acc26
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/cmd/fontsrv/main.c
View file

@ -102,12 +102,12 @@ dostat(vlong path, Qid *qid, Dir *dir)
case Qfontfile: case Qfontfile:
f = &xfont[QFONT(path)]; f = &xfont[QFONT(path)];
load(f); load(f);
length = 11+1+11+1+f->nfile*(6+1+6+1+9+1); length = 11+1+11+1+f->nfile*(8+1+8+1+11+1);
name = "font"; name = "font";
break; break;
case Qsubfontfile: case Qsubfontfile:
snprint(buf, sizeof buf, "x%04x.bit", (int)QRANGE(path)*SubfontSize); snprint(buf, sizeof buf, "x%06x.bit", (int)QRANGE(path)*SubfontSize);
name = buf; name = buf;
break; break;
} }
@ -189,7 +189,7 @@ xwalk1(Fid *fid, char *name, Qid *qid)
goto NotFound; goto NotFound;
p++; p++;
n = strtoul(p, &p, 16); n = strtoul(p, &p, 16);
if(p < name+5 || p > name+5 && name[1] == '0' || n%SubfontSize != 0 || n/SubfontSize >= MaxSubfont || strcmp(p, ".bit") != 0 || !f->range[n/SubfontSize]) if(p < name+7 || p > name+7 && name[1] == '0' || n%SubfontSize != 0 || n/SubfontSize >= MaxSubfont || strcmp(p, ".bit") != 0 || !f->range[n/SubfontSize])
goto NotFound; goto NotFound;
path += Qsubfontfile - Qsizedir + qpath(0, 0, 0, 0, n/SubfontSize); path += Qsubfontfile - Qsizedir + qpath(0, 0, 0, 0, n/SubfontSize);
break; break;
@ -320,7 +320,7 @@ xread(Req *r)
f->loadheight(f, QSIZE(path), &height, &ascent); f->loadheight(f, QSIZE(path), &height, &ascent);
fmtprint(&fmt, "%11d %11d\n", height, ascent); fmtprint(&fmt, "%11d %11d\n", height, ascent);
for(i=0; i<f->nfile; i++) for(i=0; i<f->nfile; i++)
fmtprint(&fmt, "0x%04x 0x%04x x%04x.bit\n", f->file[i]*SubfontSize, ((f->file[i]+1)*SubfontSize) - 1, f->file[i]*SubfontSize); fmtprint(&fmt, "0x%06x 0x%06x x%06x.bit\n", f->file[i]*SubfontSize, ((f->file[i]+1)*SubfontSize) - 1, f->file[i]*SubfontSize);
f->fonttext = fmtstrflush(&fmt); f->fonttext = fmtstrflush(&fmt);
f->nfonttext = strlen(f->fonttext); f->nfonttext = strlen(f->fonttext);
} }