Changeset dd6af02 for fmtext.c

Timestamp:

Sep 28, 2009, 12:56:20 PM (15 years ago)

Author:

Alejandro R. Sedeño <asedeno@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:

fb2f9ab

Parents:

7b4d90e

Message:

Revert 7b4d90e... and just fix #51

owl_fmtext_truncate_cols once again expects that fmtext ends in a
newline.

Revert documentation changes and remove test that now breaks while
testing out-of-spec text.

In owl_viewwin_init_fmtext, check that fmtext ends in a newline and
append one if necessary.

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'.
+ * 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
@@ -442 +443 @@
     ptr_e=strchr(ptr_s, '\n');
     if (!ptr_e) {
-      /* set it to the NULL at the end of the string, to handle a line that is
-       * not newline-terminated */
-      ptr_e = last+1;
+      /* but this shouldn't happen if we end in a \n */
+      break;
     }
     
@@ -499 +499 @@
       owl_fmtext_append_normal(out, "\n");
     }
-    /* 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;
+    ptr_s = g_utf8_next_char(ptr_e);
   }
 }