15 |
|
#define galloc(nv) (GLYPH *)malloc(sizeof(GLYPH)+2*sizeof(GORD)*(nv)) |
16 |
|
|
17 |
|
|
18 |
< |
extern char *fgetword(), *getlibpath(); |
18 |
> |
extern char *getlibpath(); |
19 |
|
|
20 |
|
static FONT *fontlist = NULL; /* list of loaded fonts */ |
21 |
|
|
24 |
|
getfont(fname) /* return font fname */ |
25 |
|
char *fname; |
26 |
|
{ |
27 |
– |
char buf[16]; |
27 |
|
FILE *fp; |
28 |
|
char *pathname, *err; |
29 |
|
unsigned wsum, hsum, ngly; |
30 |
< |
int gn, ngv; |
32 |
< |
register int gv; |
30 |
> |
int gn, ngv, gv; |
31 |
|
register GLYPH *g; |
32 |
|
GORD *gp; |
33 |
|
register FONT *f; |
50 |
|
error(SYSTEM, errmsg); |
51 |
|
} |
52 |
|
wsum = hsum = ngly = 0; |
53 |
< |
while (fgetword(buf,sizeof(buf),fp) != NULL) { /* get each glyph */ |
54 |
< |
if (!isint(buf)) |
53 |
> |
while ((ngv = fgetval(fp, 'i', &gn)) != EOF) { /* get each glyph */ |
54 |
> |
if (ngv == 0) |
55 |
|
goto nonint; |
58 |
– |
gn = atoi(buf); |
56 |
|
if (gn < 1 || gn > 255) { |
57 |
|
err = "illegal"; |
58 |
|
goto fonterr; |
61 |
|
err = "duplicate"; |
62 |
|
goto fonterr; |
63 |
|
} |
64 |
< |
if (fgetword(buf,sizeof(buf),fp) == NULL || !isint(buf) || |
68 |
< |
(ngv = atoi(buf)) < 0 || ngv > 32000) { |
64 |
> |
if (fgetval(fp, 'i', &ngv) <= 0 || ngv < 0 || ngv > 32000) { |
65 |
|
err = "bad # vertices for"; |
66 |
|
goto fonterr; |
67 |
|
} |
73 |
|
ngv *= 2; |
74 |
|
gp = gvlist(g); |
75 |
|
while (ngv--) { |
76 |
< |
if (fgetword(buf,sizeof(buf),fp) == NULL || |
81 |
< |
!isint(buf) || |
82 |
< |
(gv = atoi(buf)) < 0 || gv > 255) { |
76 |
> |
if (fgetval(fp, 'i', &gv) <= 0 || gv < 0 || gv > 255) { |
77 |
|
err = "bad vertex for"; |
78 |
|
goto fonterr; |
79 |
|
} |
152 |
|
if (f->fg[*tp++&0xff] == NULL) |
153 |
|
*sp++ = 0; |
154 |
|
else |
155 |
< |
linelen += *sp++ = 256; |
155 |
> |
linelen += *sp++ = 255; |
156 |
|
return(linelen); |
157 |
|
} |
158 |
|
|