tacme: fix off by one in editcmd, pointer comparison in getch, nextc - plan9port - [fork] Plan 9 from user space (HTM) git clone git://src.adamsgaard.dk/plan9port (DIR) Log (DIR) Files (DIR) Refs (DIR) README (DIR) LICENSE --- (DIR) commit 75a851e927dd7f8e562b0fd35490783b44966c9f (DIR) parent efe48aa6703ce0ede31ce96792ace707c2b5c3b3 (HTM) Author: Russ Cox <rsc@swtch.com> Date: Wed, 14 Jul 2010 11:08:42 -0700 acme: fix off by one in editcmd, pointer comparison in getch, nextc R=r http://codereview.appspot.com/868046 Diffstat: M src/cmd/acme/edit.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- (DIR) diff --git a/src/cmd/acme/edit.c b/src/cmd/acme/edit.c t@@ -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; t@@ -195,7 +195,7 @@ editcmd(Text *ct, Rune *r, uint n) int getch(void) { - if(*cmdp == *cmdendp) + if(cmdp == cmdendp) return -1; return *cmdp++; } t@@ -203,7 +203,7 @@ getch(void) int nextc(void) { - if(*cmdp == *cmdendp) + if(cmdp == cmdendp) return -1; return *cmdp; }