Changeset 658421f

Timestamp:

Apr 13, 2017, 6:43:22 PM (7 years ago)

Author:

GitHub <noreply@github.com>

Parents:

678a7650 (diff), 5405fb1 (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.

git-author:

tehmoth <james2vegas@aim.com> (04/13/17 18:43:22)

git-committer:

GitHub <noreply@github.com> (04/13/17 18:43:22)

Message:

Merge 5405fb1f18db895edf58a681a236bef64d9715e2 into 678a7650cf7595dcc43c5e1a0422b6d965b67136

Files:

• .gitignore (modified) (1 diff)
• .travis.yml (modified) (2 diffs)
• ChangeLog (modified) (1 diff)
• Makefile.am (modified) (4 diffs)
• aim.c (modified) (1 diff)
• buddy.c (modified) (1 diff)
• buddylist.c (modified) (3 diffs)
• cmd.c (modified) (3 diffs)
• commands.c (modified) (6 diffs)
• configure.ac (modified) (1 diff)
• context.c (modified) (2 diffs)
• cpanfile (added)
• editwin.c (modified) (4 diffs)
• filter.c (modified) (6 diffs)
• filterelement.c (modified) (1 diff)
• filterproc.c (modified) (2 diffs)
• functions.c (modified) (11 diffs)
• global.c (modified) (1 diff)
• keybinding.c (modified) (3 diffs)
• keymap.c (modified) (1 diff)
• logging.c (modified) (3 diffs)
• mainwin.c (modified) (1 diff)
• message.c (modified) (3 diffs)
• messagelist.c (modified) (2 diffs)
• perl/lib/BarnOwl/Style/Default.pm (modified) (1 diff)
• perl/modules/.gitignore (added)
• perl/modules/Facebook/.gitignore (deleted)
• perl/modules/IRC/lib/BarnOwl/Module/IRC.pm (modified) (1 diff)
• perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm (modified) (2 diffs)
• perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm (modified) (1 diff)
• perl/modules/Twitter/.gitignore (deleted)
• perl/modules/Twitter/.hgignore (deleted)
• perl/modules/Twitter/lib/BarnOwl/Module/Twitter.pm (modified) (3 diffs)
• perl/modules/Twitter/lib/BarnOwl/Module/Twitter/Handle.pm (modified) (2 diffs)
• perlconfig.c (modified) (1 diff)
• perlglue.xs (modified) (1 diff)
• popexec.c (modified) (2 diffs)
• popwin.c (modified) (2 diffs)
• runtests.sh (modified) (1 diff)
• scripts/dist-ignore (added)
• scripts/do-release (modified) (3 diffs)
• select.c (modified) (2 diffs)
• style.c (modified) (1 diff)
• tester.c (modified) (3 diffs)
• util.c (modified) (2 diffs)
• variable.c (modified) (3 diffs)
• viewwin.c (modified) (3 diffs)
• zephyr.c (modified) (13 diffs)
• zwrite.c (modified) (3 diffs)

.gitignore

@@ +1 @@
+# Generated by autoreconf
+Makefile.in
+/aclocal.m4
+/autom4te.cache/
+/compile
+/config.h.in
+/config.h.in~
+/configure
+/depcomp
+/install-sh
+/missing
+/test-driver
+
+# Generated by configure
+Makefile
+.deps/
+/config.cache
+/config.h
+/config.log
+/config.status
+/stamp-h1
+
+# Generated by make
+*.o
 *.a
-*.o
-*.par
-.deps
+/BUILD_VERSION.mk
+/barnowl
 /bin/
-BUILD_VERSION.mk
-META.yml
-MYMETA.yml
-Makefile
-Makefile.in
-Makefile.old
+/gmarshal_funcs.c
+/gmarshal_funcs.h
+/owl_prototypes.h
+/owl_prototypes.h.new
+/perlglue.c
+/varstubs.c
+/version.c
+/version.c.new
+/zcrypt
+
+# Generated by make check
+/runtests.sh.log
+/runtests.sh.trs
+/test-suite.log
+/tester
+
+# Generated by make tags et al.
+ID
 TAGS
-aclocal.m4
-autom4te.cache
-barnowl
-blib
-config.cache
-config.h
-config.h.in
-config.h.in~
-config.log
-config.status
-configure
-core
-depcomp
-gmarshal_funcs.c
-gmarshal_funcs.h
-inc/
-install-sh
-jabber.log
-missing
-owl_prototypes.h
-owl_prototypes.h.new
-perlglue.c
-pm_to_blib
-runtests.sh.log
-runtests.sh.trs
-stamp-h1
-test-driver
-test-suite.log
-tester
-varstubs.c
-version.c
-version.c.new
-zcrypt
+tags
+/GPATH
+/GRTAGS
+/GSYMS
+/GTAGS
+/cscope.files
+/cscope.in.out
+/cscope.out
+/cscope.po.out

.travis.yml

@@ -1 +1 @@
 language: perl
+sudo: false
 compiler:
   - clang
@@ -9 +10 @@
   - "5.16"
   - "5.18"
-  - "5.19"
-install:
-  - sudo apt-get update -q
-# we actually want debhelper >= 7, libperl-dev >= 5.10.1-8, libzephyr-dev >= 3.0~beta
-  - sudo apt-get install -q autoconf autotools-dev debhelper dh-autoreconf libglib2.0-dev libkrb5-dev libncurses5-dev libncursesw5-dev libssl-dev libzephyr-dev pkg-config zip
+  - "5.20"
+addons:
+  apt:
+    # we actually want debhelper >= 7, libperl-dev >= 5.10.1-8, libzephyr-dev >= 3.0~beta
+    packages:
+    - autoconf
+    - autotools-dev
+    - debhelper
+    - dh-autoreconf
+    - libglib2.0-dev
+    - libkrb5-dev
+    - libncurses5-dev
+    - libncursesw5-dev
+    - libssl-dev
+    - libzephyr-dev
+    - pkg-config
+    - zip
 # perl things
 # In lp:~barnowl/barnowl/packaging, we use apt-get.  Here, we use cpanm.
 #  - sudo apt-get install libanyevent-perl libclass-accessor-perl libextutils-depends-perl libglib-perl libmodule-install-perl libnet-twitter-lite-perl libpar-perl libperl-dev
-  - cpanm AnyEvent Class::Accessor ExtUtils::Depends Glib Module::Install Net::Twitter::Lite PAR
-script: "./autogen.sh && ./configure && make distcheck"
+# It's taken care of by the default install script
+script: ./autogen.sh && ./configure && make distcheck

ChangeLog

@@ +1 @@
+1.10
+ * No changes above what's already in 1.10rc1
+
+1.10rc1
+ * Numerous autotools/build machinery fixes -andersk@mit.edu
+ * Numerous code correctness and simplification/cleanup fixes -andersk@mit.edu
+ * Add and use a cpanfile documenting perl module dependencies -jgross@mit.edu
+ * Add Travis configuration -jgross@mit.edu
+ * Avoid strchrnul -andersk@mit.edu
+ * Numerous IRC fixes -jgross@mit.edu
+ * Improve smartnarrow and smartfilter documentation -jgross@mit.edu
+ * filterproc: Rewrite using GIOChannel -andersk@mit.edu
+ * Implement :twitter-favorite -nelhage@nelhage.com
+ * Kill the client-side tweet length check. -nelhage@nelhage.com
+ * squelch the Twitter legacy_list_api warnings -nelhage@nelhage.com
+ * Use SSL for Twitter by default -adehnert@mit.edu
+ * Humanize zsigs -andersk@mit.edu
+ * Show Zephyr charset in info popup -andersk@mit.edu
+ * Fix Jabber SRV record support (at one point fixed connecting via jabber to google talk or facebook) -james2vegas@aim.com
+ * fix cmd_join in BarnOwl/Module/IRC.pm -james2vegas@aim.com
+ * Add a ~/.owl/ircchannels file, persist channels -jgross@mit.edu
+ * Added hooks for user going idle or active. -jgross@mit.edu
+ * Support channel-or-user IRC commands, and setup irc-msg to use it. -ezyang@mit.edu
+ * Refactor perl calls through a single method -jgross@mit.edu
+ * Really support building Perl modules from a separate builddir -andersk@mit.edu
+ * Get rid of all our embedded copies of Module::Install -andersk@mit.edu
+ * Don't let new_variable_* overriding previously set values -rnjacobs@mit.edu
+ * Messages sent to 'class messages' are not personal -jgross@mit.edu
+ * Expose message_matches_filter to perl -jgross@mit.edu
+ * Fail fast on -c filsrv, which most people won't have permission to send to -rnjacobs@mit.edu
+ * zcrypt: Use getopt_long for argument parsing -andersk@mit.edu
+ * zcrypt: Accept -help and --version -andersk@mit.edu
+ * barnowl --help: Write to stdout and exit successfully -andersk@mit.edu
+ * Don't swallow errors in :unsuball -davidben@mit.edu
+ * Allow testing in a separate build directory -andersk@mit.edu
+ * Add support for arbitrary Perl subs for getters and setters for barnowl variables -glasgall@mit.edu
+ * owl_zephyr_loadsubs: Don’t leak memory on error opening ~/.zephyr.subs -andersk@mit.edu
+ * Make :loadsubs reload instanced personals too -davidben@mit.edu
+ * Fix some undefined behavior in filter.c, caught by clang scan-build -jgross@mit.edu
+ * Die on a failed zephyr_zwrite; don't silently ignore it -jgross@mit.edu
+ * Fix a memory leak in zcrypt.c, caught by clang scan-build -jgross@mit.edu
+ * zcrypt: Make gpg stop messing around in ~/.gnupg -andersk@mit.edu
+ * Fix display of pseudologins -davidben@mit.edu
+ * Unbundle random Facebook module libraries -davidben@mit.edu
+ * Replace deprecated GLib < 2.31.0 APIs -andersk@mit.edu
+ * Abstract g->interrupt_lock -andersk@mit.edu
+ * zephyr: Replace outgoing default format with a small URL -geofft@mit.edu
+
 1.9
+ * Update Jabber module for Net::DNS changes -james2vegas@aim.com
+ * Update and make configurable the Zephyr default format -adehnert@mit.edu
+ * Fix a crash when zcrypt fails -andersk@mit.edu
+ * Fix building with OpenSSL before 0.9.8 -andersk@mit.edu
+ * Make :loadsubs reload instanced personals too -davidben@mit.edu
+ * Make Perl zephyr_zwrite call die() when it fails -jgross@mit.edu
+ * Tell gpg calls from zcrypt to ignore ~/.gnupg -andersk@mit.edu
+ * Replace outgoing zephyr default format with a small URL -geofft@mit.edu
  * Add getnumlines() to perl interface -asedeno@mit.edu
  * Include names of invalid filters on filter errors -adehnert@mit.edu

Makefile.am

@@ -2 +2 @@
 
 GIT_DESCRIPTION := $(if $(wildcard $(srcdir)/.git),$(shell cd $(srcdir) && git describe --match='barnowl-*' HEAD 2>/dev/null))
-VERSION = $(if $(GIT_DESCRIPTION),$(GIT_DESCRIPTION:barnowl-%=%),@VERSION@)
--include BUILD_VERSION.mk
+VERSION = $(if $(GIT_DESCRIPTION),$(GIT_DESCRIPTION:barnowl-%=%),$(DIST_VERSION))
+DIST_VERSION = @VERSION@
+-include $(srcdir)/DIST_VERSION.mk BUILD_VERSION.mk
 
 FORCE:
 BUILD_VERSION.mk: $(if $(filter-out $(BUILD_VERSION),$(VERSION)),FORCE)
         echo 'BUILD_VERSION = $(VERSION)' > $@
+dist-hook:: $(if $(filter-out @VERSION@,$(VERSION)),dist-hook-version)
+dist-hook-version:
+        echo 'DIST_VERSION = $(VERSION)' > $(distdir)/DIST_VERSION.mk
 
 bin_PROGRAMS = bin/barnowl
@@ -14 +18 @@
 endif
 
-zcrypt_SOURCES = zcrypt.c filterproc.c version.c
+zcrypt_SOURCES = zcrypt.c filterproc.c
+nodist_zcrypt_SOURCES = version.c
 
 check_PROGRAMS = bin/tester
@@ -104 +109 @@
 
 CLEANFILES = $(BUILT_SOURCES) $(GEN_C) $(noinst_SCRIPTS) $(check_SCRIPTS) BUILD_VERSION.mk
+MAINTAINERCLEANFILES = DIST_VERSION.mk
 EXTRA_DIST = \
     autogen.sh \
@@ -116 +122 @@
     scripts \
     stubgen.pl \
-    typemap
+    typemap \
+    cpanfile
 
 SUBDIRS = compat libfaim perl

aim.c

@@ -1049 +1049 @@
   wrapmsg=owl_text_wordwrap(stripmsg, 70);
   nz_screenname=owl_aim_normalize_screenname(userinfo->sn);
-  m=g_new(owl_message, 1);
+  m=g_slice_new(owl_message);
   owl_message_create_aim(m,
                          nz_screenname,

buddy.c

@@ -72 +72 @@
 {
   owl_buddy_cleanup(b);
-  g_free(b);
+  g_slice_free(owl_buddy, b);
 }

buddylist.c

@@ -11 +11 @@
 {
   owl_buddy *b;
-  b=g_new(owl_buddy, 1);
+  b=g_slice_new(owl_buddy);
   
   owl_buddy_create(b, OWL_PROTOCOL_AIM, screenname);
@@ -50 +50 @@
 
     /* if not, create the login message */
-    m=g_new(owl_message, 1);
+    m=g_slice_new(owl_message);
     owl_message_create_aim(m,
                            screenname,
@@ -69 +69 @@
 
   if (owl_buddylist_is_aim_buddy_loggedin(bl, screenname)) {
-    m=g_new(owl_message, 1);
+    m=g_slice_new(owl_message);
     owl_message_create_aim(m,
                            screenname,

cmd.c

@@ -35 +35 @@
 void owl_cmddict_add_alias(owl_cmddict *cd, const char *alias_from, const char *alias_to) {
   owl_cmd *cmd;
-  cmd = g_new(owl_cmd, 1);
+  cmd = g_slice_new(owl_cmd);
   owl_cmd_create_alias(cmd, alias_from, alias_to);
   owl_perlconfig_new_command(cmd->name);
@@ -42 +42 @@
 
 int owl_cmddict_add_cmd(owl_cmddict *cd, const owl_cmd * cmd) {
-  owl_cmd * newcmd = g_new(owl_cmd, 1);
+  owl_cmd * newcmd = g_slice_new(owl_cmd);
   if(owl_cmd_create_from_template(newcmd, cmd) < 0) {
-    g_free(newcmd);
+    g_slice_free(owl_cmd, newcmd);
     return -1;
   }
@@ -141 +141 @@
 {
   owl_cmd_cleanup(cmd);
-  g_free(cmd);
+  g_slice_free(owl_cmd, cmd);
 }
 

commands.c

@@ -548 +548 @@
               "optional color arguments are used they specifies the colors that\n"
               "messages matching this filter should be displayed in.\n\n"
-              "SEE ALSO: view, viewclass, viewuser\n"),
+              "SEE ALSO: smartfilter, smartnarrow, view, viewclass, viewuser\n"),
 
   OWLCMD_ARGS("colorview", owl_command_colorview, OWL_CTX_INTERACTIVE,
@@ -585 +585 @@
               "filter expression that will be dynamically created by BarnOwl and then\n"
               "applied as the view's filter\n"
-              "SEE ALSO: filter, viewclass, viewuser\n"),
+              "SEE ALSO: filter, smartfilter, smartnarrow, viewclass, viewuser\n"),
 
   OWLCMD_ARGS("smartnarrow", owl_command_smartnarrow, OWL_CTX_INTERACTIVE,
@@ -599 +599 @@
               "    then narrow to the class and instance.\n"
               "If '-r' or '--related' is specified, behave as though the\n"
-              "    'narrow-related' variable was inverted."),
+              "    'narrow-related' variable was inverted.\n\n"
+              "SEE ALSO: filter, smartfilter, view, viewclass, viewuser\n"),
 
   OWLCMD_ARGS("smartfilter", owl_command_smartfilter, OWL_CTX_INTERACTIVE,
@@ -610 +611 @@
               "If the curmsg is a class message, the filter is that class.\n"
               "If the curmsg is a class message and '-i' is specified\n"
-              "    the filter is to that class and instance.\n"),
+              "    the filter is to that class and instance.\n\n"
+              "SEE ALSO: filter, smartnarrow, view, viewclass, viewuser\n"),
 
   OWLCMD_ARGS("viewclass", owl_command_viewclass, OWL_CTX_INTERACTIVE,
@@ -618 +620 @@
               "matching the specified class and switch the current view\n"
               "to it.\n\n"
-              "SEE ALSO: filter, view, viewuser\n"),
+              "SEE ALSO: filter, smartfilter, smartnarrow, view, viewuser\n"),
   OWLCMD_ALIAS("vc", "viewclass"),
 
@@ -627 +629 @@
               "matching the specified user and switch the current\n"
               "view to it.\n\n"
-              "SEE ALSO: filter, view, viewclass\n"),
+              "SEE ALSO: filter, smartfilter, smartnarrow, view, viewclass\n"),
   OWLCMD_ALIAS("vu", "viewuser"),
   OWLCMD_ALIAS("viewperson", "viewuser"),

