Changeset e50cd56 for functions.c

Timestamp:

Jul 11, 2002, 12:47:16 AM (22 years ago)

Author:

Erik Nygren <nygren@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:

aa2f33b3

Parents:

e173507

Message:

Fixed some buffer overruns in the "reply" command.
When repying to "all" on a message that begins with "CC:" (eg, sent
         with "zwrite -C", the reply line will be constructed
         from the sender and the usernames on the CC: line
         of the message being replied to.
There is no such thing as C-R, so left C-r as it is but added:
         M-r --- edit reply to all
         M-R --- edit reply to sender

File:

• functions.c (modified) (5 diffs)

functions.c

@@ -1355 +1355 @@
    * if enter = 1 then don't wait for editing
    */
-  char buff[1024];
+  char *buff, *oldbuff;
   owl_message *m;
   owl_filter *f;
@@ -1362 +1362 @@
     owl_function_makemsg("No message selected");
   } else {
-    char *class, *inst, *to;
+    char *class, *inst, *to, *cc=NULL;
     
     m=owl_view_get_element(owl_global_get_current_view(&g), owl_global_get_curmsg(&g));
@@ -1395 +1395 @@
         inst=owl_message_get_instance(m);
         to=owl_message_get_recipient(m);
+        cc=owl_message_get_cc(m);
         if (!strcmp(to, "") || !strcmp(to, "*")) {
           to="";
@@ -1405 +1406 @@
       
       /* create the command line */
-      strcpy(buff, "zwrite");
+      buff = owl_strdup("zwrite");
       if (strcasecmp(class, "message")) {
-        sprintf(buff, "%s -c %s%s%s", buff, owl_getquoting(class), class, owl_getquoting(class));
+        buff = owl_sprintf("%s -c %s%s%s", oldbuff=buff, owl_getquoting(class), class, owl_getquoting(class));
+        owl_free(oldbuff);
       }
       if (strcasecmp(inst, "personal")) {
-        sprintf(buff, "%s -i %s%s%s", buff, owl_getquoting(inst), inst, owl_getquoting(inst));
+        buff = owl_sprintf("%s -i %s%s%s", oldbuff=buff, owl_getquoting(inst), inst, owl_getquoting(inst));
+        owl_free(oldbuff);
       }
       if (*to != '\0') {
-        char *tmp;
+        char *tmp, *oldtmp;
         tmp=pretty_sender(to);
-        sprintf(buff, "%s %s", buff, tmp);
+        if (cc) {
+          tmp = owl_util_uniq(oldtmp=tmp, cc, "-");
+          owl_free(oldtmp);
+          buff = owl_sprintf("%s -C %s", oldbuff=buff, tmp);
+          owl_free(oldbuff);
+        } else {
+          tmp=pretty_sender(to);
+          buff = owl_sprintf("%s %s", oldbuff=buff, tmp);
+          owl_free(oldbuff);
+        }
         owl_free(tmp);
       }
+      if (cc) owl_free(cc);
 
       if (enter) {
@@ -1427 +1440 @@
         owl_function_start_command(buff);
       }
+      owl_free(buff);
     }
   }