Changeset 8830f79f

Timestamp:

Oct 3, 2009, 10:15:11 AM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

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

Children:

9f5e847

Parents:

340c3e7 (diff), 1167bf1 (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 branch 'davidben/context-slice'

Conflicts:
	perlglue.xs

Files:

• .gitignore (modified) (1 diff)
• Makefile.am (modified) (2 diffs)
• perl/lib/BarnOwl/Complete/Client.pm (modified) (7 diffs)
• perl/lib/BarnOwl/Complete/Filter.pm (added)
• perl/lib/BarnOwl/Completion/Context.pm (modified) (2 diffs)
• perl/lib/BarnOwl/Completion/Util.pm (modified) (3 diffs)
• perl_tester.c (added)
• perlglue.xs (modified) (1 diff)
• runtests.sh (modified) (1 diff)
• t/completion.t (modified) (8 diffs)
• t/mock.pl (modified) (1 diff)
• aim.c (modified) (3 diffs)
• commands.c (modified) (12 diffs)
• configure.ac (modified) (6 diffs)
• editwin.c (modified) (3 diffs)
• fmtext.c (modified) (5 diffs)
• functions.c (modified) (51 diffs)
• global.c (modified) (3 diffs)
• help.c (modified) (1 diff)
• keys.c (modified) (1 diff)
• libfaim/Makefile.am (modified) (1 diff)
• logging.c (modified) (1 diff)
• m4/ax_c_check_flag.m4 (added)
• m4/ax_cflags_strict_prototypes.m4 (added)
• m4/ax_cflags_warn_all.m4 (added)
• m4/pkg.m4 (added)
• mainwin.c (modified) (1 diff)
• message.c (modified) (2 diffs)
• owl.c (modified) (3 diffs)
• owl.h (modified) (1 diff)
• perl/lib/BarnOwl.pm (modified) (1 diff)
• perl/lib/BarnOwl/Complete/AIM.pm (added)
• perl/lib/BarnOwl/Complete/Zephyr.pm (modified) (1 diff)
• perl/lib/BarnOwl/Hooks.pm (modified) (2 diffs)
• perl/modules/IRC/lib/BarnOwl/Module/IRC/Completion.pm (modified) (2 diffs)
• perlconfig.c (modified) (3 diffs)
• popwin.c (modified) (1 diff)
• scripts/do-release (modified) (3 diffs)
• select.c (modified) (7 diffs)
• text.c (modified) (1 diff)
• util.c (modified) (10 diffs)
• variable.c (modified) (1 diff)
• viewwin.c (modified) (1 diff)
• zcrypt.c (modified) (13 diffs)
• zephyr.c (modified) (13 diffs)
• zwrite.c (modified) (1 diff)

.gitignore

@@ -28 +28 @@
 owl_prototypes.h
 owl_prototypes.h.new
+perl_tester
 perlglue.c
 perlwrap.c

Makefile.am

@@ -2 +2 @@
 
 bin_PROGRAMS = barnowl.bin
-check_PROGRAMS = tester
+check_PROGRAMS = tester perl_tester
 
 barnowl_bin_SOURCES = $(BASE_SRCS) \
@@ -17 +17 @@
 
 tester_LDADD = libfaim/libfaim.a
+
+perl_tester_SOURCES = $(BASE_SRCS) \
+     owl.h owl_perl.h config.h \
+     libzcrypt.a \
+     $(GEN_C) $(GEN_H) \
+     perl_tester.c
+
+perl_tester_LDADD = libfaim/libfaim.a libzcrypt.a
 
 TESTS=runtests.sh

perl/lib/BarnOwl/Complete/Client.pm

@@ -7 +7 @@
 
 use BarnOwl::Completion::Util qw(complete_flags);
+use BarnOwl::Complete::Filter qw(complete_filter_name complete_filter_expr);
 
 my @all_colors = qw(default
@@ -42 +43 @@
 sub complete_command { return sort @BarnOwl::all_commands; }
 sub complete_color { return @all_colors; }
-sub complete_filter_name { return @{BarnOwl::all_filters()}; }
 sub complete_variable    { return @{BarnOwl::all_variables()}; }
 sub complete_style       { return @{BarnOwl::all_styles()}; }
-
-my %filter_cmds = (
-    sender    => \&BarnOwl::Complete::Zephyr::complete_user,
-    recipient => \&BarnOwl::Complete::Zephyr::complete_user,
-    class     => \&BarnOwl::Complete::Zephyr::complete_class,
-    instance  => \&BarnOwl::Complete::Zephyr::complete_instance,
-    opcode    => \&BarnOwl::Complete::Zephyr::complete_opcode,
-    realm     => \&BarnOwl::Complete::Zephyr::complete_realm,
-    body      => undef,
-    hostname  => undef,
-    type      => sub { qw(zephyr aim admin); },
-    direction => sub { qw(in out none); },
-    login     => sub { qw(login logout none); },
-    filter    => \&complete_filter_name,
-    perl      => undef,
-);
-
-# Returns:
-# - where to look next after pulling out an expression
-# - $INCOMPLETE if this cannot form a complete expression (or w/e)
-# - pushes to completion list as it finds valid completions
-
-my $INCOMPLETE = -1;
-sub _complete_filter_expr {
-    # Takes as arguments context and the index into $ctx->words where the
-    # filter expression starts
-    my $ctx = shift;
-    my $start = shift;
-    my $o_comp = shift;
-    my $end = $ctx->word;
-
-    # Grab an expression; we don't allow empty
-    my $i = $start;
-    $i = _complete_filter_primitive_expr($ctx, $start, $o_comp);
-    return $INCOMPLETE if $start == $INCOMPLETE;
-
-    while ($i <= $end) {
-        if ($i == $end) {
-            # We could and/or another clause
-            push @$o_comp, qw(and or);
-            return $end; # Or we could let the parent do his thing
-        }
-
-        if ($ctx->words->[$i] ne 'and' && $ctx->words->[$i] ne 'or') {
-            return $i; # We're done. Let the parent do his thing
-        }
-
-        # Eat the and/or
-        $i++;
-
-        # Grab an expression
-        $i = _complete_filter_primitive_expr($ctx, $i, $o_comp);
-        return $INCOMPLETE if $i == $INCOMPLETE;
-    }
-    
-    return $i; # Well, it looks like we're happy
-    # (Actually, I'm pretty sure this never happens...)
-}
-
-sub _complete_filter_primitive_expr {
-    my $ctx = shift;
-    my $start = shift;
-    my $o_comp = shift;
-    my $end = $ctx->word;
-
-    if ($start >= $end) {
-        push @$o_comp, "(";
-        push @$o_comp, qw(true false not);
-        push @$o_comp, keys %filter_cmds;
-        return $INCOMPLETE;
-    }
-
-    my $word = $ctx->words->[$start];
-    if ($word eq "(") {
-        $start = _complete_filter_expr($ctx, $start+1, $o_comp);
-        return $INCOMPLETE if $start == $INCOMPLETE;
-
-        # Now, we expect a ")"
-        if ($start >= $end) {
-            push @$o_comp, ")";
-            return $INCOMPLETE;
-        }
-        if ($ctx->words->[$start] ne ')') {
-            # User is being confusing. Give up.
-            return $INCOMPLETE;
-        }
-        return $start+1; # Eat the )
-    } elsif ($word eq "not") {
-        # We just want another primitive expression
-        return _complete_filter_primitive_expr($ctx, $start+1, $o_comp);
-    } elsif ($word eq "true" || $word eq "false") {
-        # No arguments
-        return $start+1; # Eat the boolean. Mmmm, tasty.
-    } else {
-        # It's of the form 'CMD ARG'
-        return $start+2 if ($start+1 < $end); # The user supplied the argument
-
-        # complete the argument
-        my $arg_func = $filter_cmds{$word};
-        push @$o_comp, ($arg_func ? ($arg_func->()) : ());
-        return $INCOMPLETE;
-    }
-}
-
-sub complete_filter_expr {
-    my $ctx = shift;
-    my $start = shift;
-    my @completions = ();
-    _complete_filter_expr($ctx, $start, \@completions);
-    # Get rid of duplicates and sort
-    my %hash = ();
-    @hash{@completions} = ();
-    @completions = sort keys %hash;
-    return @completions;
-}
-
-sub complete_filter_args {
-    my $ctx = shift;
-    my $arg = shift;
-    return complete_filter_name() unless $arg;
-    my $idx = 2; # skip the filter name
-    while ($idx < $ctx->word) {
-        last unless ($ctx->words->[$idx] =~ m{^-});
-        $idx += 2; # skip the flag and the argument
-    }
-    return complete_filter_expr($ctx, $idx);
-}
 
 sub complete_help {
@@ -194 +67 @@
 sub complete_filter {
     my $ctx = shift;
+    # Syntax: filter FILTERNAME FLAGS EXPR
+
+    # FILTERNAME
+    return complete_filter_name() if $ctx->word == 1;
+
+    # FLAGS
+    $ctx = $ctx->shift_words(1); # complete_flags starts at the second word
     return complete_flags($ctx,
         [qw()],
@@ -200 +80 @@
            "-b" => \&complete_color,
         },
-         \&complete_filter_args
+        # EXPR
+        sub {
+            my $ctx = shift;
+            my $arg = shift;
+
+            # We pass stop_at_nonflag, so we can rewind to the start
+            my $idx = $ctx->word - $arg;
+            $ctx = $ctx->shift_words($idx);
+            return complete_filter_expr($ctx);
+        },
+        stop_at_nonflag => 1
         );
 }
@@ -213 +103 @@
     }
     if ($ctx->words->[1] eq "-d") {
-        return complete_filter_expr($ctx, 2);
+        $ctx = $ctx->shift_words(2);
+        return complete_filter_expr($ctx);
     }
     if ($ctx->words->[1] eq "-s") {
@@ -243 +134 @@
 }
 
+sub complete_startup {
+    my $ctx = shift;
+    my $new_ctx = $ctx->shift_words(1);
+    return BarnOwl::Completion::get_completions($new_ctx);
+}
+
 BarnOwl::Completion::register_completer(help    => \&complete_help);
 BarnOwl::Completion::register_completer(filter  => \&complete_filter);
@@ -250 +147 @@
 BarnOwl::Completion::register_completer(set     => \&complete_set);
 BarnOwl::Completion::register_completer(unset   => \&complete_set);
+BarnOwl::Completion::register_completer(startup => \&complete_startup);
 
 1;

perl/lib/BarnOwl/Completion/Context.pm

@@ -40 +40 @@
 
 use base qw(Class::Accessor::Fast);
+use Carp qw(croak);
 
 __PACKAGE__->mk_ro_accessors(qw(line point words word word_point
@@ -64 +65 @@
        };
     return bless($self, $class);
+}
+
+=head2 shift_words N
+
+Returns a new C<Context> object, with the leading C<N> words
+stripped. All fields are updated as appopriate. If C<N> > C<<
+$self->word >>, C<croak>s with an error message.
+
+=cut
+
+sub shift_words {
+    my $self = shift;
+    my $n    = shift;
+
+    if($n > $self->word) {
+        croak "Context::shift: Unable to shift $n words";
+    }
+
+    my $before = substr($self->line, 0, $self->point);
+    my $after  = substr($self->line, $self->point);
+
+    return BarnOwl::Completion::Context->new(BarnOwl::skiptokens($before, $n),
+                                             $after);
 }
 

perl/lib/BarnOwl/Completion/Util.pm

@@ -24 +24 @@
     my $optsdone = 0;
 
+    my %flags_seen;
+
     while($idx < $ctx->word) {
         my $word = $ctx->words->[$idx];
@@ -37 +39 @@
         } elsif ($word =~ m{^-}) {
             $word = "-" . substr($word, -1);
+            $flags_seen{$word} = 1; # record flag
             $flag = $word if(exists $args->{$word});
         } else {
@@ -58 +61 @@
         return;
     } else {
-        return ($optsdone ? () : (@$no_args, keys %$args),
-                $default ? ($default->($ctx, $argct)) : ());
+        my @opts = $optsdone ? () : (@$no_args, keys %$args);
+        # filter out flags we've seen if needbe
+        @opts = grep {!$flags_seen{$_}} @opts unless $options{repeat_flags};
+        return (@opts, $default ? ($default->($ctx, $argct)) : ());
     }
 }

