Changeset 526a20d

Timestamp:

Nov 7, 2014, 4:11:20 AM (8 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Parents:

5f3f1e4 (diff), 6a5f0c3 (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:

Merge 6a5f0c3f91523f48a326ec914def708482287bdb into 5f3f1e484f3c4b262b481efbd32602853bb41a27

Files:

• Makefile.am (modified) (1 diff)
• aim.c (modified) (1 diff)
• message.c (modified) (32 diffs)
• owl.h (modified) (2 diffs)
• pair.c (deleted)
• perlconfig.c (modified) (6 diffs)
• tester.c (modified) (1 diff)
• util.c (modified) (1 diff)
• .travis.yml (modified) (2 diffs)
• functions.c (modified) (2 diffs)
• perl/modules/Twitter/lib/BarnOwl/Module/Twitter.pm (modified) (3 diffs)
• perl/modules/Twitter/lib/BarnOwl/Module/Twitter/Handle.pm (modified) (2 diffs)
• variable.c (modified) (1 diff)
• zephyr.c (modified) (5 diffs)

Makefile.am

@@ -58 +58 @@
      util.c logging.c \
      perlconfig.c keys.c functions.c zwrite.c viewwin.c help.c filter.c \
-     regex.c history.c view.c dict.c variable.c filterelement.c pair.c \
+     regex.c history.c view.c dict.c variable.c filterelement.c \
      keypress.c keymap.c keybinding.c cmd.c context.c \
      aim.c buddy.c buddylist.c style.c errqueue.c \

aim.c

@@ -1056 +1056 @@
                          OWL_MESSAGE_DIRECTION_IN,
                          0);
-  if (args->icbmflags & AIM_IMFLAGS_AWAY) owl_message_set_attribute(m, "isauto", "");
+  if (args->icbmflags & AIM_IMFLAGS_AWAY) owl_message_set_attribute(m, "isauto", "", NULL);
   owl_global_messagequeue_addmsg(&g, m);
   g_free(stripmsg);

message.c

@@ -39 +39 @@
 
   owl_message_set_hostname(m, "");
-  m->attributes = g_ptr_array_new();
+  g_datalist_init(&m->attributes);
   
   /* save the time */
@@ -52 +52 @@
  * name already exists, replace the old value with the new value
  */
-void owl_message_set_attribute(owl_message *m, const char *attrname, const char *attrvalue)
-{
-  int i;
-  owl_pair *p = NULL, *pair = NULL;
-
-  attrname = g_intern_string(attrname);
-
-  /* look for an existing pair with this key, */
-  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));
-      pair = p;
-      break;
-    }
-  }
-
-  if(pair ==  NULL) {
-    pair = g_slice_new(owl_pair);
-    owl_pair_create(pair, attrname, NULL);
-    g_ptr_array_add(m->attributes, pair);
-  }
-  owl_pair_set_value(pair, owl_validate_or_convert(attrvalue));
+void owl_message_set_attribute(owl_message *m, const char *attrname, const char *attrvalue, GDestroyNotify attrdestroy)
+{
+  if (owl_needs_convert(attrvalue)) {
+    g_datalist_set_data_full(&m->attributes, attrname,
+                             owl_validate_or_convert(attrvalue), g_free);
+    if (attrdestroy)
+      attrdestroy((gpointer)attrvalue);
+  } else {
+    g_datalist_set_data_full(&m->attributes, attrname, (gpointer)attrvalue, attrdestroy);
+  }
 }
 
@@ -82 +69 @@
 const char *owl_message_get_attribute_value(const owl_message *m, const char *attrname)
 {
-  int i;
-  owl_pair *p;
-  GQuark quark;
-
-  quark = g_quark_try_string(attrname);
-  if (quark == 0)
-    /* don't bother inserting into string table */
-    return NULL;
-  attrname = g_quark_to_string(quark);
-
-  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));
-    }
-  }
-
-  /*
-  owl_function_debugmsg("No attribute %s found for message %i",
-                        attrname,
-                        owl_message_get_id(m));
-  */
-  return(NULL);
+  return g_datalist_get_data(&((owl_message *)m)->attributes, attrname);
 }
 
@@ -111 +76 @@
  * function to indent fmtext.
  */