configure.ac

@@ -1 +1 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([BarnOwl],[1.10dev],[bug-barnowl@mit.edu])
+AC_INIT([BarnOwl],[1.11dev],[bug-barnowl@mit.edu])
 AM_INIT_AUTOMAKE([1.7.0 foreign std-options -Wall -Wno-portability])
 AM_MAINTAINER_MODE([enable])

context.c

@@ -10 +10 @@
   if (!(mode & OWL_CTX_MODE_BITS))
     mode |= OWL_CTX_INTERACTIVE;
-  c = g_new0(owl_context, 1);
+  c = g_slice_new0(owl_context);
   c->mode = mode;
   c->data = data;
@@ -71 +71 @@
   if (ctx->delete_cb)
     ctx->delete_cb(ctx);
-  g_free(ctx);
+  g_slice_free(owl_context, ctx);
 }

editwin.c

@@ -68 +68 @@
 static CALLER_OWN owl_editwin *owl_editwin_allocate(void)
 {
-  owl_editwin *e = g_new0(owl_editwin, 1);
+  owl_editwin *e = g_slice_new0(owl_editwin);
   e->refcount = 1;
   return e;
@@ -87 +87 @@
   oe_destroy_cbdata(e);
 
-  g_free(e);
+  g_slice_free(owl_editwin, e);
 }
 
