Changeset 5376a95 for fmtext.c

Timestamp:

Dec 28, 2007, 5:04:34 PM (16 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

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

Children:

6201646

Parents:

925e122

Message:

First pass at incoming zephyr -> UTF-8 sanitizing.
This only operates on incoming data so far.
We still need to clean outgoing data -- the plan is to attempt conversion
to ISO-8859-1, and use that if it works.

File:

• fmtext.c (modified) (1 diff)

fmtext.c

@@ -235 +235 @@
 char *owl_fmtext_print_plain(owl_fmtext *f)
 {
-  char *r, *s, *p;
-  r = owl_malloc(f->bufflen);
-  r[0] = '\0';
-  s = f->textbuff;
-  /* Find next possible format character. */
-  p = strchr(s, OWL_FMTEXT_UC_STARTBYTE_UTF8);
-  while(p) {
-    /* If it's a format character, copy up to it, and skip all
-       immediately following format characters. */
-    if (_owl_fmtext_is_format_char(g_utf8_get_char(p))) {
-      strncat(r, s, p-s);
-      p = g_utf8_next_char(p);
-      while (p && _owl_fmtext_is_format_char(g_utf8_get_char(p))) {
-        p = g_utf8_next_char(p);
-      }
-      s = p;
-      p = strchr(s, OWL_FMTEXT_UC_STARTBYTE_UTF8);
-    }
-    else {
-      p = strchr(p+1, OWL_FMTEXT_UC_STARTBYTE_UTF8);
-    }
-  }
-  if (s) strcat(r,s);
-  return(r);
+  return owl_strip_format_chars(f->textbuff);
 }