commit 9d8396d340603bdbafab4842fc4864f486f069b5
author David Lawrence Ramsey <pooka109@gmail.com> Fri Jul 08 04:53:51 2005 +0000
committer David Lawrence Ramsey <pooka109@gmail.com> Fri Jul 08 04:53:51 2005 +0000
tree 3a2c88548adbb01de8ac93f6142ba0e794fa92ab
parent f8cb832b5028b3f23c1e69f4d1b08c472bb4d34e

miscellaneous minor fixes


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2833 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

src/winio.c

diff --git a/src/winio.c b/src/winio.c
index 5898335..1b71ab3 100644
--- a/src/winio.c
+++ b/src/winio.c
@@ -1912,7 +1912,7 @@
 {
     char *char_mb;
     int char_mb_len;
-    bool started_on_word = FALSE;
+    bool end_line = FALSE, started_on_word = FALSE;
 
     assert(answer != NULL);
 
@@ -1920,7 +1920,7 @@
 
     /* Move forward until we find the character after the last letter of
      * the current word. */
-    while (answer[statusbar_x] != '\0') {
+    while (!end_line) {
 	char_mb_len = parse_mbchar(answer + statusbar_x, char_mb, NULL,
 		NULL);
 
@@ -1933,14 +1933,19 @@
 	 * started_on_word to TRUE. */
 	started_on_word = TRUE;
 
-	statusbar_x += char_mb_len;
+	if (answer[statusbar_x] == '\0')
+	    end_line = TRUE;
+	else
+	    statusbar_x += char_mb_len;
     }
 
     /* Move forward until we find the first letter of the next word. */
-    if (answer[statusbar_x] != '\0')
+    if (answer[statusbar_x] == '\0')
+	end_line = TRUE;
+    else
 	statusbar_x += char_mb_len;
 
-    while (answer[statusbar_x] != '\0') {
+    while (!end_line) {
 	char_mb_len = parse_mbchar(answer + statusbar_x, char_mb, NULL,
 		NULL);
 
@@ -1949,7 +1954,10 @@
 	if (is_word_mbchar(char_mb, allow_punct))
 	    break;
 
-	statusbar_x += char_mb_len;
+	if (answer[statusbar_x] == '\0')
+	    end_line = TRUE;
+	else
+	    statusbar_x += char_mb_len;
     }
 
     free(char_mb);