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

merge

Browse source
This commit is contained in:
Ori Bernstein 2019-11-19 12:31:42 -08:00
parent 0b6f0c70db 2c9e3861a5
commit eca7cac908
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/src/cmd/rio/wind.c
View file

@ -406,7 +406,7 @@ winctl(void *arg)
t = "notcurrent"; t = "notcurrent";
if(w == input) if(w == input)
t = "current"; t = "current";
pair.ns = snprint(pair.s, pair.ns, "%11d %11d %11d %11d %11s %11s ", pair.ns = snprint(pair.s, pair.ns+1, "%11d %11d %11d %11d %11s %11s ",
w->i->r.min.x, w->i->r.min.y, w->i->r.max.x, w->i->r.max.y, t, s); w->i->r.min.x, w->i->r.min.y, w->i->r.max.x, w->i->r.max.y, t, s);
send(crm.c2, &pair); send(crm.c2, &pair);
continue; continue;

4
sys/src/cmd/rio/xfid.c
View file

@ -670,9 +670,9 @@ xfidread(Xfid *x)
} }
c1 = crm.c1; c1 = crm.c1;
c2 = crm.c2; c2 = crm.c2;
pair.ns = cnt+UTFmax+1; /* room for partial rune and null byte */ t = emalloc(cnt+UTFmax+1); /* room to unpack partial rune plus */
t = emalloc(pair.ns);
pair.s = t; pair.s = t;
pair.ns = cnt;
send(c1, &pair); send(c1, &pair);
recv(c2, &pair); recv(c2, &pair);
fc.data = pair.s; fc.data = pair.s;