7 |
|
|
8 |
|
#include "copyright.h" |
9 |
|
|
10 |
< |
#include "standard.h" |
10 |
> |
#include <stdlib.h> |
11 |
|
|
12 |
+ |
#include "paths.h" |
13 |
+ |
#include "rtio.h" |
14 |
+ |
#include "rterror.h" |
15 |
|
#include "font.h" |
16 |
|
|
17 |
|
#define galloc(nv) (GLYPH *)malloc(sizeof(GLYPH)+2*sizeof(GORD)*(nv)) |
27 |
|
char *fname; |
28 |
|
{ |
29 |
|
FILE *fp; |
30 |
< |
char *pathname, *err; |
30 |
> |
char *pathname, *err = NULL; |
31 |
|
unsigned wsum, hsum, ngly; |
32 |
|
int gn, ngv, gv; |
33 |
|
register GLYPH *g; |
42 |
|
/* load the font file */ |
43 |
|
if ((pathname = getpath(fname, getrlibpath(), R_OK)) == NULL) { |
44 |
|
sprintf(errmsg, "cannot find font file \"%s\"", fname); |
45 |
< |
error(USER, errmsg); |
45 |
> |
error(SYSTEM, errmsg); |
46 |
|
} |
47 |
|
f = (FONT *)calloc(1, sizeof(FONT)); |
48 |
|
if (f == NULL) |
211 |
|
int cis; /* target intercharacter spacing */ |
212 |
|
int nsi; /* minimum number of spaces for indent */ |
213 |
|
{ |
214 |
< |
register char *end, *tab; |
214 |
> |
register char *end, *tab = NULL; |
215 |
|
GLYPH *gp; |
216 |
|
short *nsp; |
217 |
|
int alen, len, width; |