Changeset 82dd923

Timestamp:

Mar 12, 2009, 11:38:04 PM (16 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

879e90dc

Parents:

e0fba58 (diff), 87dfeb7 (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 commit 'geofft/znotice-perl'

Files:

• perlconfig.c (modified) (2 diffs)
• Makefile.in (modified) (1 diff)
• perl/modules/IRC/lib/BarnOwl/Module/IRC.pm (modified) (2 diffs)
• perlwrap.pm (modified) (1 diff)
• zephyr.c (modified) (9 diffs)

perlconfig.c

@@ -129 +129 @@
    message2hashref and hashref2message. Currently we lose
    zephyr-specific properties stored in the ZNotice_t
+
+   This has been somewhat addressed, but is still not lossless.
  */
 owl_message * owl_perlconfig_hashref2message(SV *msg)
@@ -173 +175 @@
       owl_message_set_attribute(m, "adminheader", "");
   }
+#ifdef HAVE_LIBZEPHYR
+  if (owl_message_is_type_zephyr(m)) {
+    ZNotice_t *n = &(m->notice);
+    n->z_kind = ACKED;
+    n->z_port = 0;
+    n->z_auth = ZAUTH_NO;
+    n->z_checked_auth = 0;
+    n->z_class = owl_message_get_class(m);
+    n->z_class_inst = owl_message_get_instance(m);
+    n->z_opcode = owl_message_get_opcode(m);
+    n->z_sender = owl_message_get_sender(m);
+    n->z_recipient = owl_message_get_recipient(m);
+    n->z_default_format = "[zephyr created from perl]";
+    n->z_multinotice = "[zephyr created from perl]";
+    n->z_num_other_fields = 0;
+    n->z_message = owl_sprintf("%s%c%s", owl_message_get_zsig(m), '\0', owl_message_get_body(m));
+    n->z_message_len = strlen(owl_message_get_zsig(m)) + strlen(owl_message_get_body(m)) + 1;
+  }
+#endif
   return m;
 }

Makefile.in

@@ -79 +79 @@
 modules_clean:
         for i in $(MODULE_DIRS); do \
-                cd $$i; test ! -f Makefile || make clean; \
+                (cd $$i && (test ! -f Makefile || make clean)) \
         done
 

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

@@ -147 +147 @@
 
     BarnOwl::new_command(
-        'irc-msg' => mk_irc_command( \&cmd_msg, OPTIONAL_CHANNEL ),
+        'irc-msg' => mk_irc_command( \&cmd_msg ),
         {
             summary => 'Send an IRC message',
@@ -380 +380 @@
     my $cmd  = shift;
     my $conn = shift;
-    my $to = shift || shift or die("Usage: $cmd NICK\n");
+    my $to = shift or die("Usage: $cmd [NICK|CHANNEL]\n");
     # handle multiple recipients?
     if(@_) {

perlwrap.pm

@@ -1048 +1048 @@
     my $sender = $m->long_sender;
     $sender =~ s/\n.*$//s;
-    return "  (" . $sender . '@color[default]' . ")";
+    if (BarnOwl::getvar('colorztext') eq 'on') {
+      return "  (" . $sender . '@color[default]' . ")";
+    } else {
+      return "  ($sender)";
+    }
 }
 

zephyr.c

@@ -8 +8 @@
 
 static const char fileIdent[] = "$Id$";
+
+static GList *deferred_subs = NULL;
+typedef struct _owl_sub_list {                            /* noproto */
+  ZSubscription_t *subs;
+  int nsubs;
+} owl_sub_list;
 
 #ifdef HAVE_LIBZEPHYR
@@ -102 +108 @@
     owl_zephyr_load_initial_subs();
   }
+  while(deferred_subs != NULL) {
+    owl_sub_list *subs = deferred_subs->data;
+    owl_function_debugmsg("Loading %d deferred subs.", subs->nsubs);
+    owl_zephyr_loadsubs_helper(subs->subs, subs->nsubs);
+    deferred_subs = g_list_delete_link(deferred_subs, deferred_subs);
+    owl_free(subs);
+  }
 }
 
