Changes in message.c [259e60a8:2354e9a]

File:

• message.c (modified) (21 diffs)

message.c

@@ -1 @@
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <time.h>
 #include "owl.h"
 #include "filterproc.h"
+#include <sys/socket.h>
+#include <arpa/inet.h>
 
 static owl_fmtext_cache fmtext_cache[OWL_FMTEXT_CACHE_SIZE];
@@ -42 +34 @@
   m->delete=0;
 
+#ifdef HAVE_LIBZEPHYR
+  m->has_notice = false;
+#endif
+
   owl_message_set_hostname(m, "");
-  owl_list_create(&(m->attributes));
+  m->attributes = g_ptr_array_new();
   
   /* save the time */
-  m->time=time(NULL);
-  m->timestr=g_strdup(ctime(&(m->time)));
-  m->timestr[strlen(m->timestr)-1]='\0';
+  m->time = time(NULL);
+  m->timestr = g_strdup(ctime(&m->time));
+  m->timestr[strlen(m->timestr)-1] = '\0';
 
   m->fmtext = NULL;
@@ -58 +54 @@
 void owl_message_set_attribute(owl_message *m, const char *attrname, const char *attrvalue)
 {
-  int i, j;
+  int i;
   owl_pair *p = NULL, *pair = NULL;
 
@@ -64 +60 @@
 
   /* look for an existing pair with this key, */
-  j=owl_list_get_size(&(m->attributes));
-  for (i=0; i<j; i++) {
-    p=owl_list_get_element(&(m->attributes), i);
+  for (i = 0; i < m->attributes->len; i++) {
+    p = m->attributes->pdata[i];
     if (owl_pair_get_key(p) == attrname) {
       g_free(owl_pair_get_value(p));
@@ -77 +72 @@
     pair = g_new(owl_pair, 1);
     owl_pair_create(pair, attrname, NULL);
-    owl_list_append_element(&(m->attributes), pair);
+    g_ptr_array_add(m->attributes, pair);
   }
   owl_pair_set_value(pair, owl_validate_or_convert(attrvalue));
@@ -87 +82 @@
 const char *owl_message_get_attribute_value(const owl_message *m, const char *attrname)
 {
-  int i, j;
+  int i;
   owl_pair *p;
   GQuark quark;
@@ -97 +92 @@
   attrname = g_quark_to_string(quark);
 
-  j=owl_list_get_size(&(m->attributes));
-  for (i=0; i<j; i++) {
-    p=owl_list_get_element(&(m->attributes), i);
+  for (i = 0; i < m->attributes->len; i++) {
+    p = m->attributes->pdata[i];
     if (owl_pair_get_key(p) == attrname) {
       return(owl_pair_get_value(p));
@@ -118 +112 @@
  */
 void owl_message_attributes_tofmtext(const owl_message *m, owl_fmtext *fm) {
-  int i, j;
+  int i;
   owl_pair *p;
   char *buff, *tmpbuff;
@@ -124 +118 @@
   owl_fmtext_init_null(fm);
 
-  j=owl_list_get_size(&(m->attributes));
-  for (i=0; i<j; i++) {
-    p=owl_list_get_element(&(m->attributes), i);
-
-    tmpbuff = g_strdup(owl_pair_get_value(p));
-    g_strdelimit(tmpbuff, "\n", '~');
-    g_strdelimit(tmpbuff, "\r", '!');
-    buff = g_strdup_printf("  %-15.15s: %s\n", owl_pair_get_key(p), tmpbuff);
-    g_free(tmpbuff);
+  for (i = 0; i < m->attributes->len; i++) {
+    p = m->attributes->pdata[i];
+
+    buff = g_strdup(owl_pair_get_value(p));
+    if (buff) {
+      tmpbuff = owl_text_indent(buff, 19, false);
+      g_free(buff);
+      buff = g_strdup_printf("  %-15.15s: %s\n", owl_pair_get_key(p), tmpbuff);
+      g_free(tmpbuff);
+    }
 
     if(buff == NULL) {
@@ -352 +347 @@
 }
 
+CALLER_OWN char *owl_message_format_time(const owl_message *m)
+{
+  return owl_util_format_time(localtime(&m->time));
+}
+
 void owl_message_set_type_admin(owl_message *m)
 {
@@ -500 +500 @@
 const ZNotice_t *owl_message_get_notice(const owl_message *m)
 {
-  return(&(m->notice));
+  return m->has_notice ? &m->notice : NULL;
 }
 #else
@@ -580 +580 @@
 
 /* caller must free return value. */
-char *owl_message_get_cc(const owl_message *m)
+CALLER_OWN char *owl_message_get_cc(const owl_message *m)
 {
   const char *cur;
@@ -597 +597 @@
 
 /* caller must free return value */
-GList *owl_message_get_cc_without_recipient(const owl_message *m)
+CALLER_OWN GList *owl_message_get_cc_without_recipient(const owl_message *m)
 {
   char *cc, *shortuser, *recip;
@@ -791 +791 @@
   /* first save the full notice */
   m->notice = *n;
+  m->has_notice = true;
 
   /* a little gross, we'll replace \r's with ' ' for now */
@@ -797 +798 @@
   /* save the time, we need to nuke the string saved by message_init */
   if (m->timestr) g_free(m->timestr);
-  m->time=n->z_time.tv_sec;
-  m->timestr=g_strdup(ctime(&(m->time)));
-  m->timestr[strlen(m->timestr)-1]='\0';
+  m->time = n->z_time.tv_sec;
+  m->timestr = g_strdup(ctime(&m->time));
+  m->timestr[strlen(m->timestr)-1] = '\0';
 
   /* set other info */
@@ -835 +836 @@
 
   
-  /* set the "isprivate" attribute if it's a private zephyr.
-   ``private'' means recipient is non-empty and doesn't start wit 
-   `@' */
-  if (*n->z_recipient && *n->z_recipient != '@') {
+  /* set the "isprivate" attribute if it's a private zephyr. */
+  if (owl_zwrite_recip_is_personal(n->z_recipient)) {
     owl_message_set_isprivate(m);
   }
@@ -876 +875 @@
   if (owl_global_is_zcrypt(&g) && !strcasecmp(n->z_opcode, "crypt")) {
     const char *argv[] = {
-      "zcrypt",
+      NULL,
       "-D",
       "-c", owl_message_get_class(m),
@@ -882 +881 @@
       NULL
     };
-    char *out;
+    char *out = NULL;
     int rv;
     int status;
     char *zcrypt;
 
-    zcrypt = g_strdup_printf("%s/zcrypt", owl_get_bindir());
-
-    rv = call_filter(zcrypt, argv, owl_message_get_body(m), &out, &status);
+    zcrypt = g_build_filename(owl_get_bindir(), "zcrypt", NULL);
+    argv[0] = zcrypt;
+
+    rv = call_filter(argv, owl_message_get_body(m), &out, &status);
     g_free(zcrypt);
 
@@ -898 +898 @@
       }
       owl_message_set_body(m, out);
-      g_free(out);
-    } else if(out) {
-      g_free(out);
-    }
+    } else {
+      /* Replace the opcode. Otherwise the UI and other bits of code think the
+       * message was encrypted. */
+      owl_message_set_opcode(m, "failed-decrypt");
+    }
+    g_free(out);
   }
 
@@ -1004 +1006 @@
 void owl_message_cleanup(owl_message *m)
 {
-  int i, j;
+  int i;
   owl_pair *p;
 #ifdef HAVE_LIBZEPHYR    
-  if (owl_message_is_type_zephyr(m) && owl_message_is_direction_in(m)) {
+  if (m->has_notice) {
     ZFreeNotice(&(m->notice));
   }
@@ -1014 +1016 @@
 
   /* free all the attributes */
-  j=owl_list_get_size(&(m->attributes));
-  for (i=0; i<j; i++) {
-    p=owl_list_get_element(&(m->attributes), i);
+  for (i = 0; i < m->attributes->len; i++) {
+    p = m->attributes->pdata[i];
     g_free(owl_pair_get_value(p));
     g_free(p);
   }
 
-  owl_list_cleanup(&(m->attributes), NULL);
+  g_ptr_array_free(m->attributes, true);
  
   owl_message_invalidate_format(m);