Changeset 484b14d

Timestamp:

Mar 16, 2009, 9:04:38 AM (15 years ago)

Author:

Sam Hartman <hartmans@mit.edu>

Branches:

debian

Children:

0f8bdd7

Parents:

4779b8c (diff), 879e90dc (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 'barnowl-1.1' into debian

Conflicts:

	.gitignore
	Makefile.in

Files:

• .gitignore (modified) (3 diffs)
• COPYING (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• Makefile.in (modified) (2 diffs)
• autogen.sh (added)
• commands.c (modified) (1 diff)
• config.h.in (deleted)
• configure.ac (modified) (1 diff)
• functions.c (modified) (7 diffs)
• libfaim/configure (deleted)
• libfaim/configure.ac (moved) (moved from libfaim/configure.in)
• owl.c (modified) (8 diffs)
• owl.h (modified) (3 diffs)
• perl/modules/IRC/lib/BarnOwl/Module/IRC.pm (modified) (14 diffs)
• perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm (modified) (2 diffs)
• perl/modules/WordWrap/Makefile.PL (added)
• perl/modules/WordWrap/inc/Module/Install.pm (added)
• perl/modules/WordWrap/inc/Module/Install/BarnOwl.pm (added)
• perl/modules/WordWrap/inc/Module/Install/Base.pm (added)
• perl/modules/WordWrap/inc/Module/Install/Can.pm (added)
• perl/modules/WordWrap/inc/Module/Install/Fetch.pm (added)
• perl/modules/WordWrap/inc/Module/Install/Makefile.pm (added)
• perl/modules/WordWrap/inc/Module/Install/Metadata.pm (added)
• perl/modules/WordWrap/inc/Module/Install/Win32.pm (added)
• perl/modules/WordWrap/inc/Module/Install/WriteAll.pm (added)
• perl/modules/WordWrap/lib/BarnOwl/Module/WordWrap.pm (added)
• perlconfig.c (modified) (2 diffs)
• perlwrap.pm (modified) (4 diffs)
• zephyr.c (modified) (10 diffs)
• .gbp.conf (added)
• debian/README.Debian (added)
• debian/barnowl-irc.install (added)
• debian/barnowl.dirs (added)
• debian/barnowl.docs (added)
• debian/barnowl.install (added)
• debian/changelog (added)
• debian/compat (added)
• debian/control (added)
• debian/control.in (added)
• debian/copyright (added)
• debian/rules (added)
• debian/shlibs.local (added)

.gitignore

@@ -1 +1 @@
 *.a
+*.o
+*.par
+*~
+META.yml
+Makefile
+TAGS
+aclocal.m4
 autom4te.cache
 barnowl
@@ -5 +12 @@
 config.cache
 config.h
+config.h.in
 config.log
 config.status
@@ -10 +18 @@
 core
 jabber.log
-Makefile
-META.yml
-*.o
 owl_prototypes.h
 owl_prototypes.h.new
-*.par
 perlglue.c
 perlwrap.c
 pm_to_blib
-TAGS
 tester
 varstubs.c

COPYING

@@ -1 @@
-Copyright (c) 2006-2008 The BarnOwl Developers. All rights reserved.
+Copyright (c) 2006-2009 The BarnOwl Developers. All rights reserved.
 Copyright (c) 2004 James Kretchmar. All rights reserved.
 

ChangeLog

@@ +1 @@
+1.1
+ * Support building with -fstack-protector. -hartmans
+ * Don't save partial passwords in editwin history. -nelhage
+ * Improve IRC documentation. -nelhage
+ * Don't use the 'zsender' variable for personals. -geofft
+ * Implement irc-quote and irc-mode. -nelhage
+ * Leave a one-column margin when wordwrapping. -nelhage
+ * Remove some autotools-generated files. -andersk
+ * Include IRC in the default build. -nelhage
+ * Add a wordwrapping variant of the default style. -nelhage
+ * Don't send stderr to admin messages. -nelhage
+ * Remove a build-dependency on krb4. -hartmans
+ * Allow the creation of type zephyr messages from perl. -geofft
+ * Initialize Zephyr asynchronously at startup. -nelhage
+
 1.0.5
  * Implement initial support for real timers. -nelhage

Makefile.in

@@ -33 +33 @@
 
 EXE = barnowl
-PERL_MODULES = Jabber IRC
+PERL_MODULES = Jabber IRC WordWrap
 MODULE_DIRS = $(PERL_MODULES:%=perl/modules/%)
 
@@ -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
 

commands.c

@@ -2650 +2650 @@
   owl_function_makemsg("Command cancelled.");
 
-  hist=owl_editwin_get_history(e);
-  owl_history_store(hist, owl_editwin_get_text(e));
-  owl_history_reset(hist);
+  if(e->echochar == 0) {
+    hist=owl_editwin_get_history(e);
+    owl_history_store(hist, owl_editwin_get_text(e));
+    owl_history_reset(hist);
+  }
 
   owl_editwin_fullclear(e);

configure.ac

@@ -11 +11 @@
      CFLAGS="$CFLAGS -Wall -g";
 fi
-
-m4_include(/usr/share/aclocal/pkg.m4)
-dnl m4_include(pkg.m4)
 
 dnl Check for Athena

functions.c

@@ -127 +127 @@
   text=""
     "barnowl version " OWL_VERSION_STRING "\n"
-    "Copyright (c) 2006-2008 The BarnOwl Developers. All rights reserved.\n"
+    "Copyright (c) 2006-2009 The BarnOwl Developers. All rights reserved.\n"
     "Copyright (c) 2004 James Kretchmar. All rights reserved.\n"
     "\n"
@@ -921 +921 @@
   if (!owl_context_is_interactive(owl_global_get_context(&g))) return;
   if (ret==0) {
-    owl_function_makemsg("Subscribed to login messages from file.");
   } else if (ret==-1) {
     owl_function_error("Could not open file for login subscriptions.");
@@ -1398 +1397 @@
     "because we feel our owls should live closer to our ponies.\n"
     "\n"
-    "Copyright (c) 2006-2008 The BarnOwl Developers. All rights reserved.\n"
+    "Copyright (c) 2006-2009 The BarnOwl Developers. All rights reserved.\n"
     "Copyright (c) 2004 James Kretchmar. All rights reserved.\n"
     "Copyright 2002 Massachusetts Institute of Technology\n"
@@ -3289 +3288 @@
 void owl_function_source(char *filename)
 {
+  char *path;
   FILE *file;
   char buff[LINE];
@@ -3295 +3295 @@
   if (!filename) {
     fail_silent = 1;
-    filename=owl_global_get_startupfile(&g);
-  }
-  file=fopen(filename, "r");
+    path = owl_strdup(owl_global_get_startupfile(&g));
+  } else {
+    path = owl_util_makepath(filename);
+  }
+  file=fopen(path, "r");
+  owl_free(path);
   if (!file) {
     if (!fail_silent) {
@@ -3349 +3352 @@
 {
   va_list ap;
-  char *buff, *buff2;
+  char *buff;
   char *nl;
-  char *date;
-  time_t now;
-
-  now=time(NULL);
-  date=owl_strdup(ctime(&now));
-  date[strlen(date)-1]='\0';
 
   va_start(ap, fmt);
 
   buff = g_strdup_vprintf(fmt, ap);
-  buff2 = owl_sprintf("%s %s", date, buff);
   owl_function_debugmsg("ERROR: %s", buff);
   nl = strchr(buff, '\n');
@@ -3370 +3366 @@
     owl_function_makemsg("[Error] %s", buff);
   }
-  owl_errqueue_append_err(owl_global_get_errqueue(&g), buff2);
+  owl_function_log_err(buff);
   va_end(ap);
+  owl_free(buff);
+}
+
+void owl_function_log_err(char *string)
+{
+  char *date;
+  time_t now;
+  char *buff;
+
+  now=time(NULL);
+  date=owl_strdup(ctime(&now));
+  date[strlen(date)-1]='\0';
+
+  buff = owl_sprintf("%s %s", date, string);
+
+  owl_errqueue_append_err(owl_global_get_errqueue(&g), buff);
+
+  owl_free(buff);
   owl_free(date);
-  owl_free(buff);
-  owl_free(buff2);
 }
 

owl.c

@@ -1 @@
-/*  Copyright (c) 2006-2008 The BarnOwl Developers. All rights reserved.
+/*  Copyright (c) 2006-2009 The BarnOwl Developers. All rights reserved.
  *  Copyright (c) 2004 James Kretchmar. All rights reserved.
  *
@@ -43 +43 @@
   owl_editwin *tw;
   owl_popwin *pw;
-  int ret, initialsubs, debug, argcsave, followlast;
+  int debug, argcsave, followlast;
   int newmsgs, nexttimediff;
   struct sigaction sigact;
@@ -65 +65 @@
   tty=NULL;
   debug=0;
-  initialsubs=1;
+  g.load_initial_subs = 1;
 
   setlocale(LC_ALL, "");
@@ -75 +75 @@
   while (argc>0) {
     if (!strcmp(argv[0], "-n")) {
-      initialsubs=0;
+      g.load_initial_subs = 0;
       argv++;
       argc--;
@@ -191 +191 @@
     owl_select_add_dispatch(d);
   }
-  
-#ifdef HAVE_LIBZEPHYR
-  /* zephyr init */
-  ret=owl_zephyr_initialize();
-  if (!ret) {
-    owl_dispatch *d = owl_malloc(sizeof(owl_dispatch));
-    d->fd = ZGetFD();
-    d->cfunc = &owl_zephyr_process_events;
-    d->destroy = NULL;
-    owl_select_add_dispatch(d);
-    owl_global_set_havezephyr(&g);
-  }
-
-#endif
+
+  owl_zephyr_initialize();
 
 #if OWL_STDERR_REDIR
@@ -339 +327 @@
 
   wrefresh(sepwin);
-
-  /* load zephyr subs */
-  if (initialsubs) {
-    int ret2;
-    owl_function_debugmsg("startup: loading initial zephyr subs");
-
-    /* load default subscriptions */
-    ret=owl_zephyr_loaddefaultsubs();
-    
-    /* load subscriptions from subs file */
-    ret2=owl_zephyr_loadsubs(NULL, 0);
-
-    if (ret || ret2) {
-      owl_function_adminmsg("", "Error loading zephyr subscriptions");
-    } else if (ret2!=-1) {
-      owl_global_add_userclue(&g, OWL_USERCLUE_CLASSES);
-    }
-
-    /* load login subscriptions */
-    if (owl_global_is_loginsubs(&g)) {
-      owl_function_debugmsg("startup: loading login subs");
-      owl_function_loadloginsubs(NULL);
-    }
-  }
 
   /* First buddy check to sync the list without notifications */
@@ -753 +717 @@
   char buf[4096];
   int rfd = d->fd;
+  char *err;
+
   if (rfd<0) return;
   if (-1 == ioctl(rfd, FIONREAD, (void*)&navail)) {
@@ -766 +732 @@
     buf[navail] = '\0';
   }
-  owl_function_error("[stderr]\n%s", buf);
+
+  err = owl_sprintf("[stderr]\n%s", buf);
+
+  owl_function_log_err(err);
 }
 

owl.h

@@ -1 @@
-/*  Copyright (c) 2006-2008 The BarnOwl Developers. All rights reserved.
+/*  Copyright (c) 2006-2009 The BarnOwl Developers. All rights reserved.
  *  Copyright (c) 2004 James Kretchmar. All rights reserved.
  *
@@ -52 +52 @@
 
 #ifndef OWL_VERSION_STRING
-#define OWL_VERSION_STRING "1.0.5"
+#define OWL_VERSION_STRING "1.1"
 #endif
 
@@ -594 +594 @@
   GList *timerlist;
   owl_timer *aim_nop_timer;
+  int load_initial_subs;
 } owl_global;
 

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

@@ -69 +69 @@
 }
 
+sub quickstart {
+    return <<'END_QUICKSTART';
+@b[IRC:]
+Use ':irc-connect @b[server]' to connect to an IRC server, and
+':irc-join @b[#channel]' to join a channel. ':irc-msg @b[#channel]
+@b[message]' sends a message to a channel.
+END_QUICKSTART
+}
+
 #sub mainloop_hook {
 #    return unless defined $irc;
@@ -93 +102 @@
 }
 
+use constant OPTIONAL_CHANNEL => 1;
+use constant REQUIRE_CHANNEL => 2;
+
 sub register_commands {
-    BarnOwl::new_command('irc-connect' => \&cmd_connect,
-                       {
-                           summary      => 'Connect to an IRC server',
-                           usage        => 'irc-connect [-a ALIAS ] [-s] [-p PASSWORD] [-n NICK] SERVER [port]',
-                           description  =>
-
-                           "Connect to an IRC server. Supported options are\n\n" .
-                           "-a <alias>          Define an alias for this server\n" .
-                           "-s                  Use SSL\n" .
-                           "-p <password>       Specify the password to use\n" .
-                           "-n <nick>           Use a non-default nick"
-                       });
-    BarnOwl::new_command('irc-disconnect' => \&cmd_disconnect);
-    BarnOwl::new_command('irc-msg'        => \&cmd_msg);
-    BarnOwl::new_command('irc-join'       => \&cmd_join);
-    BarnOwl::new_command('irc-part'       => \&cmd_part);
-    BarnOwl::new_command('irc-nick'       => \&cmd_nick);
-    BarnOwl::new_command('irc-names'      => \&cmd_names);
-    BarnOwl::new_command('irc-whois'      => \&cmd_whois);
-    BarnOwl::new_command('irc-motd'       => \&cmd_motd);
-    BarnOwl::new_command('irc-list'       => \&cmd_list);
-    BarnOwl::new_command('irc-who'        => \&cmd_who);
-    BarnOwl::new_command('irc-stats'      => \&cmd_stats);
-    BarnOwl::new_command('irc-topic'      => \&cmd_topic);
-}
+    BarnOwl::new_command(
+        'irc-connect' => \&cmd_connect,
+        {
+            summary => 'Connect to an IRC server',
+            usage =>
+'irc-connect [-a ALIAS ] [-s] [-p PASSWORD] [-n NICK] SERVER [port]',
+            description =>
+
+              <<END_DESCR
+Connect to an IRC server. Supported options are
+
+ -a <alias>          Define an alias for this server
+ -s                  Use SSL
+ -p <password>       Specify the password to use
+ -n <nick>           Use a non-default nick
+
+The -a option specifies an alias to use for this connection. This
+alias can be passed to the '-a' argument of any other IRC command to
+control which connection it operates on.
+
+For servers with hostnames of the form "irc.FOO.{com,org,...}", the
+alias will default to "FOO"; For other servers the full hostname is
+used.
+END_DESCR
+        }
+    );
+
+    BarnOwl::new_command(
+        'irc-disconnect' => mk_irc_command( \&cmd_disconnect ),
+        {
+            summary => 'Disconnect from an IRC server',
+            usage   => 'irc-disconnect [-a ALIAS]',
+
+            description => <<END_DESCR
+Disconnect from an IRC server. You can specify a specific server with
+"-a SERVER-ALIAS" if necessary.
+END_DESCR
+        }
+    );
+
+    BarnOwl::new_command(
+        'irc-msg' => mk_irc_command( \&cmd_msg ),
+        {
+            summary => 'Send an IRC message',
+            usage   => 'irc-msg [-a ALIAS] DESTINATION MESSAGE',
+
+            description => <<END_DESCR
+Send an IRC message
+END_DESCR
+        }
+    );
+
+    BarnOwl::new_command(
+        'irc-mode' => mk_irc_command( \&cmd_mode, OPTIONAL_CHANNEL ),
+        {
+            summary => 'Change an IRC channel or user mode',
+            usage   => 'irc-mode [-a ALIAS] TARGET [+-]MODE OPTIONS',
+
+            description => <<END_DESCR
+
+Change the mode of an IRC user or channel.
+END_DESCR
+        }
+    );
+
+    BarnOwl::new_command(
+        'irc-join' => mk_irc_command( \&cmd_join ),
+        {
+            summary => 'Join an IRC channel',
+            usage   => 'irc-join [-a ALIAS] #channel',
+
+            description => <<END_DESCR
+
+Join an IRC channel.
+END_DESCR
+        }
+    );
+
+    BarnOwl::new_command(
+        'irc-part' => mk_irc_command( \&cmd_part, REQUIRE_CHANNEL ),
+        {
+            summary => 'Leave an IRC channel',
+            usage   => 'irc-part [-a ALIAS] #channel',
+
+            description => <<END_DESCR
+
+Part from an IRC channel.
+END_DESCR
+        }
+    );
+
+    BarnOwl::new_command(
+        'irc-nick' => mk_irc_command( \&cmd_nick ),
+        {
+            summary => 'Change your IRC nick on an existing connection.',
+            usage   => 'irc-nick [-a ALIAS] NEW-NICK',
+
+            description => <<END_DESCR
+
+Set your IRC nickname on an existing connect. To change it prior to
+connecting, adjust the `irc:nick' variable.
+END_DESCR
+        }
+    );
+
+    BarnOwl::new_command(
+        'irc-names' => mk_irc_command( \&cmd_names, REQUIRE_CHANNEL ),
+        {
+            summary => 'View the list of users in a channel',
+            usage   => 'irc-names [-a ALIAS] #channel',
+
+            description => <<END_DESCR
+
+`irc-names' displays the list of users in a given channel in a pop-up
+window.
+END_DESCR
+        }
+    );
+
+    BarnOwl::new_command(
+        'irc-whois' => mk_irc_command( \&cmd_whois ),
+        {
+            summary => 'Displays information about a given IRC user',
+            usage   => 'irc-whois [-a ALIAS] NICK',
+
+            description => <<END_DESCR
+
+Pops up information about a given IRC user.
+END_DESCR
+        }
+    );
+
+    BarnOwl::new_command(
+        'irc-motd' => mk_irc_command( \&cmd_motd ),
+        {
+            summary => 'Displays an IRC server\'s MOTD (Message of the Day)',
+            usage   => 'irc-motd [-a ALIAS]',
+
+            description => <<END_DESCR
+
+Displays an IRC server's message of the day.
+END_DESCR
+        }
+    );
+
+    BarnOwl::new_command(
+        'irc-list' => \&cmd_list,
+        {
+            summary => 'Show all the active IRC connections.',
+            usage   => 'irc-list',
+
+            description => <<END_DESCR
+
+Show all the currently active IRC connections with their aliases and
+server names.
+END_DESCR
+        }
+    );
+
+    BarnOwl::new_command( 'irc-who'   => mk_irc_command( \&cmd_who ) );
+    BarnOwl::new_command( 'irc-stats' => mk_irc_command( \&cmd_stats ) );
+
+    BarnOwl::new_command(
+        'irc-topic' => mk_irc_command( \&cmd_topic, REQUIRE_CHANNEL ),
+        {
+            summary => 'View or change the topic of an IRC channel',
+            usage   => 'irc-topic [-a ALIAS] #channel [TOPIC]',
+
+            description => <<END_DESCR
+
+Without extra arguments, fetches and displays a given channel's topic.
+
+With extra arguments, changes the target channel's topic string. This
+may require +o on some channels.
+END_DESCR
+        }
+    );
+
+    BarnOwl::new_command(
+        'irc-quote' => mk_irc_command( \&cmd_quote ),
+        {
+            summary => 'Send a raw command to the IRC servers.',
+            usage   => 'irc-quote [-a ALIAS] TEXT',
+
+            description => <<END_DESCR
+
+Send a raw command line to an IRC server.
+
+This can be used to perform some operation not yet supported by
+BarnOwl, or to define new IRC commands.
+END_DESCR
+        }
+    );
+}
+
 
 $BarnOwl::Hooks::startup->add('BarnOwl::Module::IRC::startup');
 $BarnOwl::Hooks::shutdown->add('BarnOwl::Module::IRC::shutdown');
+$BarnOwl::Hooks::getQuickstart->add('BarnOwl::Module::IRC::quickstart');
 
 ################################################################################
@@ -189 +372 @@
 sub cmd_disconnect {
     my $cmd = shift;
-    my $conn = get_connection(\@_);
+    my $conn = shift;
     $conn->conn->disconnect;
     delete $ircnets{$conn->alias};
@@ -195 +378 @@
 
 sub cmd_msg {
-    my $cmd = shift;
-    my $conn = get_connection(\@_);
-    my $to = shift or die("Usage: $cmd NICK\n");
+    my $cmd  = shift;
+    my $conn = shift;
+    my $to = shift or die("Usage: $cmd [NICK|CHANNEL]\n");
     # handle multiple recipients?
     if(@_) {
@@ -234 +417 @@
 }
 
+sub cmd_mode {
+    my $cmd = shift;
+    my $conn = shift;
+    my $target = shift;
+    $target ||= shift;
+    $conn->conn->mode($target, @_);
+}
+
 sub cmd_join {
     my $cmd = shift;
-    my $conn = get_connection(\@_);
+    my $conn = shift;
     my $chan = shift or die("Usage: $cmd channel\n");
     $channels{$chan} ||= [];
@@ -245 +436 @@
 sub cmd_part {
     my $cmd = shift;
-    my $conn = get_connection(\@_);
-    my $chan = get_channel(\@_) || die("Usage: $cmd <channel>\n");
+    my $conn = shift;
+    my $chan = shift;
     $channels{$chan} = [grep {$_ ne $conn} @{$channels{$chan} || []}];
     $conn->conn->part($chan);
@@ -253 +444 @@
 sub cmd_nick {
     my $cmd = shift;
-    my $conn = get_connection(\@_);
+    my $conn = shift;
     my $nick = shift or die("Usage: $cmd <new nick>\n");
     $conn->conn->nick($nick);
@@ -260 +451 @@
 sub cmd_names {
     my $cmd = shift;
-    my $conn = get_connection(\@_);
-    my $chan = get_channel(\@_) || die("Usage: $cmd <channel>\n");
+    my $conn = shift;
+    my $chan = shift;
     $conn->names_tmp([]);
     $conn->conn->names($chan);
@@ -268 +459 @@
 sub cmd_whois {
     my $cmd = shift;
-    my $conn = get_connection(\@_);
+    my $conn = shift;
     my $who = shift || die("Usage: $cmd <user>\n");
     $conn->conn->whois($who);
@@ -275 +466 @@
 sub cmd_motd {
     my $cmd = shift;
-    my $conn = get_connection(\@_);
+    my $conn = shift;
     $conn->conn->motd;
 }
@@ -290 +481 @@
 sub cmd_who {
     my $cmd = shift;
-    my $conn = get_connection(\@_);
+    my $conn = shift;
     my $who = shift || die("Usage: $cmd <user>\n");
+    BarnOwl::error("WHO $cmd $conn $who");
     $conn->conn->who($who);
 }
@@ -297 +489 @@
 sub cmd_stats {
     my $cmd = shift;
-    my $conn = get_connection(\@_);
+    my $conn = shift;
     my $type = shift || die("Usage: $cmd <chiklmouy> [server] \n");
     $conn->conn->stats($type, @_);
@@ -304 +496 @@
 sub cmd_topic {
     my $cmd = shift;
-    my $conn = get_connection(\@_);
-    $conn->conn->topic(@_);
+    my $conn = shift;
+    my $chan = shift;
+    $conn->conn->topic($chan, @_ ? join(" ", @_) : undef);
+}
+
+sub cmd_quote {
+    my $cmd = shift;
+    my $conn = shift;
+    $conn->conn->sl(join(" ", @_));
 }
 
@@ -312 +511 @@
 ################################################################################
 
-sub get_connection {
-    my $args = shift;
-    if(scalar @$args >= 2 && $args->[0] eq '-a') {
-        shift @$args;
-        return get_connection_by_alias(shift @$args);
-    }
-    my $channel = $args->[-1];
-    if (defined($channel) && $channel =~ /^#/
-        and $channels{$channel} and @{$channels{$channel}} == 1) {
-        return $channels{$channel}[0];
-    }
-    my $m = BarnOwl::getcurmsg();
-    if($m && $m->type eq 'IRC') {
-        return get_connection_by_alias($m->network);
-    }
-    if(scalar keys %ircnets == 1) {
-        return [values(%ircnets)]->[0];
-    }
-    die("You must specify a network with -a\n");
-}
-
-sub get_channel {
-    my $args = shift;
-    if(scalar @$args) {
-        return shift @$args;
-    }
-    my $m = BarnOwl::getcurmsg();
-    if($m && $m->type eq 'IRC') {
-        return $m->channel if !$m->is_private;
-    }
-    return undef;
+sub mk_irc_command {
+    my $sub = shift;
+    my $use_channel = shift || 0;
+    return sub {
+        my $cmd = shift;
+        my $conn;
+        my $alias;
+        my $channel;
+        my $getopt = Getopt::Long::Parser->new;
+        my $m = BarnOwl::getcurmsg();
+
+        local @ARGV = @_;
+        $getopt->configure(qw(pass_through permute no_getopt_compat prefix_pattern=-|--));
+        $getopt->getoptions("alias=s" => \$alias);
+
+        if(defined($alias)) {
+            $conn = get_connection_by_alias($alias);
+        }
+        if(!$conn && $use_channel) {
+            $channel = $ARGV[0];
+            if(defined($channel) && $channel =~ /^#/) {
+                if($channels{$channel} && @{$channels{$channel}} == 1) {
+                    shift @ARGV;
+                    $conn = $channels{$channel}[0];
+                }  
+            } else {
+                if($m && $m->type eq 'IRC' && !$m->is_private) {
+                    $channel = $m->channel;
+                } else {
+                    undef $channel;
+                }
+            }
+        }
+        if(!$channel && $use_channel == REQUIRE_CHANNEL) {
+            die("Usage: $cmd <channel>\n");
+        }
+        if(!$conn) {
+            if($m && $m->type eq 'IRC') {
+                $conn = get_connection_by_alias($m->network);
+            }
+        }
+        if(!$conn && scalar keys %ircnets == 1) {
+            $conn = [values(%ircnets)]->[0];
+        }
+        if(!$conn) {
+            die("You must specify an IRC network using -a.\n");
+        }
+        if($use_channel) {
+            $sub->($cmd, $conn, $channel, @ARGV);
+        } else {
+            $sub->($cmd, $conn, @ARGV);
+        }
+    };
 }
 

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

@@ -73 +73 @@
     $self->conn->add_handler(endofnames=> sub { shift; $self->on_endofnames(@_) });
     $self->conn->add_handler(endofwhois=> sub { shift; $self->on_endofwhois(@_) });
+    $self->conn->add_handler(mode      => sub { shift; $self->on_mode(@_) });
+
+    # * nosuchchannel
+    # * 
 
     return $self;
@@ -273 +277 @@
 }
 
+sub on_mode {
+    my ($self, $evt) = @_;
+    BarnOwl::admin_message("IRC",
+                           "[" . $self->alias . "] User " . ($evt->nick) . + " set mode " .
+                           join(" ", $evt->args) . "on " . $evt->to->[0]
+                          );
+}
+
 sub on_event {
     my ($self, $evt) = @_;

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;
 }

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)";
+    }
 }
 
@@ -1058 +1062 @@
     my $body = $m->body;
     if ($m->{should_wordwrap}) {
-      $body = BarnOwl::wordwrap($body, BarnOwl::getnumcols()-8);
+      $body = BarnOwl::wordwrap($body, BarnOwl::getnumcols()-9);
     }
     # replace newline followed by anything with
@@ -1086 +1090 @@
 
 ################################################################################
+
+sub maybe {
+    my $thing = shift;
+    return defined($thing) ? $thing : "";
+}
 
 sub format_login {
@@ -1136 +1145 @@
     $line = sprintf(BASE_FORMAT,
                     $dirsym,
-                    $m->context,
-                    $m->subcontext,
+                    maybe($m->context),
+                    maybe($m->subcontext),
                     ($dir eq 'out'
                      ? $m->pretty_recipient

zephyr.c

@@ -9 +9 @@
 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
 Code_t ZResetAuthentication();
 #endif
 
-int owl_zephyr_initialize()
-{
-#ifdef HAVE_LIBZEPHYR
+#define HM_SVC_FALLBACK         htons((unsigned short) 2104)
+
+#ifdef HAVE_LIBZEPHYR
+void owl_zephyr_initialize()
+{
   int ret;
-  ZNotice_t notice;
-
-  /* Stat the zhm manually, with a shorter timeout */
-  if ((ret = ZOpenPort(NULL)) != ZERR_NONE)
-    return(ret);
-
-  if ((ret = owl_zhm_stat(&notice)) != ZERR_NONE)
-    return(ret);
-
-  ZClosePort();
-
-  if ((ret = ZInitialize()) != ZERR_NONE) {
-    com_err("owl",ret,"while initializing");
-    return(1);
-  }
-  if ((ret = ZOpenPort(NULL)) != ZERR_NONE) {
-    com_err("owl",ret,"while opening port");
-    return(1);
-  }
-#endif
-  return(0);
-}
-
-#ifdef HAVE_LIBZEPHYR
-#define HM_SVC_FALLBACK         htons((unsigned short) 2104)
-
-/*
- * Code modified from libzephyr's ZhmStat.c
- *
- * Modified to only wait one second to time out if there is no
- * hostmanager present, rather than a rather excessive 10 seconds.
- */
-Code_t owl_zhm_stat(ZNotice_t *notice) {
   struct servent *sp;
   struct sockaddr_in sin;
   ZNotice_t req;
   Code_t code;
-  struct timeval tv;
-  fd_set readers;
+  owl_dispatch *dispatch;
+
+  /*
+   * Code modified from libzephyr's ZhmStat.c
+   *
+   * Modified to add the fd to our select loop, rather than hanging
+   * until we get an ack.
+   */
+
+  if ((ret = ZOpenPort(NULL)) != ZERR_NONE) {
+    owl_function_error("Error opening Zephyr port: %s", error_message(ret));
+    return;
+  }
 
   (void) memset((char *)&sin, 0, sizeof(struct sockaddr_in));
@@ -76 +62 @@
   req.z_default_format = "";
   req.z_message_len = 0;
-        
-  if ((code = ZSetDestAddr(&sin)) != ZERR_NONE)
-    return(code);
-
-  if ((code = ZSendNotice(&req, ZNOAUTH)) != ZERR_NONE)
-    return(code);
-
-  /* Wait up to 1 second for a response. */
-  FD_ZERO(&readers);
-  FD_SET(ZGetFD(), &readers);
-  tv.tv_sec = 1;
-  tv.tv_usec = 0;
-  code = select(ZGetFD() + 1, &readers, NULL, NULL, &tv);
-  if (code < 0 && errno != EINTR)
-    return(errno);
-  if (code == 0 || (code < 0 && errno == EINTR) || ZPending() == 0)
-    return(ZERR_HMDEAD);
-
-  return(ZReceiveNotice(notice, (struct sockaddr_in *) 0));
-}
-
-#endif
+
+  if ((code = ZSetDestAddr(&sin)) != ZERR_NONE) {
+    owl_function_error("Initializing Zephyr: %s", error_message(code));
+    return;
+  }
+
+  if ((code = ZSendNotice(&req, ZNOAUTH)) != ZERR_NONE) {
+    owl_function_error("Initializing Zephyr: %s", error_message(code));
+    return;
+  }
+
+  dispatch = owl_malloc(sizeof(*dispatch));
+  dispatch->fd = ZGetFD();
+  dispatch->cfunc = owl_zephyr_finish_initialization;
+  dispatch->destroy = (void(*)(owl_dispatch*))owl_free;
+
+  owl_select_add_dispatch(dispatch);
+}
+
+void owl_zephyr_finish_initialization(owl_dispatch *d) {
+  Code_t code;
+
+  owl_select_remove_dispatch(d->fd);
+
+  ZClosePort();
+
+  if ((code = ZInitialize()) != ZERR_NONE) {
+    owl_function_error("Initializing Zephyr: %s", error_message(code));
+    return;
+  }
+
+  if ((code = ZOpenPort(NULL)) != ZERR_NONE) {
+    owl_function_error("Initializing Zephyr: %s", error_message(code));
+    return;
+  }
+
+  d = owl_malloc(sizeof(owl_dispatch));
+  d->fd = ZGetFD();
+  d->cfunc = &owl_zephyr_process_events;
+  d->destroy = NULL;
+  owl_select_add_dispatch(d);
+  owl_global_set_havezephyr(&g);
+
+  if(g.load_initial_subs) {
+    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);
+  }
+}
+
+void owl_zephyr_load_initial_subs() {
+  int ret, ret2;
+
+  owl_function_debugmsg("startup: loading initial zephyr subs");
+
+  /* load default subscriptions */
+  ret = owl_zephyr_loaddefaultsubs();
+
+  /* load subscriptions from subs file */
+  ret2 = owl_zephyr_loadsubs(NULL, 0);
+
+  if (ret || ret2) {
+    owl_function_error("Error loading zephyr subscriptions");
+  } else if (ret2!=-1) {
+    owl_global_add_userclue(&g, OWL_USERCLUE_CLASSES);
+  }
+
+  /* load login subscriptions */
+  if (owl_global_is_loginsubs(&g)) {
+    owl_function_debugmsg("startup: loading login subs");
+    owl_function_loadloginsubs(NULL);
+  }
+}
+#else
+void owl_zephyr_initialize()
+{
+}
+#endif
+
 
 int owl_zephyr_shutdown()