@@ -178 +191 @@
 int owl_zephyr_loadsubs_helper(ZSubscription_t subs[], int count)
 {
-  int i, ret = 0;
-  /* sub without defaults */
-  if (ZSubscribeToSansDefaults(subs,count,0) != ZERR_NONE) {
-    owl_function_error("Error subscribing to zephyr notifications.");
-    ret=-2;
-  }
-
-  /* free stuff */
-  for (i=0; i<count; i++) {
-    owl_free(subs[i].zsub_class);
-    owl_free(subs[i].zsub_classinst);
-    owl_free(subs[i].zsub_recipient);
+  int ret;
+  if (owl_global_is_havezephyr(&g)) {
+    int i;
+    /* sub without defaults */
+    if (ZSubscribeToSansDefaults(subs,count,0) != ZERR_NONE) {
+      owl_function_error("Error subscribing to zephyr notifications.");
+      ret=-2;
+    }
+
+    /* free stuff */
+    for (i=0; i<count; i++) {
+      owl_free(subs[i].zsub_class);
+      owl_free(subs[i].zsub_classinst);
+      owl_free(subs[i].zsub_recipient);
+    }
+
+    owl_free(subs);
+  } else {
+    owl_sub_list *s = owl_malloc(sizeof(owl_sub_list));
+    s->subs = subs;
+    s->nsubs = count;
+    deferred_subs = g_list_append(deferred_subs, s);
   }
 
@@ -242 +265 @@
     
     if (count >= subSize) {
-      ZSubscription_t* newsubs;
-      newsubs = owl_realloc(subs, sizeof(ZSubscription_t) * subSize * 2);
-      if (NULL == newsubs) {
-        /* If realloc fails, load what we've got, clear, and continue */
-        ret = owl_zephyr_loadsubs_helper(subs, count);
-        if (ret != 0) {
-          fclose(file);
-          return(ret);
-        }
-        count=0;
-      }
-      else {
-        subs = newsubs;
-        subSize *= 2;
-      }
+      subSize *= 2;
+      subs = owl_realloc(subs, sizeof(ZSubscription_t) * subSize);
     }
     
@@ -281 +291 @@
   fclose(file);
 
-  ret=owl_zephyr_loadsubs_helper(subs, count);
-  owl_free(subs);
+  owl_zephyr_loadsubs_helper(subs, count);
   return(ret);
 #else
@@ -308 +317 @@
 #ifdef HAVE_LIBZEPHYR
   FILE *file;
-  ZSubscription_t subs[3001];
+  ZSubscription_t *subs;
+  int numSubs = 100;
   char subsfile[1024], buffer[1024];
-  int count, ret, i;
+  int count, ret;
   struct stat statbuff;
+
+  subs = owl_malloc(numSubs * sizeof(ZSubscription_t));
 
   if (filename==NULL) {
@@ -325 +337 @@
 
   ZResetAuthentication();
-  /* need to redo this to do chunks, not just bag out after 3000 */
   count=0;
   file=fopen(subsfile, "r");
@@ -332 +343 @@
       if (buffer[0]=='#' || buffer[0]=='\n' || buffer[0]=='\n') continue;
       
-      if (count >= 3000) break; /* also tell the user */
+      if (count == numSubs) {
+        numSubs *= 2;
+        subs = owl_realloc(subs, numSubs * sizeof(ZSubscription_t));
+      }
 
       buffer[strlen(buffer)-1]='\0';
-      subs[count].zsub_class="login";
-      subs[count].zsub_recipient="*";
+      subs[count].zsub_class=owl_strdup("login");
+      subs[count].zsub_recipient=owl_strdup("*");
       if (strchr(buffer, '@')) {
-        subs[count].zsub_classinst=owl_strdup(buffer);
+        subs[count].zsub_classinst=owl_strdup(buffer);
       } else {
-        subs[count].zsub_classinst=owl_sprintf("%s@%s", buffer, ZGetRealm());
+        subs[count].zsub_classinst=owl_sprintf("%s@%s", buffer, ZGetRealm());
       }
 
@@ -351 +365 @@
   }
 
-  /* sub with defaults */
-  if (ZSubscribeToSansDefaults(subs,count,0) != ZERR_NONE) {
-    owl_function_error("Error subscribing to zephyr notifications.");
-    ret=-2;
-  }
-
-  /* free stuff */
-  for (i=0; i<count; i++) {
-    owl_free(subs[i].zsub_classinst);
-  }
-
+  ret = owl_zephyr_loadsubs_helper(subs, count);
   return(ret);
 #else