-void owl_message_attributes_tofmtext(const owl_message *m, owl_fmtext *fm) {
-  int i;
-  owl_pair *p;
+static void owl_message_attribute_tofmtext(GQuark key_id, gpointer data, gpointer fm)
+{
   char *buff, *tmpbuff;
 
+  tmpbuff = owl_text_indent(data, 19, false);
+  buff = g_strdup_printf("  %-15.15s: %s\n", g_quark_to_string(key_id), tmpbuff);
+  g_free(tmpbuff);
+  owl_fmtext_append_normal(fm, buff);
+  g_free(buff);
+}
+
+void owl_message_attributes_tofmtext(const owl_message *m, owl_fmtext *fm)
+{
   owl_fmtext_init_null(fm);
-
-  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) {
-      buff = g_strdup_printf("  %-15.15s: %s\n", owl_pair_get_key(p), "<error>");
-      if(buff == NULL)
-        buff=g_strdup("   <error>\n");
-    }
-    owl_fmtext_append_normal(fm, buff);
-    g_free(buff);
-  }
+  g_datalist_foreach(&((owl_message *)m)->attributes, owl_message_attribute_tofmtext, fm);
 }
 
@@ -170 +124 @@
 }
 
-void owl_message_set_class(owl_message *m, const char *class)
-{
-  owl_message_set_attribute(m, "class", class);
-}
-
 const char *owl_message_get_class(const owl_message *m)
 {
@@ -184 +133 @@
 }
 
-void owl_message_set_instance(owl_message *m, const char *inst)
-{
-  owl_message_set_attribute(m, "instance", inst);
-}
-
 const char *owl_message_get_instance(const owl_message *m)
 {
@@ -198 +142 @@
 }
 
-void owl_message_set_sender(owl_message *m, const char *sender)
-{
-  owl_message_set_attribute(m, "sender", sender);
-}
-
 const char *owl_message_get_sender(const owl_message *m)
 {
@@ -212 +151 @@
 }
 
-void owl_message_set_zsig(owl_message *m, const char *zsig)
-{
-  owl_message_set_attribute(m, "zsig", zsig);
-}
-
 const char *owl_message_get_zsig(const owl_message *m)
 {
@@ -226 +160 @@
 }
 
-void owl_message_set_recipient(owl_message *m, const char *recip)
-{
-  owl_message_set_attribute(m, "recipient", recip);
-}
-
 const char *owl_message_get_recipient(const owl_message *m)
 {
@@ -242 +171 @@
 }
 
-void owl_message_set_realm(owl_message *m, const char *realm)
-{
-  owl_message_set_attribute(m, "realm", realm);
-}
-
 const char *owl_message_get_realm(const owl_message *m)
 {
@@ -256 +180 @@
 }
 
