Changeset 7b4d90e for fmtext.c

Timestamp:

Sep 25, 2009, 7:43:51 PM (15 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

dd6af02

Parents:

da60ba9

Message:

Handle missing newline in owl_fmtext_truncate_cols

Fixes #51. Also document some behavior of the function and add a test.

Signed-off-by: David Benjamin <davidben@mit.edu>

File:

• fmtext.c (modified) (3 diffs)

fmtext.c

@@ -418 +418 @@
 /* Truncate the message so that each line begins at column 'acol' and
  * ends at 'bcol' or sooner.  The first column is number 0.  The new
- * message is placed in 'out'.  The message is * expected to end in a
- * new line for now. NOTE: This needs to be modified to deal with
- * backing up if we find a SPACING COMBINING MARK at the end of a
- * line. If that happens, we should back up to the last non-mark
- * character and stop there.
+ * message is placed in 'out'.
+ *
+ * NOTE: This needs to be modified to deal with backing up if we find
+ * a SPACING * COMBINING MARK at the end of a line. If that happens,
+ * we should back up to * the last non-mark character and stop there.
+ *
+ * NOTE: If a line ends at bcol, we omit the newline. This is so printing
+ * to ncurses works.
  */
 void owl_fmtext_truncate_cols(const owl_fmtext *in, int acol, int bcol, owl_fmtext *out)
@@ -439 +442 @@
     ptr_e=strchr(ptr_s, '\n');
     if (!ptr_e) {
-      /* but this shouldn't happen if we end in a \n */
-      break;
+      /* set it to the NULL at the end of the string, to handle a line that is
+       * not newline-terminated */
+      ptr_e = last+1;
     }
     
@@ -495 +499 @@
       owl_fmtext_append_normal(out, "\n");
     }
-    ptr_s = g_utf8_next_char(ptr_e);
+    /* Be careful if ptr_e is pointing to the NULL if we do not end with a
+     * newline. We don't really need this check, but pointing ptr_s past the
+     * NULL byte is just asking for problems later.
+     */
+    ptr_s = (ptr_e <= last) ? g_utf8_next_char(ptr_e) : ptr_e;
   }
 }