Changes in zwrite.c [34509d5:1fe100c]

File:

• zwrite.c (modified) (5 diffs)

zwrite.c

@@ -95 +95 @@
       z->message=owl_strdup("");
       while (myargc) {
-        z->message=owl_realloc(z->message, strlen(z->message)+strlen(myargv[0])+5);
+        z->message=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), owl_strdup(myargv[0]));
+      owl_list_append_element(&(z->recips), strdup(myargv[0]));
       myargv++;
       myargc--;
@@ -122 +122 @@
 
   if (badargs) {
+    return(-1);
+  }
+
+  if (z->class == NULL &&
+      z->inst == NULL &&
+      owl_list_get_size(&(z->recips))==0) {
+    owl_function_error("You must specify a recipient for zwrite");
     return(-1);
   }
@@ -132 +139 @@
   /* z->message is allowed to stay NULL */
   
-  if (!strcasecmp(z->class, "message") &&
-      !strcasecmp(z->inst, "personal") &&
-      owl_list_get_size(&(z->recips))==0) {
-    owl_function_error("You must specify a recipient for zwrite");
-    return(-1);
-  }
-
   /* get a zsig, if not given */
   if (z->zsig==NULL) {
@@ -177 +177 @@
       z->zsig=owl_strdup(zsigzvar);
     } else if (((pw=getpwuid(getuid()))!=NULL) && (pw->pw_gecos)) {
-      z->zsig=owl_strdup(pw->pw_gecos);
+      z->zsig=strdup(pw->pw_gecos);
       ptr=strchr(z->zsig, ',');
       if (ptr) {