Changes in zwrite.c [7b1d048:1fe100c]
Legend:
- Unmodified
- Added
- Removed
-
zwrite.c
r7b1d048 r1fe100c 44 44 break; 45 45 } 46 z->class=owl_ get_iso_8859_1_if_possible(myargv[1]);46 z->class=owl_strdup(myargv[1]); 47 47 myargv+=2; 48 48 myargc-=2; … … 52 52 break; 53 53 } 54 z->inst=owl_ get_iso_8859_1_if_possible(myargv[1]);54 z->inst=owl_strdup(myargv[1]); 55 55 myargv+=2; 56 56 myargc-=2; … … 60 60 break; 61 61 } 62 z->realm=owl_ get_iso_8859_1_if_possible(myargv[1]);62 z->realm=owl_strdup(myargv[1]); 63 63 myargv+=2; 64 64 myargc-=2; … … 68 68 break; 69 69 } 70 z->zsig=owl_ get_iso_8859_1_if_possible(myargv[1]);70 z->zsig=owl_strdup(myargv[1]); 71 71 myargv+=2; 72 72 myargc-=2; … … 76 76 break; 77 77 } 78 z->opcode=owl_ get_iso_8859_1_if_possible(myargv[1]);78 z->opcode=owl_strdup(myargv[1]); 79 79 myargv+=2; 80 80 myargc-=2; … … 93 93 myargv++; 94 94 myargc--; 95 z->message=owl_ get_iso_8859_1_if_possible("");95 z->message=owl_strdup(""); 96 96 while (myargc) { 97 z->message= owl_realloc(z->message, strlen(z->message)+strlen(myargv[0])+5);97 z->message=realloc(z->message, strlen(z->message)+strlen(myargv[0])+5); 98 98 strcat(z->message, myargv[0]); 99 99 strcat(z->message, " "); … … 113 113 } else { 114 114 /* anything unattached is a recipient */ 115 owl_list_append_element(&(z->recips), owl_get_iso_8859_1_if_possible(myargv[0]));115 owl_list_append_element(&(z->recips), strdup(myargv[0])); 116 116 myargv++; 117 117 myargc--; … … 146 146 147 147 if (zsigowlvar && *zsigowlvar) { 148 z->zsig=owl_ get_iso_8859_1_if_possible(zsigowlvar);148 z->zsig=owl_strdup(zsigowlvar); 149 149 } else if (zsigproc && *zsigproc) { 150 150 FILE *file; … … 161 161 if (!file) { 162 162 if (zsigzvar && *zsigzvar) { 163 z->zsig=owl_ get_iso_8859_1_if_possible(zsigzvar);163 z->zsig=owl_strdup(zsigzvar); 164 164 } 165 165 } else { … … 175 175 } 176 176 } else if (zsigzvar) { 177 z->zsig=owl_ get_iso_8859_1_if_possible(zsigzvar);177 z->zsig=owl_strdup(zsigzvar); 178 178 } else if (((pw=getpwuid(getuid()))!=NULL) && (pw->pw_gecos)) { 179 z->zsig= owl_get_iso_8859_1_if_possible(pw->pw_gecos);179 z->zsig=strdup(pw->pw_gecos); 180 180 ptr=strchr(z->zsig, ','); 181 181 if (ptr) { … … 218 218 int i, j; 219 219 char toline[LINE]; 220 char *tmp = NULL;221 220 222 221 if (z->message) owl_free(z->message); … … 232 231 } 233 232 } 234 tmp = owl_get_iso_8859_1_if_possible(msg); 235 z->message=owl_sprintf("%s\n%s", toline, tmp); 233 z->message=owl_sprintf("%s\n%s", toline, msg); 236 234 } else { 237 z->message=owl_get_iso_8859_1_if_possible(msg); 238 } 239 if (tmp) owl_free(tmp); 235 z->message=owl_strdup(msg); 236 } 240 237 } 241 238 … … 308 305 { 309 306 if (z->opcode) owl_free(z->opcode); 310 z->opcode=owl_ get_iso_8859_1_if_possible(opcode);307 z->opcode=owl_strdup(opcode); 311 308 } 312 309
Note: See TracChangeset
for help on using the changeset viewer.