-void owl_message_set_body(owl_message *m, const char *body)
-{
-  owl_message_set_attribute(m, "body", body);
-}
-
 const char *owl_message_get_body(const owl_message *m)
 {
@@ -271 +190 @@
 
 
-void owl_message_set_opcode(owl_message *m, const char *opcode)
-{
-  owl_message_set_attribute(m, "opcode", opcode);
-}
-
 const char *owl_message_get_opcode(const owl_message *m)
 {
@@ -288 +202 @@
 void owl_message_set_islogin(owl_message *m)
 {
-  owl_message_set_attribute(m, "loginout", "login");
+  owl_message_set_attribute(m, "loginout", "login", NULL);
 }
 
@@ -294 +208 @@
 void owl_message_set_islogout(owl_message *m)
 {
-  owl_message_set_attribute(m, "loginout", "logout");
+  owl_message_set_attribute(m, "loginout", "logout", NULL);
 }
 
@@ -329 +243 @@
 void owl_message_set_isprivate(owl_message *m)
 {
-  owl_message_set_attribute(m, "isprivate", "true");
+  owl_message_set_attribute(m, "isprivate", "true", NULL);
 }
 
@@ -354 +268 @@
 void owl_message_set_type_admin(owl_message *m)
 {
-  owl_message_set_attribute(m, "type", "admin");
+  owl_message_set_attribute(m, "type", "admin", NULL);
 }
 
 void owl_message_set_type_loopback(owl_message *m)
 {
-  owl_message_set_attribute(m, "type", "loopback");
+  owl_message_set_attribute(m, "type", "loopback", NULL);
 }
 
 void owl_message_set_type_zephyr(owl_message *m)
 {
-  owl_message_set_attribute(m, "type", "zephyr");
+  owl_message_set_attribute(m, "type", "zephyr", NULL);
 }
 
 void owl_message_set_type_aim(owl_message *m)
 {
-  owl_message_set_attribute(m, "type", "AIM");
-}
-
-void owl_message_set_type(owl_message *m, const char* type)
-{
-  owl_message_set_attribute(m, "type", type);
+  owl_message_set_attribute(m, "type", "AIM", NULL);
 }
 
@@ -483 +392 @@
   if (!z) return "";
   return z;
-}
-
-void owl_message_set_zwriteline(owl_message *m, const char *line)
-{
-  owl_message_set_attribute(m, "zwriteline", line);
 }
 
@@ -564 +468 @@
 
 void owl_message_set_isanswered(owl_message *m) {
-  owl_message_set_attribute(m, "question", "answered");
+  owl_message_set_attribute(m, "question", "answered", NULL);
 }
 
@@ -696 +600 @@
 {
   owl_message_init(m);
-  owl_message_set_body(m, text);
-  owl_message_set_sender(m, sender);
-  owl_message_set_recipient(m, recipient);
+  owl_message_set_attribute(m, "body", g_strdup(text), g_free);
+  owl_message_set_attribute(m, "sender", g_strdup(sender), g_free);
+  owl_message_set_attribute(m, "recipient", g_strdup(recipient), g_free);
   owl_message_set_type_aim(m);
 
@@ -723 +627 @@
   owl_message_init(m);
   owl_message_set_type_admin(m);
-  owl_message_set_body(m, text);
-  owl_message_set_attribute(m, "adminheader", header); /* just a hack for now */
+  owl_message_set_attribute(m, "body", g_strdup(text), g_free);
+  owl_message_set_attribute(m, "adminheader", g_strdup(header), g_free); /* just a hack for now */
 }
 
@@ -732 +636 @@
   owl_message_init(m);
   owl_message_set_type_loopback(m);
-  owl_message_set_body(m, text);
-  owl_message_set_sender(m, "loopsender");
-  owl_message_set_recipient(m, "looprecip");
+  owl_message_set_attribute(m, "body", g_strdup(text), g_free);
+  owl_message_set_attribute(m, "sender", "loopsender", NULL);
+  owl_message_set_attribute(m, "recipient", "looprecip", NULL);
   owl_message_set_isprivate(m);
 }
@@ -768 +672 @@
     }
 
-    owl_message_set_attribute(m, "zephyr_ccs", recips->str);
-    g_string_free(recips, true);
+    owl_message_set_attribute(m, "zephyr_ccs", g_string_free(recips, false), g_free);
   }
 }
@@ -781 +684 @@
   struct hostent *hent;
 #endif /* ZNOTICE_SOCKADDR */
-  char *tmp, *tmp2;
+  char *tmp;
   int len;
 
@@ -803 +706 @@
 
   /* set other info */
