Changes in zwrite.c [1fe100c:7b1d048]

File:

• zwrite.c (modified) (13 diffs)

zwrite.c

@@ -44 +44 @@
         break;
       }
-      z->class=owl_strdup(myargv[1]);
+      z->class=owl_get_iso_8859_1_if_possible(myargv[1]);
       myargv+=2;
       myargc-=2;
@@ -52 +52 @@
         break;
       }
-      z->inst=owl_strdup(myargv[1]);
+      z->inst=owl_get_iso_8859_1_if_possible(myargv[1]);
       myargv+=2;
       myargc-=2;
@@ -60 +60 @@
         break;
       }
-      z->realm=owl_strdup(myargv[1]);
+      z->realm=owl_get_iso_8859_1_if_possible(myargv[1]);
       myargv+=2;
       myargc-=2;
@@ -68 +68 @@
         break;
       }
-      z->zsig=owl_strdup(myargv[1]);
+      z->zsig=owl_get_iso_8859_1_if_possible(myargv[1]);
       myargv+=2;
       myargc-=2;
@@ -76 +76 @@
         break;
       }
-      z->opcode=owl_strdup(myargv[1]);
+      z->opcode=owl_get_iso_8859_1_if_possible(myargv[1]);
       myargv+=2;
       myargc-=2;
@@ -93 +93 @@
       myargv++;
       myargc--;
-      z->message=owl_strdup("");
+      z->message=owl_get_iso_8859_1_if_possible("");
       while (myargc) {
-        z->message=realloc(z->message, strlen(z->message)+strlen(myargv[0])+5);
+        z->message=owl_realloc(z->message, strlen(z->message)+strlen(myargv[0])+5);
         strcat(z->message, myargv[0]);
         strcat(z->message, " ");
@@ -113 +113 @@
     } else {
       /* anything unattached is a recipient */
-      owl_list_append_element(&(z->recips), strdup(myargv[0]));
+      owl_list_append_element(&(z->recips), owl_get_iso_8859_1_if_possible(myargv[0]));
       myargv++;
       myargc--;
@@ -146 +146 @@
 
     if (zsigowlvar && *zsigowlvar) {
-      z->zsig=owl_strdup(zsigowlvar);
+      z->zsig=owl_get_iso_8859_1_if_possible(zsigowlvar);
     } else if (zsigproc && *zsigproc) {
       FILE *file;
@@ -161 +161 @@
       if (!file) {
         if (zsigzvar && *zsigzvar) {
-          z->zsig=owl_strdup(zsigzvar);
+          z->zsig=owl_get_iso_8859_1_if_possible(zsigzvar);
         }
       } else {
@@ -175 +175 @@
       }
     } else if (zsigzvar) {
-      z->zsig=owl_strdup(zsigzvar);
+      z->zsig=owl_get_iso_8859_1_if_possible(zsigzvar);
     } else if (((pw=getpwuid(getuid()))!=NULL) && (pw->pw_gecos)) {
-      z->zsig=strdup(pw->pw_gecos);
+      z->zsig=owl_get_iso_8859_1_if_possible(pw->pw_gecos);
       ptr=strchr(z->zsig, ',');
       if (ptr) {
@@ -218 +218 @@
   int i, j;
   char toline[LINE];
+  char *tmp = NULL;
 
   if (z->message) owl_free(z->message);
@@ -231 +232 @@
       }
     }
-    z->message=owl_sprintf("%s\n%s", toline, msg);
+    tmp = owl_get_iso_8859_1_if_possible(msg);
+    z->message=owl_sprintf("%s\n%s", toline, tmp);
   } else {
-    z->message=owl_strdup(msg);
-  }
+    z->message=owl_get_iso_8859_1_if_possible(msg);
+  }
+  if (tmp) owl_free(tmp);
 }
 
@@ -305 +308 @@
 {
   if (z->opcode) owl_free(z->opcode);
-  z->opcode=owl_strdup(opcode);
+  z->opcode=owl_get_iso_8859_1_if_possible(opcode);
 }