xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

rio: don't hardcode font

Browse source
This commit is contained in:
cinap_lenrek 2011-12-09 21:44:02 +01:00
parent fa4dd2f2fe
commit 205f12720e
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
sys/src/cmd/rio/rio.c
View file

@ -167,20 +167,21 @@ threadmain(int argc, char *argv[])
startdir = estrdup(buf); startdir = estrdup(buf);
if(fontname == nil) if(fontname == nil)
fontname = getenv("font"); fontname = getenv("font");
if(fontname == nil)
fontname = "/lib/font/bit/lucm/unicode.9.font";
s = getenv("tabstop"); s = getenv("tabstop");
if(s != nil) if(s != nil)
maxtab = strtol(s, nil, 0); maxtab = strtol(s, nil, 0);
if(maxtab == 0) if(maxtab == 0)
maxtab = 4; maxtab = 4;
free(s); free(s);
if(fontname){
/* check font before barging ahead */ /* check font before barging ahead */
if(access(fontname, 0) < 0){ if(access(fontname, 0) < 0){
fprint(2, "rio: can't access %s: %r\n", fontname); fprint(2, "rio: can't access %s: %r\n", fontname);
exits("font open"); exits("font open");
} }
putenv("font", fontname); putenv("font", fontname);
}
snarffd = open("/dev/snarf", OREAD|OCEXEC); snarffd = open("/dev/snarf", OREAD|OCEXEC);