-  owl_message_set_sender(m, n->z_sender);
-  owl_message_set_class(m, n->z_class);
-  owl_message_set_instance(m, n->z_class_inst);
-  owl_message_set_recipient(m, n->z_recipient);
+  owl_message_set_attribute(m, "sender", n->z_sender, NULL);
+  owl_message_set_attribute(m, "class", n->z_class, NULL);
+  owl_message_set_attribute(m, "instance", n->z_class_inst, NULL);
+  owl_message_set_attribute(m, "recipient", n->z_recipient, NULL);
   if (n->z_opcode) {
-    owl_message_set_opcode(m, n->z_opcode);
+    owl_message_set_attribute(m, "opcode", n->z_opcode, NULL);
   } else {
-    owl_message_set_opcode(m, "");
-  }
-  owl_message_set_zsig(m, owl_zephyr_get_zsig(n, &len));
-
-  owl_message_set_realm(m, zuser_realm(n->z_recipient));
+    owl_message_set_attribute(m, "opcode", "", NULL);
+  }
+  owl_message_set_attribute(m, "zsig", owl_zephyr_get_zsig(n, &len), NULL);
+
+  owl_message_set_attribute(m, "realm", zuser_realm(n->z_recipient), NULL);
 
   /* Set the "isloginout" attribute if it's a login message */
   if (!strcasecmp(n->z_class, "login") || !strcasecmp(n->z_class, OWL_WEBZEPHYR_CLASS)) {
     if (!strcasecmp(n->z_opcode, "user_login") || !strcasecmp(n->z_opcode, "user_logout")) {
-      tmp=owl_zephyr_get_field(n, 1);
-      owl_message_set_attribute(m, "loginhost", tmp);
-      g_free(tmp);
-
-      tmp=owl_zephyr_get_field(n, 3);
-      owl_message_set_attribute(m, "logintty", tmp);
-      g_free(tmp);
+      owl_message_set_attribute(m, "loginhost", owl_zephyr_get_field(n, 1), g_free);
+      owl_message_set_attribute(m, "logintty", owl_zephyr_get_field(n, 3), g_free);
     }
 
@@ -844 +742 @@
   if (!strcasecmp(n->z_message, "Automated reply:") ||
       !strcasecmp(n->z_opcode, "auto")) {
-    owl_message_set_attribute(m, "isauto", "");
+    owl_message_set_attribute(m, "isauto", "", NULL);
   }
 
@@ -864 +762 @@
   tmp=owl_zephyr_get_message(n, m);
   if (owl_global_is_newlinestrip(&g)) {
-    tmp2=owl_util_stripnewlines(tmp);
-    owl_message_set_body(m, tmp2);
-    g_free(tmp2);
+    owl_message_set_attribute(m, "body", owl_util_stripnewlines(tmp), g_free);
+    g_free(tmp);
   } else {
-    owl_message_set_body(m, tmp);
-  }
-  g_free(tmp);
+    owl_message_set_attribute(m, "body", tmp, g_free);
+  }
 
   /* if zcrypt is enabled try to decrypt the message */
@@ -897 +793 @@
         out[len - 8] = 0;
       }
-      owl_message_set_body(m, out);
+      owl_message_set_attribute(m, "body", out, g_free);
     } else {
       /* Replace the opcode. Otherwise the UI and other bits of code think the
        * message was encrypted. */
-      owl_message_set_opcode(m, "failed-decrypt");
+      owl_message_set_attribute(m, "opcode", "failed-decrypt", NULL);
+      g_free(out);
     }
-    g_free(out);
   }
 
@@ -930 +826 @@
   owl_message_set_direction_in(m);
 
-  owl_message_set_attribute(m, "pseudo", "");
-  owl_message_set_attribute(m, "loginhost", host ? host : "");
-  owl_message_set_attribute(m, "logintty", tty ? tty : "");
-
-  owl_message_set_sender(m, longuser);
-  owl_message_set_class(m, "LOGIN");
-  owl_message_set_instance(m, longuser);
-  owl_message_set_recipient(m, "");
+  owl_message_set_attribute(m, "pseudo", "", NULL);
+  owl_message_set_attribute(m, "loginhost", g_strdup(host ? host : ""), g_free);
+  owl_message_set_attribute(m, "logintty", g_strdup(tty ? tty : ""), g_free);
+
+  owl_message_set_attribute(m, "sender", g_strdup(longuser), g_free);
+  owl_message_set_attribute(m, "class", "LOGIN", NULL);
+  owl_message_set_attribute(m, "instance", g_strdup(longuser), g_free);
+  owl_message_set_attribute(m, "recipient", "", NULL);
   if (direction==0) {
-    owl_message_set_opcode(m, "USER_LOGIN");
+    owl_message_set_attribute(m, "opcode", "USER_LOGIN", NULL);
     owl_message_set_islogin(m);
   } else if (direction==1) {
-    owl_message_set_opcode(m, "USER_LOGOUT");
+    owl_message_set_attribute(m, "opcode", "USER_LOGOUT", NULL);
     owl_message_set_islogout(m);
   }
 
-  owl_message_set_realm(m, zuser_realm(longuser));
-
-  owl_message_set_body(m, "<uninitialized>");
+  owl_message_set_attribute(m, "realm", g_strdup(zuser_realm(longuser)), g_free);
+
+  owl_message_set_attribute(m, "body", "<uninitialized>", NULL);
 
   /* save the hostname */
@@ -965 +861 @@
   owl_message_set_direction_out(m);
   owl_message_set_type_zephyr(m);