perlglue.xs

@@ -424 +424 @@
                 RETVAL
 
+const char *
+skiptokens(str, n)
+        const char *str;
+        int n;
+        CODE:
+                RETVAL = skiptokens(str, n);
+        OUTPUT:
+                RETVAL
+
+
+
 MODULE = BarnOwl                PACKAGE = BarnOwl::Internal
 

runtests.sh

@@ -1 +1 @@
 #!/bin/sh
-prove t/
+prove t/ --perl ./perl_tester

t/completion.t

@@ -8 +8 @@
 BEGIN {require (dirname($0) . "/mock.pl");};
 
+use BarnOwl::Complete::Filter qw(complete_filter_expr);
+
 =head1 DESCRIPTION
 
@@ -20 +22 @@
     my $after_point = shift;
     
+    my $ctx = BarnOwl::Completion::Context->new($before_point,
+                                                $after_point);
+    is($ctx->line, $before_point . $after_point);
+    is($ctx->point, length $before_point);
+
+    test_ctx($ctx, @_);
+}
+
+sub test_ctx {
+    local $Test::Builder::Level = $Test::Builder::Level + 1;
+
+    my $ctx = shift;
+
     my $words = shift;
     my $word = shift;
@@ -27 +42 @@
     my $word_end   = shift;
 
-    my $ctx = BarnOwl::Completion::Context->new($before_point,
-                                                $after_point);
-
-    is($ctx->line, $before_point . $after_point);
-    is($ctx->point, length $before_point);
     is_deeply($ctx->words, $words);
     if (defined($word)) {
@@ -41 +51 @@
 }
 
+sub test_shift {
+    local $Test::Builder::Level = $Test::Builder::Level + 1;
+
+    my $before_point = shift;
+    my $after_point = shift;
+    my $shift = shift;
+    
+    my $ctx = BarnOwl::Completion::Context->new($before_point,
+                                                $after_point);
+    $ctx = $ctx->shift_words($shift);
+
+    test_ctx($ctx, @_);
+}
+
 
 isa_ok(BarnOwl::Completion::Context->new('Hello, W', 'orld'), 'BarnOwl::Completion::Context');
@@ -108 +132 @@
               1, -1, 7, 12);
 
+## Test Context::shift
+test_shift('lorem ipsum dolor ', 'sit amet', 0,
+           [qw(lorem ipsum dolor sit amet)],
+           3, 0, 18, 21);
+
+test_shift('lorem ipsum dolor ', 'sit amet', 1,
+           [qw(ipsum dolor sit amet)],
+           2, 0, 12, 15);
+
+test_shift('lorem ipsum dolor ', 'sit amet', 2,
+           [qw(dolor sit amet)],
+           1, 0, 6, 9);
+
+test_shift('lorem ipsum dolor ', 'sit amet', 3,
+           [qw(sit amet)],
+           0, 0, 0, 3);
+
+eval {
+    my $before_point = 'lorem ipsum dolor';
+    my $after_point = 'sit amet';
+    my $shift = 4;
+
+    my $ctx = BarnOwl::Completion::Context->new($before_point,
+                                                $after_point);
+    $ctx = $ctx->shift_words($shift);
+};
+like($@, qr/^Context::shift: Unable to shift /, "Correctly die when shifting away the point");
 
 ## Test common_prefix
@@ -163 +214 @@
 
 test_complete('zwrite -c nelhage ', '',
-              [qw(-n -C -m -c -i -r -O nelhage asedeno geofft)]);
+              [qw(-n -C -m -i -r -O nelhage asedeno geofft)]);
 
 test_complete('zwrite -c nelhage ', '-',
-              [qw(-n -C -m -c -i -r -O nelhage asedeno geofft)]);
+              [qw(-n -C -m -i -r -O nelhage asedeno geofft)]);
 
 test_complete('zwrite -c nelhage -- ', '',
@@ -178 +229 @@
                               "-d" => sub {qw(some words for completing)},
                           },
-                          sub {$_[1]});
+                          sub {$_[1]},
+                          repeat_flags => 1);
 }
 
@@ -203 +255 @@
               [qw(2)], \&complete_word);
 
