o5r/plan9port
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

changes from plan 9

Browse source
This commit is contained in:
rsc 2004-12-27 01:16:26 +00:00
parent 334cb1e91c
commit 6d7fdb243c
6 changed files with 31 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/cmd/acme/acme.c
View file

@ -113,6 +113,9 @@ threadmain(int argc, char *argv[])
exits("usage");
}ARGEND
fontnames[0] = estrdup(fontnames[0]);
fontnames[1] = estrdup(fontnames[1]);
quotefmtinstall();
cputype = getenv("cputype");
objtype = getenv("objtype");
@ -218,9 +221,7 @@ threadmain(int argc, char *argv[])
#define WPERCOL 8
disk = diskinit();
if(loadfile)
rowload(&row, loadfile, TRUE);
else{
if(!loadfile || !rowload(&row, loadfile, TRUE)){
rowinit(&row, screen->clipr);
if(ncol < 0){
if(argc == 0)
@ -859,7 +860,7 @@ rfget(int fix, int save, int setfont, char *name)
}
r = emalloc(sizeof(Reffont));
r->f = f;
fontcache = realloc(fontcache, (nfontcache+1)*sizeof(Reffont*));
fontcache = erealloc(fontcache, (nfontcache+1)*sizeof(Reffont*));
fontcache[nfontcache++] = r;
}
Found:
@ -868,8 +869,10 @@ rfget(int fix, int save, int setfont, char *name)
if(reffonts[fix])
rfclose(reffonts[fix]);
reffonts[fix] = r;
free(fontnames[fix]);
fontnames[fix] = name;
if(fontnames[fix] != name){
free(fontnames[fix]);
fontnames[fix] = estrdup(name);
}
}
if(setfont){
reffont.f = r->f;