Changes in functions.c [4367915:3f3ee61]

File:

• functions.c (modified) (21 diffs)

functions.c

@@ -25 +25 @@
   return owl_cmddict_execute(owl_global_get_cmddict(&g), 
                              owl_global_get_context(&g), cmdbuff);
+}
+
+char *owl_function_command_argv(char **argv, int argc)
+{
+  return owl_cmddict_execute_argv(owl_global_get_cmddict(&g),
+                                  owl_global_get_context(&g),
+                                  argv, argc);
 }
 
@@ -283 +290 @@
   owl_editwin_set_dotsend(e);
   strcpy(buff, "----> ");
-  strcat(buff, line);
+  strncat(buff, line, 1016);
   strcat(buff, "\n");
   owl_editwin_set_locktext(e, buff);
@@ -371 +378 @@
   /* create the zwrite and send the message */
   owl_zwrite_create_from_line(&z, line);
+  owl_zwrite_populate_zsig(&z);
   if (msg) {
     owl_zwrite_set_message(&z, msg);
@@ -409 +417 @@
   /* create the zwrite and send the message */
   owl_zwrite_create_from_line(&z, line);
+  owl_zwrite_populate_zsig(&z);
   if (msg) {
     owl_zwrite_set_message(&z, msg);
@@ -415 +424 @@
   mymsg=owl_zwrite_get_message(&z);
 #ifdef OWL_ENABLE_ZCRYPT
-  cryptmsg=owl_malloc(strlen(mymsg)*4);
+  /* Allocate enough space for the crypted message. For each byte of
+   * the message, the encoded cyphertext will have two bytes. Block
+   * size is 8 bytes of input, or 16 bytes of output, so make sure we
+   * have at least one block worth of space allocated. If the message
+   * is empty, no blocks are sent, but we still allocate one
+   * block. The additional 16 bytes also provide space for the null
+   * terminator, as we will never use all of it for cyphertext.
+   */
+  cryptmsg=owl_malloc((strlen(mymsg)*2)+16);
   ret=owl_zcrypt_encrypt(cryptmsg, mymsg, owl_zwrite_get_class(&z), owl_zwrite_get_instance(&z));
   if (ret) {
@@ -421 +438 @@
     owl_function_beep();
     owl_free(cryptmsg);
+    owl_zwrite_free(&z);
     return;
   }
@@ -1633 +1651 @@
   }
 
-  if (owl_message_is_type_aim(m)) {
-    owl_fmtext_append_bold(&fm, "\nAIM Specific Information:\n");
-  }
-
   owl_fmtext_append_bold(&fm, "\nOwl Message Attributes:\n");
   owl_message_attributes_tofmtext(m, &attrfm);
@@ -1965 +1979 @@
   
 
-  owl_fmtext_append_normal(&fm, "\nMemory Usage:\n");
-  owl_fmtext_append_normal(&fm, "  Not currently available.\n");
-  /*
-  sprintf(buff, "%sMemory Malloced: %i\n", buff, owl_global_get_malloced(&g));
-  sprintf(buff, "%sMemory Freed: %i\n", buff, owl_global_get_freed(&g));
-  sprintf(buff, "%sMemory In Use: %i\n", buff, owl_global_get_meminuse(&g));
-  */
-
   owl_fmtext_append_normal(&fm, "\nAIM Status:\n");
   owl_fmtext_append_normal(&fm, "  Logged in: ");
@@ -2025 +2031 @@
 void owl_function_reply(int type, int enter)
 {
-  char *buff=NULL, *oldbuff;
+  char *buff=NULL;
   owl_message *m;
   owl_filter *f;
@@ -2032 +2038 @@
     owl_function_error("No message selected");
   } else {
-    char *class, *inst, *to, *cc=NULL;
     
     m=owl_view_get_element(owl_global_get_current_view(&g), owl_global_get_curmsg(&g));
@@ -2049 +2054 @@
     }
 
-    /* loopback */
-    if (owl_message_is_type_loopback(m)) {
-      owl_function_loopwrite_setup();
-      return;
-    }
-
-    /* zephyr */
-    if (owl_message_is_type_zephyr(m)) {
-      /* if it's a zephyr we sent, send it out the same way again */
-      if (owl_message_is_direction_out(m)) {
-          buff = owl_strdup(owl_message_get_zwriteline(m));
-      } else {
-
-        /* Special case a personal reply to a webzephyr user on a class */
-        if ((type==1) && !strcasecmp(owl_message_get_opcode(m), OWL_WEBZEPHYR_OPCODE)) {
-          class=OWL_WEBZEPHYR_CLASS;
-          inst=owl_message_get_sender(m);
-          to=OWL_WEBZEPHYR_PRINCIPAL;
-        } else if (!strcasecmp(owl_message_get_class(m), OWL_WEBZEPHYR_CLASS) && owl_message_is_loginout(m)) {
-          /* Special case LOGIN/LOGOUT notifications on class "webzephyr" */
-          class=OWL_WEBZEPHYR_CLASS;
-          inst=owl_message_get_instance(m);
-          to=OWL_WEBZEPHYR_PRINCIPAL;
-        } else if (owl_message_is_loginout(m)) {
-          /* Normal LOGIN/LOGOUT messages */
-          class="MESSAGE";
-          inst="PERSONAL";
-          to=owl_message_get_sender(m);
-        } else if (type==1) {
-          /* Personal reply */
-          class="MESSAGE";
-          inst="PERSONAL";
-          to=owl_message_get_sender(m);
-        } else {
-          /* General reply */
-          class=owl_message_get_class(m);
-          inst=owl_message_get_instance(m);
-          to=owl_message_get_recipient(m);
-          cc=owl_message_get_cc_without_recipient(m);
-          if (!strcmp(to, "") || !strcmp(to, "*")) {
-            to="";
-          } else if (to[0]=='@') {
-            /* leave it, to get the realm */
-          } else {
-            to=owl_message_get_sender(m);
-          }
-        }
-
-        /* create the command line */
-        if (!strcasecmp(owl_message_get_opcode(m), "CRYPT")) {
-          buff=owl_strdup("zcrypt");
-        } else {
-          buff = owl_strdup("zwrite");
-        }
-        if (strcasecmp(class, "message")) {
-          buff = owl_sprintf("%s -c %s%s%s", oldbuff=buff, owl_getquoting(class), class, owl_getquoting(class));
-          owl_free(oldbuff);
-        }
-        if (strcasecmp(inst, "personal")) {
-          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, *oldtmp, *tmp2;
-          tmp=short_zuser(to);
-          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 {
-            if (owl_global_is_smartstrip(&g)) {
-              tmp2=tmp;
-              tmp=owl_zephyr_smartstripped_user(tmp2);
-              owl_free(tmp2);
-            }
-            buff = owl_sprintf("%s %s", oldbuff=buff, tmp);
-            owl_free(oldbuff);
-          }
-          owl_free(tmp);
-        }
-        if (cc) owl_free(cc);
-      }
-    } else if (owl_message_is_type_aim(m)) {
-      /* aim */
-      if (owl_message_is_direction_out(m)) {
-        buff=owl_sprintf("aimwrite %s", owl_message_get_recipient(m));
-      } else {
-        buff=owl_sprintf("aimwrite %s", owl_message_get_sender(m));
-      }
-    } else {
-      char *cmd;
-      if((type==0 && (cmd=owl_message_get_attribute_value(m, "replycmd")))
-         || (type==1 && (cmd=owl_message_get_attribute_value(m, "replysendercmd")))) {
-        buff = owl_strdup(cmd);
-      }
+    char *cmd;
+    if((type == 0 &&
+        (cmd=owl_perlconfig_message_call_method(m, "replycmd", 0, NULL))) ||
+       (type == 1 &&
+        (cmd=owl_perlconfig_message_call_method(m, "replysendercmd", 0, NULL)))) {
+      buff = cmd;
     }
 
@@ -2151 +2066 @@
         return;
     }
-    
+
     if (enter) {
       owl_history *hist = owl_global_get_cmd_history(&g);
@@ -2404 +2319 @@
       return;
     }
-    if (owl_util_string_to_color(argv[3])==-1) {
+    if (owl_util_string_to_color(argv[3])==OWL_COLOR_INVALID) {
       owl_function_error("The color '%s' is not available.", argv[3]);
       return;
@@ -2419 +2334 @@
       return;
     }
-    if (owl_util_string_to_color(argv[3])==-1) {
+    if (owl_util_string_to_color(argv[3])==OWL_COLOR_INVALID) {
       owl_function_error("The color '%s' is not available.", argv[3]);
       return;
@@ -2527 +2442 @@
 {
   owl_filter *f;
-  char buff[5000];
+  char *buff, *tmp;
 
   f=owl_global_get_filter(&g, name);
@@ -2534 +2449 @@
     return;
   }
-  owl_filter_print(f, buff);
+  tmp = owl_filter_print(f);
+  buff = owl_sprintf("%s: %s", owl_filter_get_name(f), tmp);
   owl_function_popless_text(buff);
+  owl_free(buff);
+  owl_free(tmp);
 }
 
@@ -2543 +2461 @@
   owl_list *fl;
   char buff[5000];
+  char *tmp;
   owl_fmtext fm;
   int i, j;
@@ -2556 +2475 @@
     snprintf(buff, sizeof(buff), "[% 2d] ", i+1);
     owl_fmtext_append_normal(&fm, buff);
-    owl_filter_print(f, buff);
+    tmp = owl_filter_print(f);
+    owl_fmtext_append_normal(&fm, tmp);
+    owl_free(tmp);
     owl_fmtext_append_normal(&fm, buff);
   }
@@ -2953 +2874 @@
   }
 
-  if (owl_util_string_to_color(fgcolor)==-1) {
+  if (owl_util_string_to_color(fgcolor)==OWL_COLOR_INVALID) {
     owl_function_error("No color named '%s' avilable.", fgcolor);
     return(-1);
@@ -2960 +2881 @@
 
   if (bgcolor != NULL) {
-    if (owl_util_string_to_color(bgcolor)==-1) {
+    if (owl_util_string_to_color(bgcolor)==OWL_COLOR_INVALID) {
       owl_function_error("No color named '%s' avilable.", bgcolor);
       return(-1);
@@ -3512 +3433 @@
   FILE *file;
   char buff[LINE];
+  int fail_silent = 0;
 
   if (!filename) {
+    fail_silent = 1;
     filename=owl_global_get_startupfile(&g);
-    file=fopen(filename, "r");
-  } else {
-    file=fopen(filename, "r");
-  }
+  }
+  file=fopen(filename, "r");
   if (!file) {
-    owl_function_error("Error opening file: %s", filename);
+    if (!fail_silent) {
+      owl_function_error("Error opening file: %s", filename);
+    }
     return;
   }