@@ -143 +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);
   }
 
@@ -207 +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);
     }
     
@@ -246 +291 @@
   fclose(file);
 
-  ret=owl_zephyr_loadsubs_helper(subs, count);
-  owl_free(subs);
+  owl_zephyr_loadsubs_helper(subs, count);
   return(ret);
 #else
@@ -273 +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) {
@@ -290 +337 @@
 
   ZResetAuthentication();
-  /* need to redo this to do chunks, not just bag out after 3000 */
   count=0;
   file=fopen(subsfile, "r");
@@ -297 +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());
       }
 
@@ -316 +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
@@ -602 +641 @@
   notice.z_class=class;
   notice.z_class_inst=instance;
+  notice.z_sender=NULL;
   if (!strcmp(recipient, "*") || !strcmp(recipient, "@")) {
     notice.z_recipient="";
+    if (*owl_global_get_zsender(&g))
+        notice.z_sender=owl_global_get_zsender(&g);
   } else {
     notice.z_recipient=recipient;
   }
   notice.z_default_format="Class $class, Instance $instance:\nTo: @bold($recipient) at $time $date\nFrom: @bold{$1 <$sender>}\n\n$2";
-  if (*owl_global_get_zsender(&g))
-      notice.z_sender=owl_global_get_zsender(&g);
-  else
-      notice.z_sender=NULL;
   if (opcode) notice.z_opcode=opcode;