@@ -373 +373 @@
 owl_editwin_excursion *owl_editwin_begin_excursion(owl_editwin *e)
 {
-  owl_editwin_excursion *x = g_new(owl_editwin_excursion, 1);
+  owl_editwin_excursion *x = g_slice_new(owl_editwin_excursion);
   oe_save_excursion(e, x);
   return x;
@@ -381 +381 @@
 {
   oe_restore_excursion(e, x);
-  g_free(x);
+  g_slice_free(owl_editwin_excursion, x);
 }
 

filter.c

@@ -18 +18 @@
   owl_filter *f;
 
-  f = g_new(owl_filter, 1);
+  f = g_slice_new(owl_filter);
 
   f->name=g_strdup(name);
@@ -69 +69 @@
   if(!argc) return NULL;
 
-  fe = g_new(owl_filterelement, 1);
+  fe = g_slice_new(owl_filterelement);
   owl_filterelement_create(fe);
 
@@ -114 +114 @@
 err:
   owl_filterelement_cleanup(fe);
-  g_free(fe);
+  g_slice_free(owl_filterelement, fe);
   return NULL;
 }
@@ -132 +132 @@
     op2 = owl_filter_parse_primitive_expression(argc-i-1, argv+i+1, &skip);
     if(!op2) goto err;
-    tmp = g_new(owl_filterelement, 1);
+    tmp = g_slice_new(owl_filterelement);
     if(!strcasecmp(argv[i], "and")) {
       owl_filterelement_create_and(tmp, op1, op2);
@@ -152 +152 @@
   if(op1) {
     owl_filterelement_cleanup(op1);
-    g_free(op1);
+    g_slice_free(owl_filterelement, op1);
   }
   return NULL;
@@ -262 +262 @@
   if (f->root) {
     owl_filterelement_cleanup(f->root);
-    g_free(f->root);
+    g_slice_free(owl_filterelement, f->root);
   }
   if (f->name)
     g_free(f->name);
-  g_free(f);
-}
+  g_slice_free(owl_filter, f);
+}

