Changeset e0e0e5a

Timestamp:

Jul 31, 2010, 7:11:42 PM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.7, release-1.8, release-1.9

Children:

c93b8b5

Parents:

6772d19

git-author:

David Benjamin <davidben@mit.edu> (07/25/10 17:35:41)

git-committer:

David Benjamin <davidben@mit.edu> (07/31/10 19:11:42)

Message:

Make _owl_fmtext_append_fmtext take a half-open range

Inclusive on both endpoints is weird. This also makes the usage in
owl_fmtext_append_fmtext correct. It otherwise appends an extra '\0',
causing textlen to be off. This fixes a failure in the owl_fmtext test.

File:

• fmtext.c (modified) (5 diffs)

fmtext.c

@@ -175 +175 @@
 }  
 
-/* Internal function.  Append text from 'in' between index 'start' and
- * 'stop', inclusive, to the end of 'f'. This function works with
- * bytes.
+/* Internal function.  Append text from 'in' between index 'start'
+ * inclusive and 'stop' exclusive, to the end of 'f'. This function
+ * works with bytes.
  */
 static void _owl_fmtext_append_fmtext(owl_fmtext *f, const owl_fmtext *in, int start, int stop)
@@ -194 +194 @@
   /* We will reset to defaults after appending the text. We may need
      to set initial attributes. */
-  newlen=strlen(f->textbuff)+(stop-start+1) + (4 * (a + fg + bg)) + 12;
+  newlen=strlen(f->textbuff)+(stop-start) + (4 * (a + fg + bg)) + 12;
   _owl_fmtext_realloc(f, newlen);
 
@@ -207 +207 @@
             g_unichar_to_utf8(OWL_FMTEXT_UC_BGCOLOR | bgcolor, attrbuff));
 
-  strncat(f->textbuff, in->textbuff+start, stop-start+1);
+  strncat(f->textbuff, in->textbuff+start, stop-start);
 
   /* Reset attributes */
@@ -402 +402 @@
     ptr2 = strchr(ptr1, '\n');
     if (!ptr2) {
-      _owl_fmtext_append_fmtext(out, in, offset, (in->textlen) - 1);
+      /* Copy to the end of the buffer. */
+      _owl_fmtext_append_fmtext(out, in, offset, in->textlen);
       return(-1);
     }
-    _owl_fmtext_append_fmtext(out, in, offset, (ptr2 - ptr1) + offset);
+    /* Copy up to, and including, the new line. */
+    _owl_fmtext_append_fmtext(out, in, offset, (ptr2 - ptr1) + offset + 1);
     ptr1 = ptr2 + 1;
   }
@@ -475 +477 @@
       owl_fmtext_append_spaces(out, padding);
       if (ptr_c == ptr_e) {
-        /* We made it to the newline. */
-        _owl_fmtext_append_fmtext(out, in, ptr_s - in->textbuff, ptr_c - in->textbuff);
+        /* We made it to the newline. Append up to, and including it. */
+        _owl_fmtext_append_fmtext(out, in, ptr_s - in->textbuff, ptr_c - in->textbuff + 1);
       }
       else if (chwidth > 1) {
         /* Last char is wide, truncate. */
-        _owl_fmtext_append_fmtext(out, in, ptr_s - in->textbuff, ptr_c - in->textbuff - 1);
+        _owl_fmtext_append_fmtext(out, in, ptr_s - in->textbuff, ptr_c - in->textbuff);
         owl_fmtext_append_normal(out, "\n");
       }
       else {
-        /* Last char fits perfectly, We skip to the next char and back
-         * up a byte to make sure we get it all.
-         */
+        /* Last char fits perfectly, We stop at the next char to make
+         * sure we get it all. */
         ptr_c = g_utf8_next_char(ptr_c);
-        _owl_fmtext_append_fmtext(out, in, ptr_s - in->textbuff, ptr_c - in->textbuff - 1);
+        _owl_fmtext_append_fmtext(out, in, ptr_s - in->textbuff, ptr_c - in->textbuff);
       }
     }