-  owl_message_set_sender(m, owl_zephyr_get_sender());
-  owl_message_set_class(m, owl_zwrite_get_class(z));
-  owl_message_set_instance(m, owl_zwrite_get_instance(z));
+  owl_message_set_attribute(m, "sender", g_strdup(owl_zephyr_get_sender()), g_free);
+  owl_message_set_attribute(m, "class", g_strdup(owl_zwrite_get_class(z)), g_free);
+  owl_message_set_attribute(m, "instance", g_strdup(owl_zwrite_get_instance(z)), g_free);
   if (recip_index < owl_zwrite_get_numrecips(z)) {
     char *zuser = owl_zwrite_get_recip_n_with_realm(z, recip_index);
     char *longzuser = long_zuser(zuser);
-    owl_message_set_recipient(m, longzuser);
-    owl_message_set_realm(m, zuser_realm(longzuser));
-    g_free(longzuser);
+    owl_message_set_attribute(m, "realm", g_strdup(zuser_realm(longzuser)), g_free);
+    owl_message_set_attribute(m, "recipient", longzuser, g_free);
     g_free(zuser);
   } else {
@@ -980 +875 @@
      * anyway. */
     const char *realm = owl_zwrite_get_realm(z);
-    owl_message_set_realm(m, realm[0] ? realm : owl_zephyr_get_realm());
-  }
-  owl_message_set_opcode(m, owl_zwrite_get_opcode(z));
+    owl_message_set_attribute(m, "realm", g_strdup(realm[0] ? realm : owl_zephyr_get_realm()), g_free);
+  }
+  owl_message_set_attribute(m, "opcode", g_strdup(owl_zwrite_get_opcode(z)), g_free);
 
   /* Although not strictly the zwriteline, anyone using the unsantized version
    * of it probably has a bug. */
   replyline = owl_zwrite_get_replyline(z, recip_index);
-  owl_message_set_zwriteline(m, replyline);
+  owl_message_set_attribute(m, "zwriteline", g_strdup(replyline), g_free);
   g_free(replyline);
 
-  owl_message_set_body(m, body);
-  owl_message_set_zsig(m, owl_zwrite_get_zsig(z));
+  owl_message_set_attribute(m, "body", g_strdup(body), g_free);
+  owl_message_set_attribute(m, "zsig", g_strdup(owl_zwrite_get_zsig(z)), g_free);
   
   /* save the hostname */
@@ -1006 +901 @@
 void owl_message_cleanup(owl_message *m)
 {
-  int i;
-  owl_pair *p;
 #ifdef HAVE_LIBZEPHYR    
   if (m->has_notice) {
@@ -1016 +909 @@
 
   /* free all the attributes */
-  for (i = 0; i < m->attributes->len; i++) {
-    p = m->attributes->pdata[i];
-    g_free(owl_pair_get_value(p));
-    g_slice_free(owl_pair, p);
-  }
-
-  g_ptr_array_free(m->attributes, true);
+  g_datalist_clear(&m->attributes);
  
   owl_message_invalidate_format(m);

owl.h

@@ -339 +339 @@
 } owl_zwrite;
 
-typedef struct _owl_pair {
-  const char *key;
-  char *value;
-} owl_pair;
-
 struct _owl_fmtext_cache;
 
@@ -356 +351 @@
   int delete;
   const char *hostname;
-  GPtrArray *attributes;          /* this is a list of pairs */
+  GData *attributes;
   char *timestr;
   time_t time;

perlconfig.c

@@ -69 +69 @@
 }
 
+static void owl_perlconfig_store_attribute(GQuark key_id, gpointer data, gpointer h)
+{
+  (void)hv_store(h, g_quark_to_string(key_id), strlen(data),
+                 owl_new_sv(data), 0);
+}
+
 CALLER_OWN SV *owl_perlconfig_message2hashref(const owl_message *m)
 {
@@ -76 +82 @@
   char *ptr, *utype, *blessas;
   const char *f;
-  int i;
-  const owl_pair *pair;
   const owl_filter *wrap;
 
@@ -112 +116 @@
   }
 
