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

acme: fix Load bug (Fazlul Shahriar)

Browse source
This commit is contained in:
Russ Cox 2008-12-06 16:24:47 -08:00
parent d85332fc43
commit cb53addfae
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/cmd/acme/rows.c
View file

@ -657,7 +657,7 @@ rowload(Row *row, char *file, int initing)
memmove(t, l, Blinelen(b)); memmove(t, l, Blinelen(b));
run(nil, t, r, nr, TRUE, nil, nil, FALSE); run(nil, t, r, nr, TRUE, nil, nil, FALSE);
/* r is freed in run() */ /* r is freed in run() */
continue; goto Nextline;
case 'f': case 'f':
if(Blinelen(b) < 1+5*12+1) if(Blinelen(b) < 1+5*12+1)
goto Rescue2; goto Rescue2;
@ -703,7 +703,7 @@ rowload(Row *row, char *file, int initing)
else else
w = coladd(c, nil, lookid(dumpid, TRUE), y); w = coladd(c, nil, lookid(dumpid, TRUE), y);
if(w == nil) if(w == nil)
continue; goto Nextline;
w->dumpid = j; w->dumpid = j;
l = rdline(b, &line); l = rdline(b, &line);
if(l == nil) if(l == nil)
@ -769,6 +769,7 @@ rowload(Row *row, char *file, int initing)
q0 = q1 = 0; q0 = q1 = 0;
textshow(&w->body, q0, q1, 1); textshow(&w->body, q0, q1, 1);
w->maxlines = min(w->body.fr.nlines, max(w->maxlines, w->body.fr.maxlines)); w->maxlines = min(w->body.fr.nlines, max(w->maxlines, w->body.fr.maxlines));
Nextline:
l = rdline(b, &line); l = rdline(b, &line);
if(l == nil) if(l == nil)
break; break;