Changeset 4b17a6c

Timestamp:

Apr 9, 2009, 12:32:56 PM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

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

Children:

9d12aa5

Parents:

e6c59ba

Message:

Zephyr: Always send in UTF-8, never iso-latin-1.

Files:

• util.c (modified) (1 diff)
• zwrite.c (modified) (12 diffs)

util.c

@@ -725 +725 @@
   }
 }
-/* Attempts to convert 'in' to ISO-8859-1. Returns that if possible,
-   else returns UTF-8.
+/*
+ * Validate 'in' as UTF-8, and either return a copy of it, or an empty
+ * string if it is invalid utf-8.
  */
-char * owl_get_iso_8859_1_if_possible(char *in)
+char * owl_validate_utf8(char *in)
 {
   char *out;
   if (g_utf8_validate(in, -1, NULL)) {
-    out = g_convert(in, -1,
-                    "ISO-8859-1", "UTF-8",
-                    NULL, NULL, NULL);
-    if (!out) {
-      out = owl_strdup(in);
-    }
-  }
-  else {
+    out = owl_strdup(in);
+  } else {
     out = owl_strdup("");
   }

zwrite.c

@@ -42 +42 @@
         break;
       }
-      z->class=owl_get_iso_8859_1_if_possible(myargv[1]);
+      z->class=owl_validate_utf8(myargv[1]);
       myargv+=2;
       myargc-=2;
@@ -50 +50 @@
         break;
       }
-      z->inst=owl_get_iso_8859_1_if_possible(myargv[1]);
+      z->inst=owl_validate_utf8(myargv[1]);
       myargv+=2;
       myargc-=2;
@@ -58 +58 @@
         break;
       }
-      z->realm=owl_get_iso_8859_1_if_possible(myargv[1]);
+      z->realm=owl_validate_utf8(myargv[1]);
       myargv+=2;
       myargc-=2;
@@ -66 +66 @@
         break;
       }
-      z->zsig=owl_get_iso_8859_1_if_possible(myargv[1]);
+      z->zsig=owl_validate_utf8(myargv[1]);
       myargv+=2;
       myargc-=2;
@@ -74 +74 @@
         break;
       }
-      z->opcode=owl_get_iso_8859_1_if_possible(myargv[1]);
+      z->opcode=owl_validate_utf8(myargv[1]);
       myargv+=2;
       myargc-=2;
@@ -91 +91 @@
       myargv++;
       myargc--;
-      z->message=owl_get_iso_8859_1_if_possible("");
+      z->message = owl_strdup("");
       while (myargc) {
         z->message=owl_realloc(z->message, strlen(z->message)+strlen(myargv[0])+5);
@@ -111 +111 @@
     } else {
       /* anything unattached is a recipient */
-      owl_list_append_element(&(z->recips), owl_get_iso_8859_1_if_possible(myargv[0]));
+      owl_list_append_element(&(z->recips), owl_validate_utf8(myargv[0]));
       myargv++;
       myargc--;
@@ -152 +152 @@
 
     if (zsigowlvar && *zsigowlvar) {
-      z->zsig=owl_get_iso_8859_1_if_possible(zsigowlvar);
+      z->zsig=owl_validate_utf8(zsigowlvar);
     } else if (zsigproc && *zsigproc) {
       FILE *file;
@@ -167 +167 @@
       if (!file) {
         if (zsigzvar && *zsigzvar) {
-          z->zsig=owl_get_iso_8859_1_if_possible(zsigzvar);
+          z->zsig=owl_validate_utf8(zsigzvar);
         }
       } else {
@@ -181 +181 @@
       }
     } else if (zsigzvar) {
-      z->zsig=owl_get_iso_8859_1_if_possible(zsigzvar);
+      z->zsig=owl_validate_utf8(zsigzvar);
     } else if (((pw=getpwuid(getuid()))!=NULL) && (pw->pw_gecos)) {
-      z->zsig=owl_get_iso_8859_1_if_possible(pw->pw_gecos);
+      z->zsig=owl_validate_utf8(pw->pw_gecos);
       ptr=strchr(z->zsig, ',');
       if (ptr) {
@@ -240 +240 @@
       tmp = NULL;
     }
-    tmp = owl_get_iso_8859_1_if_possible(msg);
+    tmp = owl_validate_utf8(msg);
     z->message=owl_sprintf("%s\n%s", toline, tmp);
     owl_free(toline);
   } else {
-    z->message=owl_get_iso_8859_1_if_possible(msg);
+    z->message=owl_validate_utf8(msg);
   }
   if (tmp) owl_free(tmp);
@@ -321 +321 @@
 {
   if (z->opcode) owl_free(z->opcode);
-  z->opcode=owl_get_iso_8859_1_if_possible(opcode);
+  z->opcode=owl_validate_utf8(opcode);
 }