Changeset db2dd3d

Timestamp:

Oct 21, 2003, 9:43:29 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:

8c92848

Parents:

15283bb

Message:

Display CC in outgoing CC messages

Files:

• ChangeLog (modified) (1 diff)
• zwrite.c (modified) (3 diffs)

ChangeLog

@@ -3 +3 @@
 2.0.11-pre-1
         Updated basic help
+        Display CC: in outgoing CC messages
         
 2.0.10

zwrite.c

@@ -216 +216 @@
 void owl_zwrite_set_message(owl_zwrite *z, char *msg)
 {
+  int i, j;
+  char toline[LINE];
+
   if (z->message) owl_free(z->message);
-  z->message=owl_strdup(msg);
+
+  j=owl_list_get_size(&(z->recips));
+  if (j>0 && z->cc) {
+    strcpy(toline, "CC: ");
+    for (i=0; i<j; i++) {
+      if (strcmp(z->realm, "")) {
+        sprintf(toline, "%s%s@%s ", toline, (char *) owl_list_get_element(&(z->recips), i), z->realm);
+      } else {
+        sprintf(toline, "%s%s ", toline, (char *) owl_list_get_element(&(z->recips), i));
+      }
+    }
+    z->message=owl_sprintf("%s\n%s", toline, msg);
+  } else {
+    z->message=owl_strdup(msg);
+  }
 }
 
@@ -241 +258 @@
   j=owl_list_get_size(&(z->recips));
   if (j>0) {
-    char *tmpmsg=NULL;
-    char toline[LINE];
-
-    if (z->cc) {
-      strcpy(toline, "CC: ");
-      for (i=0; i<j; i++) {
-        if (strcmp(z->realm, "")) {
-          sprintf(toline, "%s%s@%s ", toline, (char *) owl_list_get_element(&(z->recips), i), z->realm);
-        } else {
-          sprintf(toline, "%s%s ", toline, (char *) owl_list_get_element(&(z->recips), i));
-        }
-      }
-      tmpmsg=owl_malloc(strlen(z->message)+strlen(toline)+30);
-      sprintf(tmpmsg, "%s\n%s", toline, z->message);
-    }
-
     for (i=0; i<j; i++) {
       if (strcmp(z->realm, "")) {
@@ -263 +264 @@
         strcpy(to, owl_list_get_element(&(z->recips), i));
       }
-      if (z->cc) {
-        send_zephyr(z->opcode, z->zsig, z->class, z->inst, to, tmpmsg);
-      } else {
-        send_zephyr(z->opcode, z->zsig, z->class, z->inst, to, z->message);
-      }
-    }
-    if (z->cc) {
-      owl_free(tmpmsg);
+      send_zephyr(z->opcode, z->zsig, z->class, z->inst, to, z->message);
     }
   } else {