-  for (i = 0; i < m->attributes->len; i++) {
-    pair = m->attributes->pdata[i];
-    (void)hv_store(h, owl_pair_get_key(pair), strlen(owl_pair_get_key(pair)),
-                   owl_new_sv(owl_pair_get_value(pair)),0);
-  }
+  g_datalist_foreach(&((owl_message *)m)->attributes, owl_perlconfig_store_attribute, h);
   
   MSG2H(h, type);
@@ -195 +195 @@
     key = hv_iterkey(ent, &len);
     val = SvPV_nolen(hv_iterval(hash, ent));
-    if(!strcmp(key, "type")) {
-      owl_message_set_type(m, val);
-    } else if(!strcmp(key, "direction")) {
+    if (!strcmp(key, "direction")) {
       owl_message_set_direction(m, owl_message_parse_direction(val));
     } else if(!strcmp(key, "private")) {
@@ -206 +204 @@
     } else if (!strcmp(key, "hostname")) {
       owl_message_set_hostname(m, val);
-    } else if (!strcmp(key, "zwriteline")) {
-      owl_message_set_zwriteline(m, val);
     } else if (!strcmp(key, "time")) {
       g_free(m->timestr);
@@ -214 +210 @@
       m->time = mktime(&tm);
     } else {
-      owl_message_set_attribute(m, key, val);
+      owl_message_set_attribute(m, key, g_strdup(val), g_free);
     }
   }
   if(owl_message_is_type_admin(m)) {
     if(!owl_message_get_attribute_value(m, "adminheader"))
-      owl_message_set_attribute(m, "adminheader", "");
+      owl_message_set_attribute(m, "adminheader", "", NULL);
   }
   return m;

tester.c

@@ -464 +464 @@
   owl_message_set_type_zephyr(&m);
   owl_message_set_direction_in(&m);
-  owl_message_set_class(&m, "owl");
-  owl_message_set_instance(&m, "tester");
-  owl_message_set_sender(&m, "owl-user");
-  owl_message_set_recipient(&m, "joe");
-  owl_message_set_attribute(&m, "foo", "bar");
+  owl_message_set_attribute(&m, "class", "owl", NULL);
+  owl_message_set_attribute(&m, "instance", "tester", NULL);
+  owl_message_set_attribute(&m, "sender", "owl-user", NULL);
+  owl_message_set_attribute(&m, "recipient", "joe", NULL);
+  owl_message_set_attribute(&m, "foo", "bar", NULL);
 
 #define TEST_FILTER(f, e) do {                          \

util.c

@@ -610 +610 @@
 }
 