+
+# Test the filter expression completer
+test_complete('', '',
+              [qw[( body class direction false filter hostname instance login not opcode perl realm recipient sender true type]],
+              \&complete_filter_expr);
+
+test_complete('not ', '',
+              [qw[( body class direction false filter hostname instance login not opcode perl realm recipient sender true type]],
+              \&complete_filter_expr);
+
+test_complete('true ', '',
+              [qw[and or]],
+              \&complete_filter_expr);
+
+test_complete('( true ', '',
+              [qw[and or )]],
+              \&complete_filter_expr);
+
+test_complete('( body static and body analysis and not false and class davidben and ( instance python or instance hotd ', '',
+              [qw[and or )]],
+              \&complete_filter_expr);
+
+test_complete('type ', '',
+              [qw[admin aim zephyr]],
+              \&complete_filter_expr);
+
+test_complete('direction ', '',
+              [qw[in out none]],
+              \&complete_filter_expr);
+
+test_complete('login ', '',
+              [qw[login logout none]],
+              \&complete_filter_expr);
+
 1;
 

t/mock.pl

@@ -7 +7 @@
 use Carp;
 
-sub bootstrap {}
 sub get_data_dir {"."}
 sub get_config_dir {"."}

aim.c

@@ -230 +230 @@
 }
 
-void owl_aim_logged_out()
+void owl_aim_logged_out(void)
 {
   if (owl_global_is_aimloggedin(&g)) owl_function_adminmsg("", "Logged out of AIM");
@@ -408 +408 @@
 }
 
-int owl_aim_process_events()
+int owl_aim_process_events(void)
 {
   aim_session_t *aimsess;
@@ -1995 +1995 @@
 }
 
