commit - a3c5df578fea1ccd9095ec08232b2c862e875f29
commit + e6f4b2e311cd461dd2d8380ba21ab113e5c8c072
blob - e9fa3f849b3460c32388918c7ca23cd73d194ba8
blob + a1ff278af9f2da9a6613a262f607e780d7a749ea
--- src/libdraw/openfont.c
+++ src/libdraw/openfont.c
{
Font *fnt;
int fd, i, n;
- char *buf;
+ char *buf, *nambuf, *root;
+ nambuf = 0;
fd = open(name, OREAD);
+
+ if(fd < 0 && strncmp(name, "/lib/font/bit/", 14) == 0){
+ root = getenv("PLAN9");
+ if(root == nil)
+ return 0;
+ nambuf = malloc(strlen(root)+5+strlen(name+13)+1);
+ if(nambuf == nil)
+ return 0;
+ strcpy(nambuf, root);
+ strcat(nambuf, "/font");
+ strcat(nambuf, name+13);
+ if((fd = open(nambuf, OREAD)) < 0){
+ free(nambuf);
+ return 0;
+ }
+ name = nambuf;
+ }
if(fd < 0)
return 0;
buf = malloc(n+1);
if(buf == 0){
close(fd);
+ free(nambuf);
return 0;
}
buf[n] = 0;
close(fd);
if(i != n){
free(buf);
+ free(nambuf);
return 0;
}
fnt = buildfont(d, buf, name);
free(buf);
+ free(nambuf);
return fnt;
}