Changeset 07bfbc2 for message.c

Timestamp:

Feb 19, 2008, 6:13:25 PM (16 years ago)

Author:

Alejandro R. Sedeño <asedeno@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:

c020e73

Parents:

b70d24f (diff), 4cc0ee0b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged revisions 955-957 via svnmerge from 
file:///afs/sipb.mit.edu/project/barnowl/src/svn/trunk

........
  r956 | geofft | 2008-02-19 04:55:35 -0500 (Tue, 19 Feb 2008) | 4 lines
  
  Fix a bug where an explicit (local) realm foiled
  owl_message_get_cc_without_recipient(). (per quentin)
........
  r957 | asedeno | 2008-02-19 18:10:18 -0500 (Tue, 19 Feb 2008) | 4 lines
  
  owl.c:
  * Input processing - deal with all remaining input before moving on.
  * Change how we get stdin's fileno -- actually grab it from the stdin handle.
........

File:

• message.c (modified) (2 diffs)

message.c

@@ -662 +662 @@
 char *owl_message_get_cc_without_recipient(owl_message *m)
 {
-  char *cc, *out, *end, *user, *recip;
+  char *cc, *out, *end, *user, *shortuser, *recip;
 
   cc = owl_message_get_cc(m);
@@ -674 +674 @@
   user = strtok(cc, " ");
   while (user != NULL) {
-    if (strcasecmp(user, recip) != 0) {
+    shortuser = short_zuser(user);
+    if (strcasecmp(shortuser, recip) != 0) {
       strcpy(end, user);
       end[strlen(user)] = ' ';
       end += strlen(user) + 1;
     }
+    free(shortuser);
     user = strtok(NULL, " ");
   }