Changeset 9c590d4

Timestamp:

Jun 6, 2007, 11:31:49 PM (17 years ago)

Author:

Alex Vandiver <alexmv@mit.edu>

Branches:

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

Children:

d0961fe

Parents:

48609ce

git-author:

Alex Vandiver <alexmv@mit.edu> (06/06/07 23:31:44)

git-committer:

Alex Vandiver <alexmv@mit.edu> (06/06/07 23:31:49)

Message:

Outgoing CC'd messages get logged to all recipients

Files:

• logging.c (modified) (1 diff)
• message.c (modified) (3 diffs)

logging.c

@@ -132 +132 @@
 {
   char filename[MAXPATHLEN], *logpath;
-  char *to;
+  char *to, *temp;
+
+  /* expand ~ in path names */
+  logpath = owl_text_substitute(owl_global_get_logpath(&g), "~", owl_global_get_homedir(&g));
 
   /* Figure out what path to log to */
   if (owl_message_is_type_zephyr(m)) {
-      to = short_zuser(owl_message_get_recipient(m));
+    // If this has CC's, do all but the "recipient" which we'll do below
+    to = owl_message_get_cc_without_recipient(m);
+    if (to != NULL) {
+      temp = strtok(to, " ");
+      while (temp != NULL) {
+          temp = short_zuser(temp);
+          snprintf(filename, MAXPATHLEN, "%s/%s", logpath, temp);
+          owl_log_append(m, filename);
+          temp = strtok(NULL, " ");
+      }
+      owl_free(to);
+    }
+    to = short_zuser(owl_message_get_recipient(m));
   } else if (owl_message_is_type_jabber(m)) {
-      to = owl_sprintf("jabber:%s", owl_message_get_recipient(m));
+    to = owl_sprintf("jabber:%s", owl_message_get_recipient(m));
   } else if (owl_message_is_type_aim(m)) {
-      char *temp;
-      temp = owl_aim_normalize_screenname(owl_message_get_recipient(m));
-      downstr(temp);
-      to = owl_sprintf("aim:%s", temp);
-      owl_free(temp);
-  } else {
-      to = owl_sprintf("loopback");
-  }
-
-  /* expand ~ in path names */
-  logpath = owl_text_substitute(owl_global_get_logpath(&g), "~", owl_global_get_homedir(&g));
+    temp = owl_aim_normalize_screenname(owl_message_get_recipient(m));
+    downstr(temp);
+    to = owl_sprintf("aim:%s", temp);
+    owl_free(temp);
+  } else {
+    to = owl_sprintf("loopback");
+  }
+
   snprintf(filename, MAXPATHLEN, "%s/%s", logpath, to);
+  owl_log_append(m, filename);
   owl_free(to);
 
+  snprintf(filename, MAXPATHLEN, "%s/all", logpath);
   owl_log_append(m, filename);
-
-  snprintf(filename, MAXPATHLEN, "%s/all", logpath);
   owl_free(logpath);
-
-  owl_log_append(m, filename);
 }
 

message.c

@@ -663 +663 @@
 char *owl_message_get_cc_without_recipient(owl_message *m)
 {
-  char *cc, *out, *end, *user;
+  char *cc, *out, *end, *user, *recip;
 
   cc = owl_message_get_cc(m);
+  if (cc == NULL)
+    return NULL;
+
+  recip = short_zuser(owl_message_get_recipient(m));
   out = owl_malloc(strlen(cc));
   end = out;
@@ -671 +675 @@
   user = strtok(cc, " ");
   while (user != NULL) {
-    if (strcasecmp(user, short_zuser(owl_message_get_recipient(m))) != 0) {
+    if (strcasecmp(user, recip) != 0) {
       strcpy(end, user);
       end[strlen(user)] = ' ';
@@ -680 +684 @@
   end[0] = '\0';
 
+  owl_free(recip);
   owl_free(cc);
+
+  if (strlen(out) == 0) {
+    owl_free(out);
+    out = NULL;
+  }
+
   return(out);
 }