tTwo bug fixes. - plan9port - [fork] Plan 9 from user space
HTML git clone git://src.adamsgaard.dk/plan9port
DIR Log
DIR Files
DIR Refs
DIR README
DIR LICENSE
---
DIR commit 5e77b8bb616bdc146b726f7d3301a271dd08f3c2
DIR parent 97f2be1c5fee53e32c79175ae05a0f1b1fffe331
HTML Author: rsc <devnull@localhost>
Date: Wed, 23 Mar 2005 20:19:53 +0000
Two bug fixes.
1. Make sure cmdname NUL-terminates its arguments.
2. Fix the elogapply warning, hopefully.
Diffstat:
M src/cmd/acme/ecmd.c | 16 ++++++----------
M src/cmd/acme/elog.c | 58 +++++++++++++------------------
2 files changed, 31 insertions(+), 43 deletions(-)
---
DIR diff --git a/src/cmd/acme/ecmd.c b/src/cmd/acme/ecmd.c
t@@ -137,7 +137,6 @@ edittext(Window *w, int q, Rune *r, int nr)
case Inactive:
return "permission denied";
case Inserting:
- w->neditwrsel += nr;
eloginsert(f, q, r, nr);
return nil;
case Collecting:
t@@ -215,7 +214,7 @@ c_cmd(Text *t, Cmd *cp)
{
elogreplace(t->file, addr.r.q0, addr.r.q1, cp->u.text->r, cp->u.text->n);
t->q0 = addr.r.q0;
- t->q1 = addr.r.q0+cp->u.text->n;
+ t->q1 = addr.r.q1;
return TRUE;
}
t@@ -520,7 +519,7 @@ s_cmd(Text *t, Cmd *cp)
if(!didsub && nest==0)
editerror("no substitution");
t->q0 = addr.r.q0;
- t->q1 = addr.r.q1+delta;
+ t->q1 = addr.r.q1;
return TRUE;
Err:
t@@ -602,7 +601,6 @@ runpipe(Text *t, int cmd, Rune *cr, int ncr, int state)
w = t->w;
t->q0 = addr.r.q0;
t->q1 = addr.r.q1;
- w->neditwrsel = 0;
if(cmd == '<' || cmd=='|')
elogdelete(t->file, t->q0, t->q1);
}
t@@ -632,10 +630,6 @@ runpipe(Text *t, int cmd, Rune *cr, int ncr, int state)
editing = Inactive;
if(t!=nil && t->w!=nil)
winlock(t->w, 'M');
- if(state == Inserting){
- t->q0 = addr.r.q0;
- t->q1 = addr.r.q0 + t->w->neditwrsel;
- }
}
int
t@@ -746,7 +740,7 @@ append(File *f, Cmd *cp, long p)
if(cp->u.text->n > 0)
eloginsert(f, p, cp->u.text->r, cp->u.text->n);
f->curtext->q0 = p;
- f->curtext->q1 = p+cp->u.text->n;
+ f->curtext->q1 = p;
return TRUE;
}
t@@ -1307,8 +1301,10 @@ cmdname(File *f, String *str, int set)
runemove(r, s, n);
}else{
newname = dirname(f->curtext, runestrdup(s), n);
- r = newname.r;
n = newname.nr;
+ r = runemalloc(n+1);
+ runemove(r, newname.r, n);
+ free(newname.r);
}
fc.f = f;
fc.r = r;
DIR diff --git a/src/cmd/acme/elog.c b/src/cmd/acme/elog.c
t@@ -218,7 +218,7 @@ elogapply(File *f)
Buflog b;
Rune *buf;
uint i, n, up, mod;
- uint q0, q1, tq0, tq1;
+ uint tq0, tq1;
Buffer *log;
Text *t;
t@@ -230,14 +230,14 @@ elogapply(File *f)
mod = FALSE;
/*
- * The edit commands have already updated the selection in t->q0, t->q1.
- * (At least, they are supposed to have updated them.
- * We still keep finding commands that don't do it right.)
- * The textinsert and textdelete calls below will update it again, so save the
- * current setting and restore it at the end.
+ * The edit commands have already updated the selection in t->q0, t->q1,
+ * but using coordinates relative to the unmodified buffer. As we apply the log,
+ * we have to update the coordinates to be relative to the modified buffer.
+ * Textinsert and textdelete will do this for us; our only work is to apply the
+ * convention that an insertion at t->q0==t->q1 is intended to select the
+ * inserted text.
*/
- q0 = t->q0;
- q1 = t->q1;
+
/*
* We constrain the addresses in here (with textconstrain()) because
* overlapping changes will generate bogus addresses. We will warn
t@@ -256,8 +256,8 @@ elogapply(File *f)
case Replace:
if(tracelog)
- warning(nil, "elog replace %d %d\n",
- b.q0, b.q0+b.nd);
+ warning(nil, "elog replace %d %d (%d %d)\n",
+ b.q0, b.q0+b.nd, t->q0, t->q1);
if(!mod){
mod = TRUE;
filemark(f);
t@@ -272,12 +272,14 @@ elogapply(File *f)
bufread(log, up+i, buf, n);
textinsert(t, tq0+i, buf, n, TRUE);
}
+ if(t->q0 == b.q0 && t->q1 == b.q0)
+ t->q1 += b.nr;
break;
case Delete:
if(tracelog)
- warning(nil, "elog delete %d %d\n",
- b.q0, b.q0+b.nd);
+ warning(nil, "elog delete %d %d (%d %d)\n",
+ b.q0, b.q0+b.nd, t->q0, t->q1);
if(!mod){
mod = TRUE;
filemark(f);
t@@ -288,8 +290,8 @@ elogapply(File *f)
case Insert:
if(tracelog)
- warning(nil, "elog insert %d %d\n",
- b.q0, b.q0+b.nr);
+ warning(nil, "elog insert %d %d (%d %d)\n",
+ b.q0, b.q0+b.nr, t->q0, t->q1);
if(!mod){
mod = TRUE;
filemark(f);
t@@ -303,6 +305,8 @@ elogapply(File *f)
bufread(log, up+i, buf, n);
textinsert(t, tq0+i, buf, n, TRUE);
}
+ if(t->q0 == b.q0 && t->q1 == b.q0)
+ t->q1 += b.nr;
break;
/* case Filename:
t@@ -323,28 +327,16 @@ elogapply(File *f)
bufdelete(log, up, log->nc);
}
fbuffree(buf);
- if(warned){
- /*
- * Changes were out of order, so the q0 and q1
- * computed while generating those changes are not
- * to be trusted.
- */
- q1 = min(q1, f->b.nc);
- q0 = min(q0, q1);
- }
elogterm(f);
/*
- * The q0 and q1 are supposed to be fine (see comment
- * above, where we saved them), but bad addresses
- * will cause bufload to crash, so double check.
+ * Bad addresses will cause bufload to crash, so double check.
+ * If changes were out of order, we expect problems so don't complain further.
*/
- if(q0 > f->b.nc || q1 > f->b.nc || q0 > q1){
- warning(nil, "elogapply: can't happen %d %d %d\n", q0, q1, f->b.nc);
- q1 = min(q1, f->b.nc);
- q0 = min(q0, q1);
+ if(t->q0 > f->b.nc || t->q1 > f->b.nc || t->q0 > t->q1){
+ if(!warned)
+ warning(nil, "elogapply: can't happen %d %d %d\n", t->q0, t->q1, f->b.nc);
+ t->q1 = min(t->q1, f->b.nc);
+ t->q0 = min(t->q0, t->q1);
}
-
- t->q0 = q0;
- t->q1 = q1;
}