Commit Diff

Commit:
75a851e927dd7f8e562b0fd35490783b44966c9f
From:
Russ Cox <rsc@swtch.com>
Date:
Message:
acme: fix off by one in editcmd, pointer comparison in getch, nextc R=r http://codereview.appspot.com/868046
Actions:
Patch | Tree
commit - efe48aa6703ce0ede31ce96792ace707c2b5c3b3
commit + 75a851e927dd7f8e562b0fd35490783b44966c9f
blob - f1a7d67f8700a87daec76c26fd5ae03aa197cb7d
blob + 4495bf6976cddc6757224157871e72c1465ebc99
--- src/cmd/acme/edit.c
+++ src/cmd/acme/edit.c
@@ -164,7 +164,7 @@ editcmd(Text *ct, Rune *r, uint n)
 		free(cmdstartp);
 	cmdstartp = runemalloc(n+2);
 	runemove(cmdstartp, r, n);
-	if(r[n] != '\n')
+	if(r[n-1] != '\n')
 		cmdstartp[n++] = '\n';
 	cmdstartp[n] = '\0';
 	cmdendp = cmdstartp+n;
@@ -195,7 +195,7 @@ editcmd(Text *ct, Rune *r, uint n)
 int
 getch(void)
 {
-	if(*cmdp == *cmdendp)
+	if(cmdp == cmdendp)
 		return -1;
 	return *cmdp++;
 }
@@ -203,7 +203,7 @@ getch(void)
 int
 nextc(void)
 {
-	if(*cmdp == *cmdendp)
+	if(cmdp == cmdendp)
 		return -1;
 	return *cmdp;
 }