filterelement.c

@@ -328 +328 @@
   if (fe->left) {
     owl_filterelement_cleanup(fe->left);
-    g_free(fe->left);
+    g_slice_free(owl_filterelement, fe->left);
   }
   if (fe->right) {
     owl_filterelement_cleanup(fe->right);
-    g_free(fe->right);
+    g_slice_free(owl_filterelement, fe->right);
   }
   owl_regex_cleanup(&(fe->re));

filterproc.c

@@ -1 +1 @@
 #include "filterproc.h"
 #include <sys/wait.h>
-#include <fcntl.h>
+#include <string.h>
 #include <glib.h>
-#include <poll.h>
-#include <string.h>
-#include <unistd.h>
 
-/* Even in case of error, send_receive is responsible for closing wfd
- * (to EOF the child) and rfd (for consistency). */
-static int send_receive(int rfd, int wfd, const char *out, char **in)
+struct filter_data {
+  const char **in;
+  const char *in_end;
+  GString *out_str;
+  GMainLoop *loop;
+  int err;
+};
+
+static gboolean filter_stdin(GIOChannel *channel, GIOCondition condition, gpointer data_)
 {
-  GString *str = g_string_new("");
-  char buf[1024];
-  nfds_t nfds;
-  int err = 0;
-  struct pollfd fds[2];
+  struct filter_data *data = data_;
+  gboolean done = condition & (G_IO_ERR | G_IO_HUP);
 
-  fcntl(rfd, F_SETFL, O_NONBLOCK | fcntl(rfd, F_GETFL));
-  fcntl(wfd, F_SETFL, O_NONBLOCK | fcntl(wfd, F_GETFL));
-
-  fds[0].fd = rfd;
-  fds[0].events = POLLIN;
-  fds[1].fd = wfd;
-  fds[1].events = POLLOUT;
-
-  if(!out || !*out) {
-    /* Nothing to write. Close our end so the child doesn't hang waiting. */
-    close(wfd); wfd = -1;
-    out = NULL;
+  if (condition & G_IO_OUT) {
+    gsize n;
+    GIOStatus ret = g_io_channel_write_chars(channel, *data->in, data->in_end - *data->in, &n, NULL);
+    *data->in += n;
+    if (ret == G_IO_STATUS_ERROR)
+      data->err = 1;
+    if (ret == G_IO_STATUS_ERROR || *data->in == data->in_end)
+      done = TRUE;
   }
 
-  while(1) {
-    if(out && *out) {
-      nfds = 2;
-    } else {
-      nfds = 1;
-    }
-    err = poll(fds, nfds, -1);
-    if(err < 0) {
-      break;
-    }
-    if(out && *out) {
-      if(fds[1].revents & POLLOUT) {
-        err = write(wfd, out, strlen(out));
-        if(err > 0) {
-          out += err;
-        }
-        if(err < 0) {
-          out = NULL;
-        }
-      }
-      if(!out || !*out || fds[1].revents & (POLLERR | POLLHUP)) {
-        close(wfd); wfd = -1;
-        out = NULL;
-      }
-    }
-    if(fds[0].revents & POLLIN) {
-      err = read(rfd, buf, sizeof(buf));
-      if(err <= 0) {
-        break;
-      }
-      g_string_append_len(str, buf, err);
-    } else if(fds[0].revents & (POLLHUP | POLLERR)) {
-      err = 0;
-      break;
+  if (condition & G_IO_ERR)
+    data->err = 1;
+
+  if (done)
+    g_io_channel_shutdown(channel, TRUE, NULL);
+  return !done;
+}
+
+static gboolean filter_stdout(GIOChannel *channel, GIOCondition condition, gpointer data_)
+{
+  struct filter_data *data = data_;
+  gboolean done = condition & (G_IO_ERR | G_IO_HUP);
+
+  if (condition & (G_IO_IN | G_IO_HUP)) {
+    gchar *buf;
+    gsize n;
+    GIOStatus ret = g_io_channel_read_to_end(channel, &buf, &n, NULL);
+    g_string_append_len(data->out_str, buf, n);
+    g_free(buf);
+    if (ret == G_IO_STATUS_ERROR) {
+      data->err = 1;
+      done = TRUE;
     }
   }
 
-  if (wfd >= 0) close(wfd);
-  close(rfd);
-  *in = g_string_free(str, err < 0);
-  return err;
+  if (condition & G_IO_ERR)
+    data->err = 1;
+
+  if (done) {
+    g_io_channel_shutdown(channel, TRUE, NULL);
+    g_main_loop_quit(data->loop);
+  }
+  return !done;
 }
 
 int call_filter(const char *const *argv, const char *in, char **out, int *status)
 {
-  int err;
   GPid child_pid;
   int child_stdin, child_stdout;
@@ -89 +76 @@
   }
 
-  err = send_receive(child_stdout, child_stdin, in, out);
-  if (err == 0) {
-    waitpid(child_pid, status, 0);
-  }
-  return err;
+  if (in == NULL) in = "";
+  GMainContext *context = g_main_context_new();
+  struct filter_data data = {&in, in + strlen(in), g_string_new(""), g_main_loop_new(context, FALSE), 0};
+
+  GIOChannel *channel = g_io_channel_unix_new(child_stdin);
+  g_io_channel_set_encoding(channel, NULL, NULL);
+  g_io_channel_set_flags(channel, g_io_channel_get_flags(channel) | G_IO_FLAG_NONBLOCK, NULL);
+  GSource *source = g_io_create_watch(channel, G_IO_OUT | G_IO_ERR | G_IO_HUP);
+  g_io_channel_unref(channel);
+  g_source_set_callback(source, (GSourceFunc)filter_stdin, &data, NULL);
+  g_source_attach(source, context);
+  g_source_unref(source);
+
+  channel = g_io_channel_unix_new(child_stdout);
+  g_io_channel_set_encoding(channel, NULL, NULL);
+  g_io_channel_set_flags(channel, g_io_channel_get_flags(channel) | G_IO_FLAG_NONBLOCK, NULL);
+  source = g_io_create_watch(channel, G_IO_IN | G_IO_ERR | G_IO_HUP);
+  g_io_channel_unref(channel);
+  g_source_set_callback(source, (GSourceFunc)filter_stdout, &data, NULL);
+  g_source_attach(source, context);
+  g_source_unref(source);
+
+  g_main_loop_run(data.loop);
+
+  g_main_loop_unref(data.loop);
+  g_main_context_unref(context);
+
+  waitpid(child_pid, status, 0);
+  g_spawn_close_pid(child_pid);
+  *out = g_string_free(data.out_str, data.err);
+  return data.err;
 }

functions.c

@@ -196 +196 @@
   owl_message *m;
 
-  m=g_new(owl_message, 1);
+  m=g_slice_new(owl_message);
   owl_message_create_admin(m, header, body);
   
@@ -218 +218 @@
   if (z->cc && owl_zwrite_is_personal(z)) {
     /* create the message */
-    owl_message *m = g_new(owl_message, 1);
+    owl_message *m = g_slice_new(owl_message);
     owl_message_create_from_zwrite(m, z, owl_zwrite_get_message(z), 0);
 
@@ -231 +231 @@
 
       /* create the message */
-      m = g_new(owl_message, 1);
+      m = g_slice_new(owl_message);
       owl_message_create_from_zwrite(m, z, owl_zwrite_get_message(z), i);
 
@@ -251 +251 @@
   if (!owl_global_is_aimloggedin(&g)) return(NULL);
   
-  m=g_new(owl_message, 1);
+  m=g_slice_new(owl_message);
   owl_message_create_aim(m,
                          owl_global_get_aim_screenname(&g),
@@ -270 +270 @@
 
   /* create the message */
-  m=g_new(owl_message, 1);
+  m=g_slice_new(owl_message);
   owl_message_create_loopback(m, body);
   owl_message_set_direction_out(m);
@@ -516 +516 @@
   /* create a message and put it on the message queue.  This simulates
    * an incoming message */
-  min=g_new(owl_message, 1);
+  min=g_slice_new(owl_message);
   mout=owl_function_make_outgoing_loopback(msg);
 
@@ -1227 +1227 @@
   time_t now;
   va_list ap;
-  va_start(ap, fmt);
 
   if (!owl_global_is_debug_fast(&g))
@@ -1242 +1241 @@
           (int) getpid(), tmpbuff, now - owl_global_get_starttime(&g));
   g_free(tmpbuff);
+
+  va_start(ap, fmt);
   vfprintf(file, fmt, ap);
+  va_end(ap);
+
   putc('\n', file);
   fflush(file);
-
-  va_end(ap);
 }
 
@@ -1472 +1473 @@
         owl_fmtext_append_normal(&fm, "\n");
         owl_fmtext_appendf_normal(&fm, "  Port      : %i\n", ntohs(n->z_port));
+        owl_fmtext_appendf_normal(&fm, "  Charset   : %s\n", owl_zephyr_get_charsetstr(n));
         owl_fmtext_appendf_normal(&fm, "  Auth      : %s\n", owl_zephyr_get_authstr(n));
 
@@ -3481 +3483 @@
   while (zaldptr) {
     ZFreeALD(zaldptr->data);
-    g_free(zaldptr->data);
+    g_slice_free(ZAsyncLocateData_t, zaldptr->data);
     zaldptr = g_list_next(zaldptr);
   }
@@ -3491 +3493 @@
     for (i = 0; i < anyone->len; i++) {
       user = anyone->pdata[i];
-      zald = g_new(ZAsyncLocateData_t, 1);
+      zald = g_slice_new(ZAsyncLocateData_t);
       if (ZRequestLocations(zstr(user), zald, UNACKED, ZAUTH) == ZERR_NONE) {
         *zaldlist = g_list_append(*zaldlist, zald);
       } else {
-        g_free(zald);
+        g_slice_free(ZAsyncLocateData_t, zald);
       }
     }

global.c

@@ -553 +553 @@
   e->g->filterlist = g_list_remove(e->g->filterlist, e->f);
   owl_filter_delete(e->f);
-  g_free(e);
+  g_slice_free(owl_global_filter_ent, e);
 }
 
 void owl_global_add_filter(owl_global *g, owl_filter *f) {
-  owl_global_filter_ent *e = g_new(owl_global_filter_ent, 1);
+  owl_global_filter_ent *e = g_slice_new(owl_global_filter_ent);
   e->g = g;
   e->f = f;

keybinding.c

@@ -14 +14 @@
 CALLER_OWN owl_keybinding *owl_keybinding_new(const char *keyseq, const char *command, void (*function_fn)(void), const char *desc)
 {
-  owl_keybinding *kb = g_new(owl_keybinding, 1);
+  owl_keybinding *kb = g_slice_new(owl_keybinding);
 
   owl_function_debugmsg("owl_keybinding_init: creating binding for <%s> with desc: <%s>", keyseq, desc);
   if (command && function_fn) {
-    g_free(kb);
+    g_slice_free(owl_keybinding, kb);
     return NULL;
   } else if (command && !function_fn) {
@@ -29 +29 @@
 
   if (owl_keybinding_make_keys(kb, keyseq) != 0) {
-    g_free(kb);
+    g_slice_free(owl_keybinding, kb);
     return NULL;
   }
@@ -70 +70 @@
   g_free(kb->desc);
   g_free(kb->command);
-  g_free(kb);
+  g_slice_free(owl_keybinding, kb);
 }
 

keymap.c

@@ -189 +189 @@
 {
   owl_keymap *km;
-  km = g_new(owl_keymap, 1);
+  km = g_slice_new(owl_keymap);
   owl_keymap_init(km, name, desc, default_fn, prealways_fn, postalways_fn);
   owl_keyhandler_add_keymap(kh, km);

logging.c

@@ -177 +177 @@
     g_free(msg->message);
     g_free(msg->filename);
-    g_free(msg);
+    g_slice_free(owl_log_entry, msg);
   }
 }
@@ -184 +184 @@
 {
   owl_log_entry *log_msg = NULL; 
-  log_msg = g_new(owl_log_entry,1);
+  log_msg = g_slice_new(owl_log_entry);
   log_msg->message = g_strdup(buffer);
   log_msg->filename = g_strdup(filename);
@@ -266 +266 @@
    * owl_log_shouldlog_message(void)
    */
-  m = g_new(owl_message, 1);
+  m = g_slice_new(owl_message);
   /* recip_index = 0 because there can only be one recipient anyway */
   owl_message_create_from_zwrite(m, zw, text, 0);

mainwin.c

@@ -6 +6 @@
 CALLER_OWN owl_mainwin *owl_mainwin_new(owl_window *window)
 {
-  owl_mainwin *mw = g_new(owl_mainwin, 1);
+  owl_mainwin *mw = g_slice_new(owl_mainwin);
   mw->curtruncated=0;
   mw->lastdisplayed=-1;

message.c

@@ -70 +70 @@
 
   if(pair ==  NULL) {
-    pair = g_new(owl_pair, 1);
+    pair = g_slice_new(owl_pair);
     owl_pair_create(pair, attrname, NULL);
     g_ptr_array_add(m->attributes, pair);
@@ -1019 +1019 @@
     p = m->attributes->pdata[i];
     g_free(owl_pair_get_value(p));
-    g_free(p);
+    g_slice_free(owl_pair, p);
   }
 
@@ -1030 +1030 @@
 {
   owl_message_cleanup(m);
-  g_free(m);
-}
+  g_slice_free(owl_message, m);
+}

messagelist.c

@@ -3 +3 @@
 CALLER_OWN owl_messagelist *owl_messagelist_new(void)
 {
-  owl_messagelist *ml = g_new(owl_messagelist, 1);
+  owl_messagelist *ml = g_slice_new(owl_messagelist);
   ml->list = g_ptr_array_new();
   return ml;
@@ -13 +13 @@
     g_ptr_array_foreach(ml->list, (GFunc)owl_message_delete, NULL);
   g_ptr_array_free(ml->list, true);
-  g_free(ml);
+  g_slice_free(owl_messagelist, ml);
 }
 

perl/lib/BarnOwl/Style/Default.pm

@@ -129 +129 @@
     my $self = shift;
     my $m = shift;
-    my $sender = $m->long_sender;
-    $sender =~ s/\n.*$//s;
+    my $sender = $self->humanize($m->long_sender, 1);
     if (BarnOwl::getvar('colorztext') eq 'on') {
       return "  (" . $sender . '@color[default]' . ")";

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

@@ -562 +562 @@
                                "[" . $conn->alias . "] Reconnect cancelled");
         $conn->cancel_reconnect;
+        delete $ircnets{$conn->alias};
+    } elsif (exists $ircnets{$conn->alias}) { # inconsistent state; no socket, but not yet deleted
+        BarnOwl::admin_message('IRC',
+                               "[" . $conn->alias . "] Attempt to disconnect from a socketless connection; deleting it");
         delete $ircnets{$conn->alias};
     }

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

@@ -437 +437 @@
 }
 
+sub rejoin_channels {
+    my $self = shift;
+    my @channels = @_;
+    # As reported in https://barnowl.mit.edu/ticket/274, if we reconnect to
+    # too many at once, the server rejects us.  Empirically, this is about
+    # 20-26, so we set the cap at 15, then delay further joins for 5 seconds.
+    my $MAX_RECONNECT_CHANNELS = 15;
+    my $DELAY = 5;
+    foreach my $c (@channels[ 0 .. $MAX_RECONNECT_CHANNELS ]) {
+        $self->conn->send_msg(join => $c);
+    }
+    if ($MAX_RECONNECT_CHANNELS < $#channels) {
+        my $remaining = $#channels - $MAX_RECONNECT_CHANNELS;
+        my $cur_alias = $self->alias;
+        BarnOwl::admin_message('IRC', "[$cur_alias] Delaying $remaining autorejoins for $DELAY seconds");
+        # if we don't assign the timer to anything, then it gets garbage
+        # collected, and never runs
+        $self->{autoconnect_channels_delay_timer} = BarnOwl::Timer->new({
+            name  => "IRC rejoin overflow timer ($remaining remaining)",
+            after => $DELAY,
+            cb    => sub {
+                rejoin_channels($self, @channels[ $MAX_RECONNECT_CHANNELS .. $#channels ]);
+            }
+        });
+    }
+}
+
+
 sub connected {
     my $self = shift;
@@ -443 +471 @@
     $self->cancel_reconnect;
     if ($self->autoconnect_channels) {
-        for my $c (@{$self->autoconnect_channels}) {
-            $self->conn->send_msg(join => $c);
-        }
+        rejoin_channels($self, @{$self->autoconnect_channels});
     }
     $self->conn->enable_ping(60, sub {

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

@@ -1313 +1313 @@
     {
         my @answer = $packet->answer;
-        return $answer[0]{target}, $answer[0]{port};
+        return $answer[0]->target, $answer[0]->port if @answer;
     }
 

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

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

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

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

perlconfig.c

@@ -188 +188 @@
   hash = (HV*)SvRV(msg);
 
-  m = g_new(owl_message, 1);
+  m = g_slice_new(owl_message);
   owl_message_init(m);
 

perlglue.xs

@@ -232 +232 @@
      CODE:
         {
-                s = g_new(owl_style, 1);
+                s = g_slice_new(owl_style);
                 owl_style_create_perl(s, name, newSVsv(object));
                 owl_global_add_style(&g, s);

popexec.c

@@ -23 +23 @@
   }
 
-  pe = g_new(owl_popexec, 1);
+  pe = g_slice_new(owl_popexec);
   pe->winactive=0;
   pe->pid=0;
@@ -179 +179 @@
   if (pe->refcount<=0) {
     owl_function_debugmsg("doing free of %p", pe);
-    g_free(pe);
+    g_slice_free(owl_popexec, pe);
   }
 }

popwin.c

@@ -3 +3 @@
 CALLER_OWN owl_popwin *owl_popwin_new(void)
 {
-  owl_popwin *pw = g_new0(owl_popwin, 1);
+  owl_popwin *pw = g_slice_new0(owl_popwin);
 
   pw->border = owl_window_new(NULL);
@@ -92 +92 @@
   g_object_unref(pw->content);
 
-  g_free(pw);
+  g_slice_free(owl_popwin, pw);
 }
 

runtests.sh

@@ -1 +1 @@
 #!/bin/sh
+export G_SLICE=debug-blocks
 exec env HARNESS_PERL=./tester prove --failures "${srcdir:=$(dirname "$0")}/t/"

scripts/do-release

@@ -1 @@
-#!/bin/sh -e
+#!/bin/bash
+set -eu
 
 die() {
@@ -55 +56 @@
 fi
 
+[ -e Makefile.in ] || autoreconf -fvi
+[ -e config.status ] || ./configure
+make -j4 distcheck VERSION="$VERS"
+
+echo 'Checking distributed files against Git:'
+if comm -3 <(tar -tzf "$TAG.tar.gz" | grep -v '/$' | sed "s%^$TAG/%%" | sort) \
+    <(git ls-files | sort) | grep -vxf scripts/dist-ignore; then
+    echo
+    echo 'Error: Please fix Makefile.am and/or scripts/dist-ignore.'
+    exit 1
+fi
+echo 'ok'
+
+mv "$TAG.tar.gz" "$TGZ.tgz"
+
 if ! [ "$no_tag" ]; then
     if git cat-file -t "$TAG" > /dev/null 2>&1; then
@@ -65 +81 @@
 fi
 
-exittrap() { :; }
-for sig in 1 2 13 15; do trap "exit $(($sig + 128))" $sig; done
-trap 'exittrap' EXIT
-
-TMPDIR=$(mktemp -d /tmp/barnowl.XXXXXX)
-
-exittrap() { rm -rf "$TMPDIR"; }
-
-git archive --format=tar --prefix="$TGZ/" "$TAG" | tar -x -C "$TMPDIR"
-
-CODIR=$(pwd)
-cd "$TMPDIR/$TGZ"
-[ "$git" ] && perl -i -pe 's{^(AC_INIT\(\[[^\]]+\],\s*)\[([^\]]+)\]}{${1}['$VERS']}' configure.ac
-autoreconf -fvi
-rm -r autom4te.cache/
-cd "$TMPDIR"
-tar czvf "$TGZ.tgz" "$TGZ"
-cd "$CODIR"
-
-mv "$TMPDIR/$TGZ.tgz" .
-rm -rf "$TMPDIR"
-
-exittrap() { :; }
-
-echo "Created release tarball for BarnOwl $VERS in $(pwd)"
+echo "Created release tarball for BarnOwl $VERS at $(pwd)/$TGZ.tgz"
 echo "Remember to bump OWL_VERSION_STRING for future development."
 

select.c

@@ -41 +41 @@
   if (t->destroy_cbdata)
     t->destroy_cbdata(t->cbdata);
-  g_free(t);
+  g_slice_free(owl_task, t);
 }
 
@@ -47 +47 @@
 {
   GSource *source = g_idle_source_new();
-  owl_task *t = g_new0(owl_task, 1);
+  owl_task *t = g_slice_new0(owl_task);
   t->cb = cb;
   t->cbdata = cbdata;

style.c

@@ -103 +103 @@
 {
   owl_style_cleanup(s);
-  g_free(s);
+  g_slice_free(owl_style, s);
 }

tester.c

@@ -25 +25 @@
 int owl_history_regtest(void);
 int call_filter_regtest(void);
+int owl_smartstrip_regtest(void);
 
 extern void owl_perl_xs_init(pTHX);
@@ -116 +117 @@
   numfailures += owl_history_regtest();
   numfailures += call_filter_regtest();
+  numfailures += owl_smartstrip_regtest();
   if (numfailures) {
       fprintf(stderr, "# *** WARNING: %d failures total\n", numfailures);
@@ -1018 +1020 @@
   return numfailed;
 }
+
+int owl_smartstrip_regtest(void)
+{
+  int numfailed = 0;
+
+  printf("# BEGIN testing owl_zephyr_smartstripped_user\n");
+
+#define CHECK_SMARTSTRIP(in, expected)                  \
+  do {                                                  \
+    char *__value = owl_zephyr_smartstripped_user(in);  \
+    FAIL_UNLESS("owl_zephyr_smartstripped_user " in,    \
+                strcmp((expected), __value) == 0);      \
+    g_free(__value);                                    \
+  } while (0)
+
+  CHECK_SMARTSTRIP("foo", "foo");
+  CHECK_SMARTSTRIP("foo.bar", "foo");
+  CHECK_SMARTSTRIP("foo/bar", "foo");
+  CHECK_SMARTSTRIP("host/bar", "host/bar");
+  CHECK_SMARTSTRIP("rcmd.bar", "rcmd.bar");
+  CHECK_SMARTSTRIP("daemon/bar", "daemon/bar");
+  CHECK_SMARTSTRIP("daemon.bar", "daemon.bar");
+
+  CHECK_SMARTSTRIP("foo@ATHENA.MIT.EDU", "foo@ATHENA.MIT.EDU");
+  CHECK_SMARTSTRIP("foo.bar@ATHENA.MIT.EDU", "foo@ATHENA.MIT.EDU");
+  CHECK_SMARTSTRIP("foo/bar@ATHENA.MIT.EDU", "foo@ATHENA.MIT.EDU");
+  CHECK_SMARTSTRIP("host/bar@ATHENA.MIT.EDU", "host/bar@ATHENA.MIT.EDU");
+  CHECK_SMARTSTRIP("rcmd.bar@ATHENA.MIT.EDU", "rcmd.bar@ATHENA.MIT.EDU");
+  CHECK_SMARTSTRIP("daemon/bar@ATHENA.MIT.EDU", "daemon/bar@ATHENA.MIT.EDU");
+  CHECK_SMARTSTRIP("daemon.bar@ATHENA.MIT.EDU", "daemon.bar@ATHENA.MIT.EDU");
+
+  printf("# END testing owl_zephyr_smartstripped_user\n");
+
+  return numfailed;
+}

util.c

@@ -468 +468 @@
   if (fstat(fileno(old), &st) != 0) {
     owl_function_error("Cannot stat %s: %s", filename, strerror(errno));
+    fclose(old);
     return -1;
   }
@@ -473 +474 @@
   /* resolve symlinks, because link() fails on symlinks, at least on AFS */
   actual_filename = owl_util_recursive_resolve_link(filename);
-  if (actual_filename == NULL)
+  if (actual_filename == NULL) {
+    fclose(old);
     return -1; /* resolving the symlink failed, but we already logged this error */
+  }
 
   newfile = g_strdup_printf("%s.new", actual_filename);

variable.c

@@ -627 +627 @@
 
 static owl_variable *owl_variable_newvar(int type, const char *name, const char *summary, const char *description, const char *validsettings) {
-  owl_variable *var = g_new0(owl_variable, 1);
+  owl_variable *var = g_slice_new0(owl_variable);
   var->type = type;
   var->name = g_strdup(name);
@@ -793 +793 @@
   g_closure_unref(v->set_fromstring_fn);
 
-  g_free(v);
+  g_slice_free(owl_variable, v);
 }
 
@@ -1038 +1038 @@
 CALLER_OWN char *owl_variable_bool_get_tostring_default(const owl_variable *v, void *dummy)
 {
-  bool val = owl_variable_get_bool(v);
-  if (val == 0) {
-    return g_strdup("off");
-  } else if (val == 1) {
-    return g_strdup("on");
-  } else {
-    return g_strdup("<invalid>");
-  }
+  return g_strdup(owl_variable_get_bool(v) ? "on" : "off");
 }
 

viewwin.c

@@ -13 +13 @@
 CALLER_OWN owl_viewwin *owl_viewwin_new_text(owl_window *win, const char *text)
 {
-  owl_viewwin *v = g_new0(owl_viewwin, 1);
+  owl_viewwin *v = g_slice_new0(owl_viewwin);
   owl_fmtext_init_null(&(v->fmtext));
   if (text) {
@@ -36 +36 @@
 {
   char *text;
-  owl_viewwin *v = g_new0(owl_viewwin, 1);
+  owl_viewwin *v = g_slice_new0(owl_viewwin);
 
   owl_fmtext_copy(&(v->fmtext), fmtext);
@@ -424 +424 @@
   g_object_unref(v->status);
   owl_fmtext_cleanup(&(v->fmtext));
-  g_free(v);
-}
+  g_slice_free(owl_viewwin, v);
+}

zephyr.c

@@ -125 +125 @@
     owl_zephyr_loadsubs_helper(subs->subs, subs->nsubs);
     deferred_subs = g_list_delete_link(deferred_subs, deferred_subs);
-    g_free(subs);
+    g_slice_free(owl_sub_list, subs);
   }
 
@@ -261 +261 @@
     g_free(subs);
   } else {
-    owl_sub_list *s = g_new(owl_sub_list, 1);
+    owl_sub_list *s = g_slice_new(owl_sub_list);
     s->subs = subs;
     s->nsubs = count;
@@ -283 +283 @@
 #ifdef HAVE_LIBZEPHYR
   FILE *file;
+  int fopen_errno;
   char *tmp, *start;
   char *buffer = NULL;
@@ -289 +290 @@
   int subSize = 1024;
   int count;
-  struct stat statbuff;
 
   subsfile = owl_zephyr_dotfile(".zephyr.subs", filename);
 
-  if (stat(subsfile, &statbuff) != 0) {
-    g_free(subsfile);
-    if (error_on_nofile == 1)
+  count = 0;
+  file = fopen(subsfile, "r");
+  fopen_errno = errno;
+  g_free(subsfile);
+  if (!file) {
+    if (error_on_nofile == 1 || fopen_errno != ENOENT)
       return -1;
     return 0;
   }
-
-  ZResetAuthentication();
-  count = 0;
-  file = fopen(subsfile, "r");
-  g_free(subsfile);
-  if (!file)
-    return -1;
 
   subs = g_new(ZSubscription_t, subSize);
@@ -348 +344 @@
     g_free(buffer);
 
+  ZResetAuthentication();
   return owl_zephyr_loadsubs_helper(subs, count);
 #else
@@ -412 +409 @@
   char *buffer = NULL;
   int count;
-  struct stat statbuff;
 
   subs = g_new(ZSubscription_t, numSubs);
   subsfile = owl_zephyr_dotfile(".anyone", filename);
 
-  if (stat(subsfile, &statbuff) == -1) {
-    g_free(subs);
-    g_free(subsfile);
-    return 0;
-  }
-
-  ZResetAuthentication();
   count = 0;
   file = fopen(subsfile, "r");
@@ -445 +434 @@
     fclose(file);
   } else {
+    g_free(subs);
     return 0;
   }
   g_free(buffer);
 
+  ZResetAuthentication();
   return owl_zephyr_loadsubs_helper(subs, count);
 #else
@@ -1106 +1097 @@
 }
 
+#ifdef HAVE_LIBZEPHYR
+const char *owl_zephyr_get_charsetstr(const ZNotice_t *n)
+{
+#ifdef ZCHARSET_UTF_8
+  return ZCharsetToString(n->z_charset);
+#else
+  return "";
+#endif
+}
+#else
+const char *owl_zephyr_get_charsetstr(const void *n)
+{
+  return "";
+}
+#endif
+
 /* return auth string */
 #ifdef HAVE_LIBZEPHYR
@@ -1303 +1310 @@
 CALLER_OWN char *owl_zephyr_smartstripped_user(const char *in)
 {
-  char *slash, *dot, *realm, *out;
-
-  out = g_strdup(in);
-
-  /* bail immeaditly if we don't have to do any work */
-  slash = strchr(out, '/');
-  dot = strchr(out, '.');
-  if (!slash && !dot) {
-    return(out);
-  }
-
-  if (!strncasecmp(out, OWL_ZEPHYR_NOSTRIP_HOST, strlen(OWL_ZEPHYR_NOSTRIP_HOST)) ||
-      !strncasecmp(out, OWL_ZEPHYR_NOSTRIP_RCMD, strlen(OWL_ZEPHYR_NOSTRIP_RCMD)) ||
-      !strncasecmp(out, OWL_ZEPHYR_NOSTRIP_DAEMON5, strlen(OWL_ZEPHYR_NOSTRIP_DAEMON5)) ||
-      !strncasecmp(out, OWL_ZEPHYR_NOSTRIP_DAEMON4, strlen(OWL_ZEPHYR_NOSTRIP_DAEMON4))) {
-    return(out);
-  }
-
-  realm = strchr(out, '@');
-  if (!slash && dot && realm && (dot > realm)) {
-    /* There's no '/', and the first '.' is in the realm */
-    return(out);
-  }
-
-  /* remove the realm from out, but hold on to it */
-  if (realm) realm[0]='\0';
-
-  /* strip */
-  if (slash) slash[0] = '\0';  /* krb5 style user/instance */
-  else if (dot) dot[0] = '\0'; /* krb4 style user.instance */
-
-  /* reattach the realm if we had one */
-  if (realm) {
-    strcat(out, "@");
-    strcat(out, realm+1);
-  }
-
-  return(out);
+  int n = strcspn(in, "./");
+  const char *realm = strchr(in, '@');
+  if (realm == NULL)
+    realm = in + strlen(in);
+
+  if (in + n >= realm ||
+      g_str_has_prefix(in, OWL_ZEPHYR_NOSTRIP_HOST) ||
+      g_str_has_prefix(in, OWL_ZEPHYR_NOSTRIP_RCMD) ||
+      g_str_has_prefix(in, OWL_ZEPHYR_NOSTRIP_DAEMON5) ||
+      g_str_has_prefix(in, OWL_ZEPHYR_NOSTRIP_DAEMON4))
+    return g_strdup(in);
+  else
+    return g_strdup_printf("%.*s%s", n, in, realm);
 }
 
@@ -1424 +1406 @@
           if (ret == ZERR_NONE) {
             /* Send a PSEUDO LOGIN! */
-            m = g_new(owl_message, 1);
+            m = g_slice_new(owl_message);
             owl_message_create_pseudo_zlogin(m, 0, zald->user,
                                              location.host,
@@ -1437 +1419 @@
         /* Send a PSEUDO LOGOUT! */
         if (notify) {
-          m = g_new(owl_message, 1);
+          m = g_slice_new(owl_message);
           owl_message_create_pseudo_zlogin(m, 1, zald->user, "", "", "");
           owl_global_messagequeue_addmsg(&g, m);
@@ -1446 +1428 @@
     }
     ZFreeALD(zald);
-    g_free(zald);
+    g_slice_free(ZAsyncLocateData_t, zald);
   }
 }
@@ -1513 +1495 @@
 
       /* create the new message */
-      m=g_new(owl_message, 1);
+      m=g_slice_new(owl_message);
       owl_message_create_from_znotice(m, &notice);
 

zwrite.c

@@ -3 +3 @@
 CALLER_OWN owl_zwrite *owl_zwrite_new_from_line(const char *line)
 {
-  owl_zwrite *z = g_new(owl_zwrite, 1);
+  owl_zwrite *z = g_slice_new(owl_zwrite);
   if (owl_zwrite_create_from_line(z, line) != 0) {
-    g_free(z);
+    g_slice_free(owl_zwrite, z);
     return NULL;
   }
@@ -13 +13 @@
 CALLER_OWN owl_zwrite *owl_zwrite_new(int argc, const char *const *argv)
 {
-  owl_zwrite *z = g_new(owl_zwrite, 1);
+  owl_zwrite *z = g_slice_new(owl_zwrite);
   if (owl_zwrite_create(z, argc, argv) != 0) {
-    g_free(z);
+    g_slice_free(owl_zwrite, z);
     return NULL;
   }
@@ -356 +356 @@
 {
   owl_zwrite_cleanup(z);
-  g_free(z);
+  g_slice_free(owl_zwrite, z);
 }