Changeset 8d24696

Timestamp:

Jun 26, 2003, 6:42:09 AM (21 years ago)

Author:

James M. Kretchmar <kretch@mit.edu>

Branches:

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

Children:

4d42508

Parents:

e075479

Message:

Translate < > & "   &ensp, &emsp, &endash and &emdash

Files:

• ChangeLog (modified) (1 diff)
• text.c (modified) (4 diffs)

ChangeLog

@@ -26 +26 @@
         Fixed bug causing buddies not to be added to buddy list during
           ingorelogin timer
+        Translate < > & "   &ensp, &emsp, &endash and
+           &emdash
 
 2.0.4-pre-1

text.c

@@ -135 +135 @@
 char *owl_text_htmlstrip(char *in)
 {
-  char *ptr1, *end, *ptr2, *ptr3, *out;
+  char *ptr1, *end, *ptr2, *ptr3, *out, *out2;
 
   out=owl_malloc(strlen(in)+30);
@@ -150 +150 @@
     if (ptr2==NULL) {
       strcat(out, ptr1);
-      return(out);
+      break;
     }
 
@@ -164 +164 @@
     if (!ptr3) {
       strcat(out, ptr2);
-      return(out);
+      break;
     }
 
@@ -189 +189 @@
     ptr1=ptr3+1;
   }
-  return(out);
+
+  out2=owl_util_substitute(out, "&lt;", "<");
+  owl_free(out);
+  out=owl_util_substitute(out2, "&gt;", ">");
+  owl_free(out2);
+  out2=owl_util_substitute(out, "&amp;", "&");
+  owl_free(out);
+  out=owl_util_substitute(out2, "&quot;", "\"");
+  owl_free(out2);
+  out2=owl_util_substitute(out, "&nbsp;", " ");
+  owl_free(out);
+  out=owl_util_substitute(out2, "&ensp;", "  ");
+  owl_free(out2);
+  out2=owl_util_substitute(out, "&emsp;", "   ");
+  owl_free(out);
+  out=owl_util_substitute(out2, "&endash;", "--");
+  owl_free(out2);
+  out2=owl_util_substitute(out, "&emdash;", "---");
+  owl_free(out);
+
+  return(out2);
 }