-void owl_process_aim()
+void owl_process_aim(void)
 {
   if (owl_global_is_doaimevents(&g)) {

commands.c

@@ -297 +297 @@
               "Print a znol-style listing of users logged in"),
 
-  OWLCMD_ARGS("alist", owl_command_alist, OWL_CTX_INTERACTIVE,
+  OWLCMD_VOID("alist", owl_command_alist, OWL_CTX_INTERACTIVE,
               "List AIM users logged in",
               "alist",
               "Print a listing of AIM users logged in"),
 
-  OWLCMD_ARGS("blist", owl_command_blist, OWL_CTX_INTERACTIVE,
+  OWLCMD_VOID("blist", owl_command_blist, OWL_CTX_INTERACTIVE,
               "List all buddies logged in",
               "blist",
               "Print a listing of buddies logged in, regardless of protocol."),
 
-  OWLCMD_ARGS("toggle-oneline", owl_command_toggleoneline, OWL_CTX_INTERACTIVE,
+  OWLCMD_VOID("toggle-oneline", owl_command_toggleoneline, OWL_CTX_INTERACTIVE,
               "Toggle the style between oneline and the default style",
               "toggle-oneline",
@@ -995 +995 @@
 };
 
-void owl_command_info()
+void owl_command_info(void)
 {
   owl_function_info();
 }
 
-void owl_command_nop()
+void owl_command_nop(void)
 {
 }
@@ -1017 +1017 @@
 char *owl_command_zlist(int argc, const char *const *argv, const char *buff)
 {
-  int elapsed=0, timesort=0;
   const char *file=NULL;
 
@@ -1023 +1022 @@
   argv++;
   while (argc) {
-    if (!strcmp(argv[0], "-e")) {
-      elapsed=1;
-      argc--;
-      argv++;
-    } else if (!strcmp(argv[0], "-t")) {
-      timesort=1;
-      argc--;
-      argv++;
-    } else if (!strcmp(argv[0], "-f")) {
+    if (!strcmp(argv[0], "-f")) {
       if (argc==1) {
         owl_function_makemsg("zlist: -f needs an argument");
@@ -1048 +1039 @@
 }
 
-char *owl_command_alist()
+void owl_command_alist(void)
 {
   owl_function_buddylist(1, 0, NULL);
-  return(NULL);
-}
-
-char *owl_command_blist()
+}
+
+void owl_command_blist(void)
 {
   owl_function_buddylist(1, 1, NULL);
-  return(NULL);
-}
-
-char *owl_command_toggleoneline()
+}
+
+void owl_command_toggleoneline(void)
 {
   owl_function_toggleoneline();
-  return(NULL);
-}
-
-void owl_command_about()
+}
+
+void owl_command_about(void)
 {
   owl_function_about();
 }
 
-void owl_command_version()
+void owl_command_version(void)
 {
   owl_function_makemsg("BarnOwl version %s", OWL_VERSION_STRING);
@@ -1322 +1310 @@
 }
 
-void owl_command_expunge()
+void owl_command_expunge(void)
 {
   owl_function_expunge();
 }
 
-void owl_command_first()
+void owl_command_first(void)
 {
   owl_global_set_rightshift(&g, 0);
@@ -1333 +1321 @@
 }
 
-void owl_command_last()
+void owl_command_last(void)
 {
   owl_function_lastmsg();
 }
 
-void owl_command_resize()
+void owl_command_resize(void)
 {
   owl_function_resize();
 }
 
-void owl_command_redisplay()
+void owl_command_redisplay(void)
 {
   owl_function_full_redisplay();
@@ -1349 +1337 @@
 }
 
-void owl_command_shift_right()
+void owl_command_shift_right(void)
 {
   owl_function_shift_right();
 }
 
-void owl_command_shift_left()
+void owl_command_shift_left(void)
 {
   owl_function_shift_left();
 }
 
-void owl_command_unsuball()
+void owl_command_unsuball(void)
 {
   owl_function_unsuball();
@@ -1391 +1379 @@
 }
 
-void owl_command_suspend()
+void owl_command_suspend(void)
 {
   owl_function_suspend();
@@ -1675 +1663 @@
 }
 
-void owl_command_quit()
+void owl_command_quit(void)
 {
   owl_function_quit();
@@ -1987 +1975 @@
 #else
   owl_function_makemsg("This Owl does not support zcrypt");
+  return NULL;
 #endif
 }
@@ -2313 +2302 @@
 }
 
-void owl_command_beep()
+void owl_command_beep(void)
 {
   owl_function_beep();

configure.ac

@@ -4 +4 @@
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADER([config.h])
 
 AC_PROG_CC
-
-dnl Check for Athena
-AC_MSG_CHECKING(for /usr/athena/include)
-if test -d /usr/athena/include; then
-        CFLAGS=${CFLAGS}\ -I/usr/athena/include
-        CPPFLAGS=${CPPFLAGS}\ -I/usr/athena/include
-        AC_MSG_RESULT(yes)
-else
-        AC_MSG_RESULT(no)
-fi
-AC_MSG_CHECKING(for /usr/athena/lib)
-if test -d /usr/athena/lib; then
-        LDFLAGS=${LDFLAGS}\ -L/usr/athena/lib
-        AC_MSG_RESULT(yes)
-else
-        AC_MSG_RESULT(no)
-fi
-
-dnl Check for kerberosIV include
-AC_MSG_CHECKING(for kerberosIV)
-if test -d /usr/include/kerberosIV; then
-        CFLAGS=${CFLAGS}\ -I/usr/include/kerberosIV
-        CPPFLAGS=${CPPFLAGS}\ -I/usr/include/kerberosIV
-        AC_MSG_RESULT(yes)
-elif test -d /usr/local/include/kerberosIV; then
-        CFLAGS=${CFLAGS}\ -I/usr/local/include/kerberosIV
-        CPPFLAGS=${CPPFLAGS}\ -I/usr/local/include/kerberosIV
-        AC_MSG_RESULT(yes)
-elif test -d /usr/include/openssl; then
-        CFLAGS=${CFLAGS}\ -I/usr/include/openssl
-        CPPFLAGS=${CPPFLAGS}\ -I/usr/include/openssl
-        AC_MSG_RESULT(OpenSSL DES found instead)
-else
-        AC_MSG_RESULT(no)
-fi
 
 AC_ARG_WITH([stack-protector],
@@ -50 +16 @@
 
 AS_IF([test "x$with_stack_protector" != xno],
-  [
-    SAVE_CFLAGS=$CFLAGS
-    CFLAGS="$CFLAGS -fstack-protector"
-    AC_MSG_CHECKING(whether protection cflags work)
-    AC_COMPILE_IFELSE(int i;,
-        [AC_MSG_RESULT(yes)],
-        [AC_MSG_RESULT(no)
-        CFLAGS=$SAVE_CFLAGS
-        if test "x$with_stack_protector" != xcheck; then
-          AC_MSG_FAILURE([--with-stack-protector selected, but gcc does support it.])
-        fi])
-    AC_CHECK_LIB(ssp, __stack_chk_guard)
-  ])
+  [AX_C_CHECK_FLAG([-fstack-protector],[],[],
+    [CFLAGS="$CFLAGS -fstack-protector"],
+    [if test "x$with_stack_protector" != xcheck; then
+       AC_MSG_FAILURE([--with-stack-protector selected, but gcc does support it.])
+     fi
+    ])])
 
 AC_CHECK_LIB(ncursesw, initscr,, AC_MSG_ERROR(No libncursesw found.))
-AC_CHECK_LIB(com_err, com_err)
-AC_CHECK_LIB(nsl, gethostbyname)
-AC_CHECK_LIB(socket, socket)
-dnl AC_CHECK_LIB(des425, req_act_vno)
-AC_CHECK_LIB(des425, des_cbc_encrypt,,AC_CHECK_LIB(crypto,DES_cbc_encrypt))
-AC_CHECK_LIB(resolv, res_search)
+AC_SEARCH_LIBS([gethostbyname], [nsl])
+AC_SEARCH_LIBS([socket], [socket])
+AC_SEARCH_LIBS([res_search], [resolv])
 
 AC_ARG_WITH([zephyr],
@@ -79 +35 @@
 
 AS_IF([test "x$with_zephyr" != xno],
-  [AC_CHECK_LIB([zephyr], [ZGetSender],
+  [AC_MSG_CHECKING([for Kerberos IV])
+   AS_IF([krb5-config krb4 --libs >/dev/null 2>&1],
+     [AC_MSG_RESULT([yes])
+      AC_DEFINE([HAVE_KERBEROS_IV], [1], [Define if you have kerberos IV])
+      CFLAGS="${CFLAGS} `krb5-config krb4 --cflags`"
+      LIBS="${LIBS} `krb5-config krb4 --libs`"
+     ],
+     [AC_MSG_RESULT([no])
+      PKG_CHECK_MODULES([LIBCRYPTO], [libcrypto])
+      CFLAGS="${CFLAGS} ${LIBCRYPTO_CFLAGS}"
+      LIBS="${LIBS} ${LIBCRYPTO_LIBS}"
+     ])
+   AC_CHECK_LIB([zephyr], [ZGetSender],
    [LIBS="$LIBS -lzephyr"
     AC_DEFINE([HAVE_LIBZEPHYR], [1],
@@ -86 +54 @@
       AC_DEFINE([HAVE_LIBZEPHYR_ZINITLOCATIONINFO], [1],
                 [Have ZInitLocationInfo]),)
+    AC_CHECK_LIB([com_err], [com_err])
+    AC_CHECK_HEADERS([com_err.h])
    ],
    [if test "x$with_zephyr" != xcheck; then
@@ -93 +63 @@
    ])])
 
-AC_CHECK_FUNCS(use_default_colors resizeterm des_string_to_key des_key_sched des_ecb_encrypt)
-AC_CHECK_FUNCS(                            DES_string_to_key  DES_ecb_encrypt DES_key_sched)
-
-AC_MSG_CHECKING(for des_ecb_encrypt prototype)
-AC_TRY_COMPILE([#include <des.h>
-int des_ecb_encrypt(char foo[], char bar[], des_key_schedule baz, int qux);],
-[int foo = des_ecb_encrypt(0,0,0,0);],
-ac_cv_des_ecb_encrypt_proto=no,
-ac_cv_des_ecb_encrypt_proto=yes)
-AC_MSG_RESULT($ac_cv_des_ecb_encrypt_proto)
-if test "$ac_cv_des_ecb_encrypt_proto" = yes; then
-        AC_DEFINE([HAVE_DES_ECB_ENCRYPT_PROTO], [], [have proto for des_ecb_encrypt])
-fi
+AC_CHECK_FUNCS([use_default_colors resizeterm])
+AC_CHECK_FUNCS([des_string_to_key des_key_sched des_ecb_encrypt])
+AC_CHECK_FUNCS([DES_string_to_key DES_ecb_encrypt DES_key_sched])
 
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(strings.h sys/ioctl.h sys/filio.h unistd.h com_err.h)
+AC_CHECK_HEADERS(strings.h sys/ioctl.h sys/filio.h unistd.h)
 
 dnl Add CFLAGS for embeded perl
-FOO=`perl -MExtUtils::Embed -e ccopts`
-AC_MSG_NOTICE([Adding perl CFLAGS ${FOO}])
-CFLAGS=${CFLAGS}\ ${FOO}
+PERL_CFLAGS=`perl -MExtUtils::Embed -e ccopts`
+AC_MSG_NOTICE([Adding perl CFLAGS ${PERL_CFLAGS}])
+CFLAGS="${CFLAGS} ${PERL_CFLAGS}"
 
 dnl Find the location of perl XSUBPP
@@ -154 +114 @@
 dnl Checks for typedefs, structures, and compiler characteristics.
 
+AX_CFLAGS_WARN_ALL
+AX_CFLAGS_STRICT_PROTOTYPES
+
+AX_C_CHECK_FLAG([-Wno-pointer-sign],[],[],
+  [LIBFAIM_CFLAGS="$LIBFAIM_CFLAGS -Wno-pointer-sign"])
+
+AC_SUBST([LIBFAIM_CFLAGS])
+
 AC_SUBST(XSUBPPDIR)
 AC_SUBST(XSUBPPFLAGS)

editwin.c

@@ -466 +466 @@
   int index;
   int count = 0;
-  int point;
   int n, i;
   int last;
@@ -475 +474 @@
   e->lock = 0; /* we can (must) tread on the locktext */
 
-  point = e->index;
   last = -1;
   while (count < goal) {
@@ -1073 +1071 @@
     owl_editwin_exchange_point_and_mark(e);
 
-  owl_editwin_replace(e, oe_copy_region(e), "");
+  owl_editwin_replace_internal(e, oe_copy_region(e), "");
 }
 

fmtext.c

@@ -272 +272 @@
   if (owl_global_get_hascolors(&g)) {
       wcolor_set(w,pair,NULL);
+      wbkgdset(w, COLOR_PAIR(pair));
   }
 }
@@ -344 +345 @@
       fg = f->default_fgcolor;
       bg = f->default_bgcolor;
-      while (p && owl_fmtext_is_format_char(g_utf8_get_char(p))) {
+      while (owl_fmtext_is_format_char(g_utf8_get_char(p))) {
         _owl_fmtext_update_attributes(g_utf8_get_char(p), &attr, &fg, &bg);
         p = g_utf8_next_char(p);
@@ -365 +366 @@
     waddstr(w, s);
   }
+  wbkgdset(w, 0);
 }
 
@@ -418 +420 @@
 /* Truncate the message so that each line begins at column 'acol' and
  * ends at 'bcol' or sooner.  The first column is number 0.  The new
- * message is placed in 'out'.  The message is * expected to end in a
- * new line for now. NOTE: This needs to be modified to deal with
- * backing up if we find a SPACING COMBINING MARK at the end of a
- * line. If that happens, we should back up to the last non-mark
- * character and stop there.
+ * message is placed in 'out'.  The message is expected to end in a
+ * new line for now.
+ *
+ * NOTE: This needs to be modified to deal with backing up if we find
+ * a SPACING COMBINING MARK at the end of a line. If that happens, we
+ * should back up to the last non-mark character and stop there.
+ *
+ * NOTE: If a line ends at bcol, we omit the newline. This is so printing
+ * to ncurses works.
  */
 void owl_fmtext_truncate_cols(const owl_fmtext *in, int acol, int bcol, owl_fmtext *out)
@@ -826 +832 @@
 
 /* Reset used list */
-void owl_fmtext_reset_colorpairs()
+void owl_fmtext_reset_colorpairs(void)
 {
   if (owl_global_get_hascolors(&g)) {

functions.c

@@ -44 +44 @@
 }
 
-void owl_function_show_commands()
+void owl_function_show_commands(void)
 {
   owl_list l;
@@ -78 +78 @@
 }
 
-void owl_function_show_styles() {
+void owl_function_show_styles(void) {
   owl_list l;
   owl_fmtext fm;
@@ -120 +120 @@
 }
 
-void owl_function_show_license()
+void owl_function_show_license(void)
 {
   const char *text;
@@ -166 +166 @@
 }
 
-void owl_function_show_quickstart()
+void owl_function_show_quickstart(void)
 {
     const char *message =
@@ -357 +357 @@
 }
 
-void owl_function_loopwrite_setup()
+void owl_function_loopwrite_setup(void)
 {
   owl_editwin *e;
@@ -472 +472 @@
   owl_zwrite_set_message(&z, cryptmsg);
   owl_zwrite_set_opcode(&z, "crypt");
-  mymsg=cryptmsg;
     
   owl_zwrite_send_message(&z);
@@ -646 +645 @@
 void owl_function_prevmsg_full(const char *filter, int skip_deleted, int first_if_none)
 {
-  int curmsg, i, viewsize, found;
+  int curmsg, i, found;
   const owl_view *v;
   const owl_filter *f = NULL;
@@ -662 +661 @@
 
   curmsg=owl_global_get_curmsg(&g);
-  viewsize=owl_view_get_size(v);
   found=0;
 
@@ -693 +691 @@
 }
 
-void owl_function_nextmsg()
+void owl_function_nextmsg(void)
 {
   owl_function_nextmsg_full(NULL, 0, 1);
 }
 
-void owl_function_prevmsg()
+void owl_function_prevmsg(void)
 {
   owl_function_prevmsg_full(NULL, 0, 1);
 }
 
-void owl_function_nextmsg_notdeleted()
+void owl_function_nextmsg_notdeleted(void)
 {
   owl_function_nextmsg_full(NULL, 1, 1);
 }
 
-void owl_function_prevmsg_notdeleted()
+void owl_function_prevmsg_notdeleted(void)
 {
   owl_function_prevmsg_full(NULL, 1, 1);
@@ -772 +770 @@
 }
 
-void owl_function_expunge()
+void owl_function_expunge(void)
 {
   int curmsg;
@@ -808 +806 @@
 }
 
-void owl_function_firstmsg()
+void owl_function_firstmsg(void)
 {
   owl_global_set_curmsg(&g, 0);
@@ -816 +814 @@
 }
 
-void owl_function_lastmsg_noredisplay()
+void owl_function_lastmsg_noredisplay(void)
 {
   int oldcurmsg, curmsg;
@@ -838 +836 @@
 }
 
-void owl_function_lastmsg()
+void owl_function_lastmsg(void)
 {
   owl_function_lastmsg_noredisplay();
@@ -844 +842 @@
 }
 
-void owl_function_shift_right()
+void owl_function_shift_right(void)
 {
   owl_global_set_rightshift(&g, owl_global_get_rightshift(&g)+10);
@@ -851 +849 @@
 }
 
-void owl_function_shift_left()
+void owl_function_shift_left(void)
 {
   int shift;
@@ -866 +864 @@
 }
 
-void owl_function_unsuball()
+void owl_function_unsuball(void)
 {
   unsuball();
@@ -946 +944 @@
 }
 
-void owl_function_suspend()
+void owl_function_suspend(void)
 {
   endwin();
@@ -956 +954 @@
 }
 
-void owl_function_zaway_toggle()
+void owl_function_zaway_toggle(void)
 {
   if (!owl_global_is_zaway(&g)) {
@@ -966 +964 @@
 }
 
-void owl_function_zaway_on()
+void owl_function_zaway_on(void)
 {
   owl_global_set_zaway_on(&g);
@@ -972 +970 @@
 }
 
-void owl_function_zaway_off()
+void owl_function_zaway_off(void)
 {
   owl_global_set_zaway_off(&g);
@@ -978 +976 @@
 }
 
-void owl_function_aaway_toggle()
+void owl_function_aaway_toggle(void)
 {
   if (!owl_global_is_aaway(&g)) {
@@ -988 +986 @@
 }
 
-void owl_function_aaway_on()
+void owl_function_aaway_on(void)
 {
   owl_global_set_aaway_on(&g);
@@ -995 +993 @@
 }
 
-void owl_function_aaway_off()
+void owl_function_aaway_off(void)
 {
   owl_global_set_aaway_off(&g);
@@ -1002 +1000 @@
 }
 
-void owl_function_quit()
+void owl_function_quit(void)
 {
   char *ret;
@@ -1227 +1225 @@
 }
 
-void owl_function_resize()
+void owl_function_resize(void)
 {
   owl_global_set_resize_pending(&g);
 }
 
-void owl_function_run_buffercommand()
+void owl_function_run_buffercommand(void)
 {
   owl_editwin_do_callback(owl_global_get_typwin(&g));
@@ -1264 +1262 @@
 }
 
-void owl_function_beep()
+void owl_function_beep(void)
 {
   if (owl_global_is_bell(&g)) {
@@ -1302 +1300 @@
 }
 
-void owl_function_full_redisplay()
+void owl_function_full_redisplay(void)
 {
   redrawwin(owl_global_get_curs_recwin(&g));
@@ -1384 +1382 @@
 }
 
-void owl_function_about()
+void owl_function_about(void)
 {
   owl_function_popless_text(
@@ -1410 +1408 @@
 }
 
-void owl_function_info()
+void owl_function_info(void)
 {
   const owl_message *m;
@@ -1545 +1543 @@
  * style the user may be using
  */
-void owl_function_curmsg_to_popwin()
+void owl_function_curmsg_to_popwin(void)
 {
   const owl_view *v;
@@ -1628 +1626 @@
 }
 
-void owl_function_mainwin_pagedown()
+void owl_function_mainwin_pagedown(void)
 {
   int i;
@@ -1643 +1641 @@
 }
 
-void owl_function_mainwin_pageup()
+void owl_function_mainwin_pageup(void)
 {
   owl_global_set_curmsg(&g, owl_global_get_topmsg(&g));
@@ -1649 +1647 @@
 }
 
-void owl_function_getsubs()
+void owl_function_getsubs(void)
 {
   char *buff;
@@ -1664 +1662 @@
 }
 
-void owl_function_printallvars()
+void owl_function_printallvars(void)
 {
   const char *name;
@@ -1691 +1689 @@
 }
 
-void owl_function_show_variables()
+void owl_function_show_variables(void)
 {
   owl_list varnames;
@@ -1745 +1743 @@
 }
 
-void owl_function_delete_automsgs()
+void owl_function_delete_automsgs(void)
 {
   /* mark for deletion all messages in the current view that match the
@@ -1778 +1776 @@
 }
 
-void owl_function_status()
+void owl_function_status(void)
 {
   char buff[MAXPATHLEN+1];
@@ -1858 +1856 @@
 }
 
-void owl_function_show_term()
+void owl_function_show_term(void)
 {
   owl_fmtext fm;
@@ -2271 +2269 @@
 }
 
-void owl_function_show_filters()
+void owl_function_show_filters(void)
 {
   const owl_list *l;
@@ -2316 +2314 @@
 }
 
-void owl_function_show_zpunts()
+void owl_function_show_zpunts(void)
 {
   const owl_filter *f;
@@ -2749 +2747 @@
 }
 
-void owl_function_show_colors()
+void owl_function_show_colors(void)
 {
   owl_fmtext fm;
@@ -2899 +2897 @@
 }
 
-void owl_function_show_keymaps()
+void owl_function_show_keymaps(void)
 {
   owl_list l;
@@ -3193 +3191 @@
 void owl_function_dump(const char *filename) 
 {
-  int i, j, count;
+  int i, j;
   owl_message *m;
   const owl_view *v;
@@ -3216 +3214 @@
   }
 
-  count=0;
   j=owl_view_get_size(v);
   for (i=0; i<j; i++) {
@@ -3379 +3376 @@
 }
 
-void owl_function_toggleoneline()
+void owl_function_toggleoneline(void)
 {
   owl_view *v;
@@ -3400 +3397 @@
 void owl_function_error(const char *fmt, ...)
 {
+  static int in_error = 0;
   va_list ap;
   char *buff;
   const char *nl;
 
+  if (++in_error > 2) {
+    /* More than two nested errors, bail immediately. */
+    in_error--;
+    return;
+  }
+
   va_start(ap, fmt);
-
   buff = g_strdup_vprintf(fmt, ap);
+  va_end(ap);
+
   owl_function_debugmsg("ERROR: %s", buff);
+  owl_function_log_err(buff);
+
   nl = strchr(buff, '\n');
-  if(nl && *(nl + 1)) {
+
+  /*
+    Showing admin messages triggers a lot of code. If we have a
+    recursive error call, that's the most likely candidate, so
+    suppress the call in that case, to try to avoid infinite looping.
+  */
+
+  if(nl && *(nl + 1) && in_error == 1) {
     /* Multiline error */
     owl_function_adminmsg("ERROR", buff);
@@ -3415 +3429 @@
     owl_function_makemsg("[Error] %s", buff);
   }
-  owl_function_log_err(buff);
-  va_end(ap);
+
   owl_free(buff);
+
+  in_error--;
 }
 
@@ -3438 +3453 @@
 }
 
-void owl_function_showerrs()
+void owl_function_showerrs(void)
 {
   owl_fmtext fm;
@@ -3552 +3567 @@
 }
 
-int owl_function_get_color_count()
+int owl_function_get_color_count(void)
 {
      return COLORS;
@@ -3579 +3594 @@
 }
 
-void owl_function_mark_message()
+void owl_function_mark_message(void)
 {
   const owl_message *m;
@@ -3598 +3613 @@
 }
 
-void owl_function_swap_cur_marked()
+void owl_function_swap_cur_marked(void)
 {
   int marked_id;

global.c

@@ -115 +115 @@
   g->timerlist = NULL;
   g->interrupted = FALSE;
+  g->got_sigtstp = FALSE;
 }
 
@@ -482 +483 @@
   sepbar(NULL);
   owl_editwin_redisplay(g->tw, 0);
-  owl_function_full_redisplay(&g);
+  owl_function_full_redisplay();
 
   /* TODO: this should handle other forms of popwins */
@@ -968 +969 @@
   g->interrupted = 0;
 }
+
+int owl_global_is_sigstp(const owl_global *g) {
+  return g->got_sigtstp;
+}
+
+void owl_global_set_got_sigstp(owl_global *g) {
+  g->got_sigtstp = 1;
+}
+
+void owl_global_unset_got_sigstp(owl_global *g) {
+  g->got_sigtstp = 0;
+}

help.c

@@ -2 +2 @@
 #include <string.h>
 
-void owl_help()
+void owl_help(void)
 {
   owl_fmtext fm;

keys.c

@@ -349 +349 @@
 
   if (pw && owl_popwin_is_active(pw) && v) {
+    owl_popwin_refresh(pw);
     owl_viewwin_redisplay(v, 1);
   }  

libfaim/Makefile.am

@@ -10 +10 @@
      aim_cbtypes.h  aim.h  aim_internal.h  faimconfig.h md5.h
 
+libfaim_a_CFLAGS = $(LIBFAIM_CFLAGS)
 libfaim_a_CPPFLAGS = -DAIM_BUILDDATE=\"x\" -DAIM_BUILDTIME=\"x\" \
                      -I${top_srcdir}/libfaim

logging.c

@@ -179 +179 @@
 
   /* create a present message so we can pass it to
-   * owl_log_shouldlog_message()
+   * owl_log_shouldlog_message(void)
    */
   m = owl_malloc(sizeof(owl_message));

mainwin.c

@@ -32 +32 @@
 
   recwinlines=owl_global_get_recwin_lines(&g);
-  topmsg=owl_global_get_topmsg(&g);
   viewsize=owl_view_get_size(v);
 

message.c

@@ -14 +14 @@
 static owl_fmtext_cache * fmtext_cache_next = fmtext_cache;
 
-void owl_message_init_fmtext_cache ()
+void owl_message_init_fmtext_cache(void)
 {
     int i;
@@ -23 +23 @@
 }
 
-owl_fmtext_cache * owl_message_next_fmtext() /*noproto*/
+owl_fmtext_cache *owl_message_next_fmtext(void) /*noproto*/
 {
     owl_fmtext_cache * f = fmtext_cache_next;

owl.c

@@ -46 +46 @@
 } owl_options;
 
-void usage()
+void usage(void)
 {
   fprintf(stderr, "Barnowl version %s\n", OWL_VERSION_STRING);
@@ -378 +378 @@
 }
 
+void sigtstp_handler(int sig, siginfo_t *si, void *data)
+{
+  owl_global_set_got_sigstp(&g);
+}
+
 void owl_register_signal_handlers(void) {
   struct sigaction sigact;
@@ -395 +400 @@
   sigaction(SIGINT, &sigact, NULL);
 
+  sigact.sa_sigaction=sigtstp_handler;
+  sigaction(SIGTSTP, &sigact, NULL);
 }
 

owl.h

@@ -588 +588 @@
   int load_initial_subs;
   int interrupted;
+  int got_sigtstp;
 } owl_global;
 

perl/lib/BarnOwl.pm

@@ -427 +427 @@
 }
 
+=head3 default_zephyr_signature
+
+Compute the default zephyr signature.
+
+=cut
+
+sub default_zephyr_signature
+{
+  if (my $zsig = getvar('zsig')) {
+    return $zsig;
+  }
+  if (my $zsigproc = getvar('zsigproc')) {
+    return `$zsigproc`;
+  }
+  my $zwrite_signature = get_zephyr_variable('zwrite-signature');
+  if (defined($zwrite_signature)) {
+    return $zwrite_signature;
+  }
+  my $name = ((getpwuid($<))[6]);
+  $name =~ s/,.*//;
+  return $name;
+}
+
 # Stub for owl::startup / BarnOwl::startup, so it isn't bound to the
 # startup command. This may be redefined in a user's configfile.

perl/lib/BarnOwl/Complete/Zephyr.pm

@@ -45 +45 @@
     my $m = shift;
     return unless $m->type eq 'zephyr';
-    $classes{$m->class} = 1;
-    $realms{$m->realm} = 1;
-    $users{BarnOwl::Message::Zephyr::strip_realm($m->sender)} = 1;
+    $classes{lc $m->class} = 1;
+    $realms{lc $m->realm} = 1;
+    $users{lc BarnOwl::Message::Zephyr::strip_realm($m->sender)} = 1;
 }
 

perl/lib/BarnOwl/Hooks.pm

@@ -196 +196 @@
     my $package = "BarnOwl";
 
+
+    if(!contains(\@BarnOwl::all_commands, $command)) {
+        push @BarnOwl::all_commands, $command;
+    }
+
     if($symbol =~ m{^edit:(.+)$}) {
         $symbol = $1;
@@ -222 +227 @@
         }
     }
-
-    if(!contains(\@BarnOwl::all_commands, $command)) {
-        push @BarnOwl::all_commands, $command;
-    }
 }
 

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

@@ -6 +6 @@
 use BarnOwl::Completion::Util qw(complete_flags);
 
-my %networks = ();
-my %dests = ();
-my %servers = ();
+our %users = ();
+our %servers = ();
 
-sub complete_networks { keys %networks }
-sub complete_dests    { keys %dests }
-sub complete_channels { grep /^#/, keys %dests }
-sub complete_nicks    { grep /^[^#]/, keys %dests }
+sub complete_networks { keys %BarnOwl::Module::IRC::ircnets }
+sub complete_dests    { keys %users, complete_channels() }
+sub complete_channels { keys %BarnOwl::Module::IRC::channels }
+sub complete_nicks    { keys %users }
 sub complete_servers  { keys %servers }
 
@@ -75 +74 @@
     my $m = shift;
     return unless $m->type eq 'IRC';
-    $networks{$m->network} = 1;
-    $dests{$m->recipient} = 1;
-    $dests{$m->sender} = 1;
+    if ($m->recipient && $m->recipient !~ m{^#}) {
+        $users{$m->recipient} = 1;
+    }
+    if ($m->sender && $m->sender !~ m{^#}) {
+        $users{$m->sender} = 1;
+    }
     $servers{$m->server} = 1;
 }

perlconfig.c

@@ -26 +26 @@
 {
   SV *ret = newSVpv(str, 0);
-  if(is_utf8_string(str, strlen(str))) {
+  if(is_utf8_string((U8*)str, strlen(str))) {
     SvUTF8_on(ret);
   } else {
@@ -523 +523 @@
   if(cb == NULL) {
     owl_function_error("Perl callback is NULL!");
+    return;
   }
   text = owl_new_sv(owl_editwin_get_text(e));
@@ -546 +547 @@
 }
 
-void owl_perlconfig_mainloop()
+void owl_perlconfig_mainloop(owl_timer *t, void *data)
 {
   dSP;

popwin.c

@@ -62 +62 @@
   owl_global_set_needrefresh(&g);
   owl_mainwin_redisplay(owl_global_get_mainwin(&g));
-  owl_function_full_redisplay(&g);
+  owl_function_full_redisplay();
   return(0);
 }

scripts/do-release

@@ -7 +7 @@
 
 force=
+no_tag=
 
-if [ "$1" = "-f" ]; then
-    force=1
-fi
+for arg; do
+    case $arg in
+        -f) force=1 ;;
+        --no-tag) no_tag=1 ;;
+    esac
+done
 
 VERS=$(perl -ne 'print $1 if m{^AC_INIT\(\[[^\]]+\],\s*\[([^\]]+)\]}' configure.ac) \
@@ -21 +25 @@
 fi
 
-if git cat-file -t "$TAG" > /dev/null 2>&1; then
-    die "Error: Object $TAG already exists."
+if ! [ "$no_tag" ]; then
+    if git cat-file -t "$TAG" > /dev/null 2>&1; then
+        die "Error: Object $TAG already exists."
+    fi
+
+    git tag -s -m "BarnOwl $VERS" "$TAG"
+else
+    TAG=HEAD
 fi
 
@@ -28 +38 @@
 for sig in 1 2 13 15; do trap "exit $(($sig + 128))" $sig; done
 trap 'exittrap' EXIT
-
-git tag -s -m "BarnOwl $VERS" "$TAG"
 
 TMPDIR=$(mktemp -d /tmp/barnowl.XXXXXX)

select.c

@@ -152 +152 @@
 }
 
-int owl_select_dispatch_count()
+int owl_select_dispatch_count(void)
 {
   return owl_list_get_size(owl_global_get_dispatchlist(&g));
@@ -205 +205 @@
   FD_ZERO(e);
   max_fd = 0;
-  len = owl_select_dispatch_count(g);
+  len = owl_select_dispatch_count();
   for(i = 0; i < len; i++) {
     d = owl_list_get_element(dl, i);
@@ -215 +215 @@
 }
 
-void owl_select_gc()
+void owl_select_gc(void)
 {
   int i;
@@ -325 +325 @@
 }
 
-void owl_select_handle_intr()
+void owl_select_mask_signals(sigset_t *oldmask) {
+  sigset_t set;
+
+  sigemptyset(&set);
+  sigaddset(&set, SIGINT);
+  sigaddset(&set, SIGTSTP);
+  sigprocmask(SIG_BLOCK, &set, oldmask);
+}
+
+void owl_select_handle_intr(sigset_t *restore)
 {
   owl_input in;
 
   owl_global_unset_interrupted(&g);
-  owl_function_unmask_sigint(NULL);
+
+  sigprocmask(SIG_SETMASK, restore, NULL);
 
   in.ch = in.uch = owl_global_get_startup_tio(&g)->c_cc[VINTR];
@@ -336 +346 @@
 }
 
-void owl_select()
+void owl_select_check_tstp() {
+  if(owl_global_is_sigstp(&g)) {
+    owl_function_makemsg("Use :suspend to suspend.");
+    owl_global_unset_got_sigstp(&g);
+  }
+}
+
+void owl_select(void)
 {
   int i, max_fd, aim_max_fd, aim_done, ret;
@@ -347 +364 @@
   owl_select_process_timers(&timeout);
 
-  owl_function_mask_sigint(&mask);
+  owl_select_mask_signals(&mask);
+
+  owl_select_check_tstp();
   if(owl_global_is_interrupted(&g)) {
-    owl_select_handle_intr();
+    owl_select_handle_intr(&mask);
     return;
   }
@@ -381 +400 @@
   /* END AIM HACK */
 
-
   ret = pselect(max_fd+1, &r, &aim_wfds, &e, &timeout, &mask);
 
   if(ret < 0 && errno == EINTR) {
+    owl_select_check_tstp();
     if(owl_global_is_interrupted(&g)) {
-      owl_select_handle_intr();
-    }
+      owl_select_handle_intr(NULL);
+    }
+    sigprocmask(SIG_SETMASK, &mask, NULL);
     return;
   }
 
-  owl_function_unmask_sigint(NULL);
+  sigprocmask(SIG_SETMASK, &mask, NULL);
 
   if(ret > 0) {

text.c

@@ -316 +316 @@
   toquote_len=strlen(toquote);
   quotestr_len=strlen(quotestr);
-  out=owl_malloc((in_len*quotestr_len)+30);
   place=0;
   escape = 0;

util.c

@@ -454 +454 @@
 
 /* Get the default tty name.  Caller must free the return */
-char *owl_util_get_default_tty()
+char *owl_util_get_default_tty(void)
 {
   const char *tmp;
@@ -475 +475 @@
 
 /* Animation hack */
-void owl_hack_animate()
+void owl_hack_animate(void)
 {
   const owl_messagelist *ml;
@@ -557 +557 @@
  * inefficient impelementation which reads the entire file into
  * memory.
+ *
+ * Returns the number of lines removed
  */
-void owl_util_file_deleteline(const char *filename, const char *line, int backup)
+int owl_util_file_deleteline(const char *filename, const char *line, int backup)
 {
   char buff[LINE], *text;
@@ -564 +566 @@
   FILE *file, *backupfile=NULL;
   int size, newline;
+  int numremoved = 0;
 
   /* open the file for reading */
@@ -569 +572 @@
   if (!file) {
     owl_function_error("Error opening file %s", filename);
-    return;
+    return 0;
   }
 
@@ -580 +583 @@
       owl_free(backupfilename);
       fclose(file);
-      return;
+      return 0;
     }
   }
@@ -604 +607 @@
       strcat(text, buff);
       if (newline) strcat(text, "\n");
+    } else {
+      numremoved++;
     }
 
@@ -628 +633 @@
     owl_free(backupfilename);
   owl_free(text);
+
+  return numremoved;
 }
 
@@ -664 +671 @@
 }
 
-const char * owl_get_datadir()
+const char * owl_get_datadir(void)
 {
   const char * datadir = getenv("BARNOWL_DATA_DIR");
@@ -689 +696 @@
         strncat(r, s, p-s);
         p = g_utf8_next_char(p);
-        while (p && owl_fmtext_is_format_char(g_utf8_get_char(p))) {
+        while (owl_fmtext_is_format_char(g_utf8_get_char(p))) {
           p = g_utf8_next_char(p);
         }

variable.c

@@ -208 +208 @@
          "principal. Note that customizing the sender name will\n"
          "cause your zephyrs to be sent unauthenticated."),
+
+  OWLVAR_STRING( "zsigfunc" /* %OwlVarStub */, "BarnOwl::default_zephyr_signature()",
+                 "zsig perl function",
+                 "Called every time you start a zephyrgram without an\n"
+                 "explicit zsig.  The default setting implements the policy\n"
+                 "descripted in the documentation for the 'zsig' variable.\n"),
 
   OWLVAR_STRING( "zsig" /* %OwlVarStub */, "",

viewwin.c

@@ -35 +35 @@
 void owl_viewwin_init_fmtext(owl_viewwin *v, WINDOW *win, int winlines, int wincols, const owl_fmtext *fmtext)
 {
+  char *text;
+
   owl_fmtext_copy(&(v->fmtext), fmtext);
+  text = owl_fmtext_print_plain(fmtext);
+  if (text[0] != '\0' && text[strlen(text) - 1] != '\n') {
+      owl_fmtext_append_normal(&(v->fmtext), "\n");
+  }
   v->textlines=owl_fmtext_num_lines(&(v->fmtext));
   v->topline=0;

zcrypt.c

@@ -23 +23 @@
 #include <unistd.h>
 #include <sys/types.h>
-#include <des.h>
+
+#ifdef HAVE_KERBEROS_IV
+#include <kerberosIV/des.h>
+#else
+#include <openssl/des.h>
+#endif
 
 #define MAX_KEY 128
@@ -51 +56 @@
 char *GetZephyrVarKeyFile(const char *whoami, const char *class, const char *instance);
 
-#ifndef HAVE_DES_ECB_ENCRYPT_PROTO
-int des_ecb_encrypt(char [], char [], des_key_schedule, int);
-#endif
-
 #define M_NONE            0
 #define M_ZEPHYR_ENCRYPT  1
@@ -61 +62 @@
 #define M_RANDOMIZE       4
 #define M_SETKEY          5
+
+static void owl_zcrypt_string_to_schedule(char *keystring, des_key_schedule schedule) {
+#ifdef HAVE_KERBEROS_IV
+  des_cblock key;
+#else
+  des_cblock _key, *key = &_key;
+#endif
+
+  des_string_to_key(keystring, key);
+  des_key_sched(key, schedule);
+}
 
 /* The 'owl_zcrypt_decrypt' function was written by kretch for Owl.
@@ -73 +85 @@
   char *fname, keystring[MAX_KEY];
   FILE *fkey;
-  des_cblock key;
   des_key_schedule schedule;
-  char input[8], output[9];
+  unsigned char input[8], output[8];
   int i, c1, c2;
   
@@ -82 +93 @@
   fkey=fopen(fname, "r");
   if (!fkey) return(-1);
-  fgets(keystring, MAX_KEY-1, fkey);
+  if (!fgets(keystring, MAX_KEY-1, fkey)) {
+    fclose(fkey);
+    return -1;
+  }
   fclose(fkey);
 
@@ -88 +102 @@
 
   output[0] = '\0';    /* In case no message at all                 */
-  output[8] = '\0';    /* NULL at end will limit string length to 8 */
-
-  des_string_to_key(keystring, key);
-  des_key_sched(key, schedule);
+
+  owl_zcrypt_string_to_schedule(keystring, schedule);
 
   inptr=in;
@@ -102 +114 @@
       inptr+=2;
     }
-    des_ecb_encrypt(input, output, schedule, FALSE);
-    strcat(out, output);
-  }
-
-  if (output[0]) {
-    if (output[strlen(output)-1] != '\n') {
-      strcat(out, "\n");
-    }
-  } else {
+    des_ecb_encrypt(&input, &output, schedule, FALSE);
+    strncat(out, (const char *)output, 8);
+  }
+
+  if (out[0] && out[strlen(out) - 1] != '\n')
     strcat(out, "\n");
-  }
   return(0);
 }
@@ -119 +126 @@
   char *fname, keystring[MAX_KEY];
   FILE *fkey;
-  des_cblock key;
   des_key_schedule schedule;
-  char input[8], output[8];
+  unsigned char input[8], output[8];
   int size, length, i;
   const char *inbuff = NULL, *inptr;
-  int use_buffer = FALSE;
   int num_blocks=0, last_block_size=0;
 
@@ -131 +136 @@
   fkey=fopen(fname, "r");
   if (!fkey) return(-1);
-  fgets(keystring, MAX_KEY-1, fkey);
+  if (!fgets(keystring, MAX_KEY-1, fkey)) {
+    fclose(fkey);
+    return -1;
+  }
   fclose(fkey);
 
-  des_string_to_key(keystring, key);
-  des_key_sched(key, schedule);
+  owl_zcrypt_string_to_schedule(keystring, schedule);
 
   inbuff=in;
@@ -141 +148 @@
   num_blocks=(length+7)/8;
   last_block_size=((length+7)%8)+1;
-  use_buffer=TRUE;
 
   strcpy(out, "");
@@ -167 +173 @@
 
     /* Encrypt and output the block */
-    des_ecb_encrypt(input, output, schedule, TRUE);
+    des_ecb_encrypt(&input, &output, schedule, TRUE);
 
     for (i = 0; i < 8; i++) {
@@ -216 +222 @@
     /* Scan file for a match */
     while (!feof(fsearch)) {
-      fgets(buffer, MAX_BUFF - 3, fsearch);
+      if (!fgets(buffer, MAX_BUFF - 3, fsearch)) break;
       for (i = 0; i < numsearch; i++) {
         if (strncasecmp(varname[i], buffer, length[i]) == 0) {
@@ -262 +268 @@
 }
 
-static pid_t zephyrpipe_pid = 0;
-
-#endif
+#endif

zephyr.c

@@ -15 +15 @@
 } owl_sub_list;
 
-Code_t ZResetAuthentication();
+Code_t ZResetAuthentication(void);
 #endif
 
@@ -21 +21 @@
 
 #ifdef HAVE_LIBZEPHYR
-void owl_zephyr_initialize()
+void owl_zephyr_initialize(void)
 {
   int ret;
@@ -127 +127 @@
 }
 
-void owl_zephyr_load_initial_subs() {
+void owl_zephyr_load_initial_subs(void) {
   int ret_sd, ret_bd, ret_u;
 
@@ -154 +154 @@
 }
 #else
-void owl_zephyr_initialize()
-{
-}
-#endif
-
-
-int owl_zephyr_shutdown()
+void owl_zephyr_initialize(void)
+{
+}
+#endif
+
+
+int owl_zephyr_shutdown(void)
 {
 #ifdef HAVE_LIBZEPHYR
@@ -171 +171 @@
 }
 
-int owl_zephyr_zpending()
+int owl_zephyr_zpending(void)
 {
 #ifdef HAVE_LIBZEPHYR
@@ -183 +183 @@
 }
 
-const char *owl_zephyr_get_realm()
+const char *owl_zephyr_get_realm(void)
 {
 #ifdef HAVE_LIBZEPHYR
@@ -192 +192 @@
 }
 
-const char *owl_zephyr_get_sender()
+const char *owl_zephyr_get_sender(void)
 {
 #ifdef HAVE_LIBZEPHYR
@@ -316 +316 @@
  * Return -2 if there is a failure from zephyr to load the subscriptions.
  */
-int owl_zephyr_loadbarnowldefaultsubs()
+int owl_zephyr_loadbarnowldefaultsubs(void)
 {
 #ifdef HAVE_LIBZEPHYR
@@ -340 +340 @@
 }
 
-int owl_zephyr_loaddefaultsubs()
+int owl_zephyr_loaddefaultsubs(void)
 {
 #ifdef HAVE_LIBZEPHYR
@@ -415 +415 @@
 }
 
-void unsuball()
+void unsuball(void)
 {
 #if HAVE_LIBZEPHYR
@@ -993 +993 @@
 #ifdef HAVE_LIBZEPHYR
   char *line, *subsfile;
+  int linesdeleted;
   
   line=owl_zephyr_makesubline(class, inst, recip);
@@ -1003 +1004 @@
   }
   
-  owl_util_file_deleteline(subsfile, line, 1);
+  linesdeleted = owl_util_file_deleteline(subsfile, line, 1);
+  if (linesdeleted > 0) {
+    owl_function_makemsg("Subscription removed");
+  } else {
+    owl_function_error("No subscription present in %s", subsfile);
+  }
   owl_free(subsfile);
   owl_free(line);
-  owl_function_makemsg("Subscription removed");
 #endif
 }
@@ -1119 +1124 @@
  * free the return.
  */
-char *owl_zephyr_getsubs()
+char *owl_zephyr_getsubs(void)
 {
 #ifdef HAVE_LIBZEPHYR

zwrite.c

@@ -154 +154 @@
 void owl_zwrite_populate_zsig(owl_zwrite *z)
 {
-  const char *zsigproc, *zsigowlvar, *zsigzvar;
-  char *ptr;
-  struct passwd *pw;
-
   /* get a zsig, if not given */
-  if (z->zsig==NULL) {
-    zsigproc = owl_global_get_zsigproc(&g);
-    zsigowlvar = owl_global_get_zsig(&g);
-    zsigzvar = owl_zephyr_get_variable("zwrite-signature");
-
-    if (zsigowlvar && *zsigowlvar) {
-      z->zsig=owl_validate_utf8(zsigowlvar);
-    } else if (zsigproc && *zsigproc) {
-      FILE *file;
-      char buff[LINE], *openline;
-      
-      /* simple hack for now to nuke stderr */
-#if OWL_STDERR_REDIR
-      openline = owl_strdup(zsigproc);
-#else
-      openline = owl_sprintf("%s 2> /dev/null", zsigproc);
-#endif
-      file=popen(openline, "r");
-      owl_free(openline);
-      if (!file) {
-        if (zsigzvar && *zsigzvar) {
-          z->zsig=owl_validate_utf8(zsigzvar);
-        }
-      } else {
-        z->zsig=owl_malloc(LINE*5);
-        strcpy(z->zsig, "");
-        while (fgets(buff, LINE, file)) { /* wrong sizing */
-          strcat(z->zsig, buff);
-        }
-        pclose(file);
-        if (z->zsig[0] != '\0' && z->zsig[strlen(z->zsig) - 1] == '\n') {
-          z->zsig[strlen(z->zsig)-1]='\0';
-        }
-      }
-    } else if (zsigzvar) {
-      z->zsig=owl_validate_utf8(zsigzvar);
-    } else if (((pw=getpwuid(getuid()))!=NULL) && (pw->pw_gecos)) {
-      z->zsig=owl_validate_utf8(pw->pw_gecos);
-      ptr=strchr(z->zsig, ',');
-      if (ptr) {
-        ptr[0]='\0';
-      }
-    }
-  }
+  if (z->zsig != NULL)
+    return;
+
+  z->zsig = owl_perlconfig_execute(owl_global_get_zsigfunc(&g));
 }