+/* Check whether in is not valid UTF-8 or has format characters. */
+bool owl_needs_convert(const char *in)
+{
+  const char *p;
+  if (!g_utf8_validate(in, -1, NULL))
+    return true;
+  for (p = strchr(in, OWL_FMTEXT_UC_STARTBYTE_UTF8);
+       p != NULL;
+       p = strchr(p + 1, OWL_FMTEXT_UC_STARTBYTE_UTF8)) {
+    if (owl_fmtext_is_format_char(g_utf8_get_char(p)))
+      return true;
+  }
+  return false;
+}
+
 /* If in is not UTF-8, convert from ISO-8859-1. We may want to allow
  * the caller to specify an alternative in the future. We also strip

.travis.yml

@@ +1 @@
+
 language: perl
 compiler:
@@ -9 +10 @@
   - "5.16"
   - "5.18"
-  - "5.19"
+  - "5.20"
 install:
   - sudo apt-get update -q

functions.c

@@ -1227 +1227 @@
   time_t now;
   va_list ap;
-  va_start(ap, fmt);
 
   if (!owl_global_is_debug_fast(&g))
@@ -1242 +1241 @@
           (int) getpid(), tmpbuff, now - owl_global_get_starttime(&g));
   g_free(tmpbuff);
+
+  va_start(ap, fmt);
   vfprintf(file, fmt, ap);
+  va_end(ap);
+
   putc('\n', file);
   fflush(file);
-
-  va_end(ap);
 }
 

perl/modules/Twitter/lib/BarnOwl/Module/Twitter.pm

@@ -137 +137 @@
         my $twitter_args = { username   => $cfg->{user},
                              password   => $cfg->{password},
-                             source     => 'barnowl', 
+                             source     => 'barnowl',
+                             ssl        => 1,
+                             legacy_lists_api => 0,
                          };
         if (defined $cfg->{service}) {
@@ -274 +276 @@
 );
 
+BarnOwl::new_command( 'twitter-favorite' => sub { cmd_twitter_favorite(@_) },
+    {
+    summary     => 'Favorite the current Twitter message',
+    usage       => 'twitter-favorite [ACCOUNT]',
+    description => <<END_DESCRIPTION
+Favorite the current Twitter message using ACCOUNT (defaults to the
+account that received the tweet).
+END_DESCRIPTION
+    }
+);
+
 BarnOwl::new_command( 'twitter-follow' => sub { cmd_twitter_follow(@_); },
     {
@@ -355 +368 @@
     $account = $m->account unless defined($account);
     find_account($account)->twitter_retweet($m);
+    return;
+}
+
+sub cmd_twitter_favorite {
+    my $cmd = shift;
+    my $account = shift;
+    my $m = BarnOwl::getcurmsg();
+    if(!$m || $m->type ne 'Twitter') {
+        die("$cmd must be used with a Twitter message selected.\n");
+    }
+
+    $account = $m->account unless defined($account);
+    find_account($account)->twitter_favorite($m);
     return;
 }

perl/modules/Twitter/lib/BarnOwl/Module/Twitter/Handle.pm

@@ -371 +371 @@
         $self->twitter_direct($1, $2);
     } elsif(defined $self->{twitter}) {
-        if(length($msg) > 140) {
-            die("Twitter: Message over 140 characters long.\n");
-        }
         $self->twitter_command('update', {
             status => $msg,
@@ -432 +429 @@
 }
 
+sub twitter_favorite {
+    my $self = shift;
+    my $msg = shift;
+
+    if($msg->service ne $self->{cfg}->{service}) {
+        die("Cannot favorite a message from a different service.\n");
+    }
+    $self->twitter_command(create_favorite => $msg->{status_id});
+}
+
+
 sub twitter_follow {
     my $self = shift;

variable.c

@@ -1038 +1038 @@
 CALLER_OWN char *owl_variable_bool_get_tostring_default(const owl_variable *v, void *dummy)
 {
-  bool val = owl_variable_get_bool(v);
-  if (val == 0) {
-    return g_strdup("off");
-  } else if (val == 1) {
-    return g_strdup("on");
-  } else {
-    return g_strdup("<invalid>");
-  }
+  return g_strdup(owl_variable_get_bool(v) ? "on" : "off");
 }
 

zephyr.c

@@ -283 +283 @@
 #ifdef HAVE_LIBZEPHYR
   FILE *file;
+  int fopen_errno;
   char *tmp, *start;
   char *buffer = NULL;
@@ -289 +290 @@
   int subSize = 1024;
   int count;
-  struct stat statbuff;
 
   subsfile = owl_zephyr_dotfile(".zephyr.subs", filename);
 
-  if (stat(subsfile, &statbuff) != 0) {
-    g_free(subsfile);
-    if (error_on_nofile == 1)
+  count = 0;
+  file = fopen(subsfile, "r");
+  fopen_errno = errno;
+  g_free(subsfile);
+  if (!file) {
+    if (error_on_nofile == 1 || fopen_errno != ENOENT)
       return -1;
     return 0;
   }
-
-  ZResetAuthentication();
-  count = 0;
-  file = fopen(subsfile, "r");
-  g_free(subsfile);
-  if (!file)
-    return -1;
 
   subs = g_new(ZSubscription_t, subSize);
@@ -348 +344 @@
     g_free(buffer);
 
+  ZResetAuthentication();
   return owl_zephyr_loadsubs_helper(subs, count);
 #else
@@ -412 +409 @@
   char *buffer = NULL;
   int count;
-  struct stat statbuff;
 
   subs = g_new(ZSubscription_t, numSubs);
   subsfile = owl_zephyr_dotfile(".anyone", filename);
 
-  if (stat(subsfile, &statbuff) == -1) {
-    g_free(subs);
-    g_free(subsfile);
-    return 0;
-  }
-
-  ZResetAuthentication();
   count = 0;
   file = fopen(subsfile, "r");
@@ -445 +434 @@
     fclose(file);
   } else {
+    g_free(subs);
     return 0;
   }
   g_free(buffer);
 
+  ZResetAuthentication();
   return owl_zephyr_loadsubs_helper(subs, count);
 #else