Changeset 7e9fa84

Timestamp:

Jul 24, 2011, 2:26:09 PM (13 years ago)

Author:

GitHub Merge Button <merge-button@github.com>

Parents:

3234121 (diff), 14c15d9 (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 14c15d942910b33590fc67229a029540a97eb9ac into 323412185513364eaef94cf3f6cbb70957d93c5f

Files:

• fmtext.c (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• aim.c (modified) (2 diffs)
• cmd.c (modified) (2 diffs)
• commands.c (modified) (1 diff)
• configure.ac (modified) (1 diff)
• editwin.c (modified) (3 diffs)
• functions.c (modified) (15 diffs)
• message.c (modified) (3 diffs)
• owl.c (modified) (2 diffs)
• owl.h (modified) (2 diffs)
• perl/modules/Twitter/lib/BarnOwl/Module/Twitter/Handle.pm (modified) (2 diffs)
• regex.c (modified) (2 diffs)
• signal.c (modified) (3 diffs)
• style.c (modified) (1 diff)
• text.c (modified) (1 diff)
• util.c (modified) (1 diff)
• variable.c (modified) (1 diff)

fmtext.c

@@ -186 +186 @@
 static void _owl_fmtext_wcolor_set(WINDOW *w, short pair)
 {
+  cchar_t background;
+  wchar_t blank[2];
   if (has_colors()) {
-      wcolor_set(w,pair,NULL);
-      wbkgdset(w, COLOR_PAIR(pair));
+      wcolor_set(w, pair, NULL);
+      /* Set the background with wbkgrndset so that we can handle color-pairs
+       * past 256 on ncurses ABI 6 and later. */
+      blank[0] = ' ';
+      blank[1] = 0;
+      setcchar(&background, blank, 0, pair, NULL);
+      wbkgrndset(w, &background);
   }
 }

ChangeLog

@@ +1 @@
+1.8
+ * Compute the home directory in zcrypt consistently with BarnOwl -davidben@mit.edu
+ * Make help show the correct keybinding for A -jgross@mit.edu
+ * Add a delete-and-expunge command. -jgross@mit.edu
+ * Fix a bug in the expunge command -jgross@mit.edu
+ * Replace 'Owl' with 'BarnOwl' in user visible places -jgross@mit.edu
+ * Allow zsigs to be '0' -jgross@mit.edu
+ * Reformat the man page to look more like others -davidben@mit.edu
+ * Consistently use BarnOwl or barnowl -davidben@mit.edu
+ * Update autoconf macros -andersk@mit.edu
+ * history: Do not deduplicate a partial entry -andersk@mit.edu
+ * Drop show timers feature -davidben@mit.edu
+ * Add new dependencies, AnyEvent and perl-Glib -davidben@mit.edu
+ * Bump required glib version to 2.16 -davidben@mit.edu
+ * Don't leak timestr when setting time in a perl message -asedeno@mit.edu
+ * Build with -Wwrite-strings -andersk@mit.edu
+ * Build with C99 -davidben@mit.edu
+ * Jabber: Handle nicks with leading dashes (e.g. Facebook XMPP) -ezyang@mit.edu
+ * Move log-writing onto a background thread. -adam@crossproduct.net
+ * Remove the length limit on field values in :info -jgross@mit.edu
+ * Show how far you are in a long message -jgross@mit.edu
+ * stderr_redirect_handler: Handle partial or failed reads -andersk@mit.edu
+ * Inform the user when an unpunt command does nothing -davidben@mit.edu
+ * Replace custom event loop with GLib's GMainLoop -davidben@mit.edu
+ * Encode glib version requirements in pkg-config check -asedeno@mit.edu
+ * Fix color pair usage on ncurses builds without ext-color -davidben@mit.edu
+ * IRC: Fix reconnect behavior. -nelhage@mit.edu
+ * IRC: Make nick-change events LOGIN messages instead of ADMIN. -nelhage@mit.edu
+ * IRC: Port module to AnyEvent::IRC. -asedeno@mit.edu, nelhage@nelhage.com
+ * Ability to set exposure arbitrarily (like "zctl set exposure") -jgross@mit.edu
+ * Kill --remove-debug option -davidben@mit.edu
+ * exec: Fix input redirection of multistatement commands -andersk@mit.edu
+ * Correctly set the realm in outgoing zwrite errors -davidben@mit.edu
+ * Correctly compute the realm for outgoing messages -davidben@mit.edu
+ * In duplicated outgoing zephyrs only reply on the relevant recipient -davidben@mit.edu
+ * Create per-recipient copies of outgoing messages for non-CC'd personals -liudi@mit.edu
+ * Add black to :show colors -andersk@mit.edu
+ * Fix reporting of errors from libzephyr -kcr@1ts.org
+ * Load Encode module for IRC. -timhill@alum.mit.edu
+ * IRC: Sort the output of :irc-names -nelhage@mit.edu
+ * Prepend "UNAUTH: " to displayed sender for unauthenticated zephyrs -adam@crossproduct.net
+ * For ‘punt’ with one argument, quote the filter name -andersk@mit.edu
+ * Fix spurious error running ‘punt’ with no arguments -andersk@mit.edu
+ * Only handle CCs in messages sent directly to you. -davidben@mit.edu
+ * Update copyright notices for 2011 -davidben@mit.edu
+ * If a smartfilter fails to parse, handle the error -davidben@mit.edu
+ * Replace per-editwin killbuf with a global one. -adam@crossproduct.net
+ * Don't use error_message if we are building without Zephyr. -nelhage@mit.edu
+ * Fix replying to outgoing zwrite when -m is passed -davidben@mit.edu
+ * Fix a number of quoting bugs -davidben@mit.edu
+ * Check passwd entries to determine home dir -davidben@mit.edu
+
+1.7.1
+ * Append sender's realm to CC'd unqualified names when replying. -adam@crossproduct.net
+ * Don't reset ncurses colorpairs in the middle of drawing. -davidben@mit.edu
+ * Fix viewuser when an unqualified name is given. -davidben@mit.edu
+
 1.7
+ * Fix quoting bugs in smartfilter, zpunt, and numerous other commands. -davidben@mit.edu
  * Download Twitter consumer keys from barnowl.mit.edu. -nelhage@MIT.EDU
  * Fix unsub when .zephyr.subs is a symlink. -jgross@MIT.EDU

aim.c

@@ -1064 +1064 @@
   g_free(wrapmsg);
   g_free(nz_screenname);
+  g_free(realmsg);
 
   return(1);
 
-  owl_function_debugmsg("faimtest_parse_incoming_im_chan1: icbm: message: %s\n", realmsg);
-  
-  if (args->icbmflags & AIM_IMFLAGS_MULTIPART) {
-    aim_mpmsg_section_t *sec;
-    int z;
-
-    owl_function_debugmsg("faimtest_parse_incoming_im_chan1: icbm: multipart: this message has %d parts\n", args->mpmsg.numparts);
-    
-    for (sec = args->mpmsg.parts, z = 0; sec; sec = sec->next, z++) {
-      if ((sec->charset == 0x0000) || (sec->charset == 0x0003) || (sec->charset == 0xffff)) {
-        owl_function_debugmsg("faimtest_parse_incoming_im_chan1: icbm: multipart:   part %d: charset 0x%04x, subset 0x%04x, msg = %s\n", z, sec->charset, sec->charsubset, sec->data);
-      } else {
-        owl_function_debugmsg("faimtest_parse_incoming_im_chan1: icbm: multipart:   part %d: charset 0x%04x, subset 0x%04x, binary or UNICODE data\n", z, sec->charset, sec->charsubset);
-      }
-    }
-  }
-  
-  if (args->icbmflags & AIM_IMFLAGS_HASICON) {
-    /* aim_send_im(sess, userinfo->sn, AIM_IMFLAGS_BUDDYREQ, "You have an icon"); */
-    owl_function_debugmsg("faimtest_parse_incoming_im_chan1: icbm: their icon: iconstamp = %ld, iconlen = 0x%08x, iconsum = 0x%04x\n", args->iconstamp, args->iconlen, args->iconsum);
-  }
-
-  g_free(realmsg);
-
-  return(1);
+  /* TODO: Multipart? See history from before 1.8 release. */
 }
 
@@ -1852 +1829 @@
       fd = event_source->fds->pdata[i];
       fd->fd = cur->fd;
-      fd->events |= G_IO_IN | G_IO_HUP | G_IO_ERR;
+      fd->events = G_IO_IN | G_IO_HUP | G_IO_ERR;
       if (cur->status & AIM_CONN_STATUS_INPROGRESS) {
-        /* Yes, we're checking writable sockets here. Without it, AIM
-           login is really slow. */
+        /* AIM login requires checking writable sockets. See aim_select. */
         fd->events |= G_IO_OUT;
       }

cmd.c

@@ -260 +260 @@
   if (cmd->usage && *cmd->usage) {
     s = cmd->usage;
-    indent = owl_text_indent(s, OWL_TAB);
+    indent = owl_text_indent(s, OWL_TAB, true);
     owl_fmtext_append_bold(fm, "\nSYNOPSIS\n");
     owl_fmtext_append_normal(fm, indent);
@@ -274 +274 @@
   if (cmd->description && *cmd->description) {
     s = cmd->description;
-    indent = owl_text_indent(s, OWL_TAB);
+    indent = owl_text_indent(s, OWL_TAB, true);
     owl_fmtext_append_bold(fm, "\nDESCRIPTION\n");
     owl_fmtext_append_normal(fm, indent);

commands.c

@@ -2165 +2165 @@
       myargv[i]=argv[i];
     }
-    owl_function_create_filter(argc, myargv);
-    owl_function_change_currentview_filter("owl-dynamic");
+    if (owl_function_create_filter(argc, myargv)) {
+      owl_function_change_currentview_filter("owl-dynamic");
+    }
     g_free(myargv);
     return NULL;

configure.ac

@@ -1 +1 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([BarnOwl],[1.8dev],[bug-barnowl@mit.edu])
+AC_INIT([BarnOwl],[1.9dev],[bug-barnowl@mit.edu])
 AM_INIT_AUTOMAKE([1.7.0 -Wall -Wno-portability foreign])
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])

editwin.c

@@ -1151 +1151 @@
 {
   oe_excursion x;
-  gunichar ch;
+  gunichar ch = 0;
+  gunichar last_ch;
   int sentence;
 
@@ -1184 +1185 @@
     }
 
+    last_ch = ch;
     ch = owl_editwin_get_char_at_point(e);
 
@@ -1201 +1203 @@
     }
 
-    if(ch == '.' || ch == '!' || ch == '?')
+    if (ch == '.' || ch == '!' || ch == '?' ||
+        (ch == '"' && (last_ch == '.' || last_ch == '!' || last_ch == '?')))
       sentence = 1;
     else

functions.c

@@ -1223 +1223 @@
 void G_GNUC_PRINTF(1, 2) owl_function_debugmsg(const char *fmt, ...)
 {
+  char *tmpbuff;
   FILE *file;
   time_t now;
@@ -1237 +1238 @@
   now = time(NULL);
 
-  fprintf(file, "[%d -  %.24s - %lds]: ",
-          (int) getpid(), ctime(&now), now - owl_global_get_starttime(&g));
+  tmpbuff = owl_util_time_to_timestr(localtime(&now));
+  fprintf(file, "[%d -  %s - %lds]: ",
+          (int) getpid(), tmpbuff, now - owl_global_get_starttime(&g));
+  g_free(tmpbuff);
   vfprintf(file, fmt, ap);
   putc('\n', file);
@@ -1430 +1433 @@
 #ifdef HAVE_LIBZEPHYR
     if (owl_message_is_direction_in(m)) {
-      char *tmpbuff;
+      char *tmpbuff, *tmpbuff2;
       int i, fields;
 
@@ -1476 +1479 @@
 
         for (i = 0; i < fields; i++) {
-          tmpbuff = owl_zephyr_get_field_as_utf8(n, i + 1);
-
-          g_strdelimit(tmpbuff, "\n", '~');
-          g_strdelimit(tmpbuff, "\r", '!');
-
-          owl_fmtext_appendf_normal(&fm, "  Field %i   : %s\n", i + 1, tmpbuff);
-          g_free(tmpbuff);
+          tmpbuff = owl_zephyr_get_field_as_utf8(n, i + 1);
+          tmpbuff2 = owl_text_indent(tmpbuff, 14, false);
+          owl_fmtext_appendf_normal(&fm, "  Field %i   : %s\n", i + 1, tmpbuff2);
+          g_free(tmpbuff2);
+          g_free(tmpbuff);
         }
-        owl_fmtext_appendf_normal(&fm, "  Default Fm: %s\n", n->z_default_format);
+        tmpbuff = owl_text_indent(n->z_default_format, 14, false);
+        owl_fmtext_appendf_normal(&fm, "  Default Fm: %s\n", tmpbuff);
+        g_free(tmpbuff);
       }
 
@@ -1761 +1764 @@
 void owl_function_status(void)
 {
+  char *tmpbuff;
   char buff[MAXPATHLEN+1];
   time_t start;
@@ -1788 +1792 @@
   owl_fmtext_append_normal(&fm, "\n");
 
-  owl_fmtext_appendf_normal(&fm, "  Startup Time: %s", ctime(&start));
+  tmpbuff = owl_util_time_to_timestr(localtime(&start));
+  owl_fmtext_appendf_normal(&fm, "  Startup Time: %s\n", tmpbuff);
+  g_free(tmpbuff);
 
   up=owl_global_get_runtime(&g);
@@ -2126 +2132 @@
 
 /* Create a new filter, or replace an existing one
- * with a new definition.
+ * with a new definition. Returns true on success.
  */
-void owl_function_create_filter(int argc, const char *const *argv)
+bool owl_function_create_filter(int argc, const char *const *argv)
 {
   owl_filter *f;
@@ -2136 +2142 @@
   if (argc < 2) {
     owl_function_error("Wrong number of arguments to filter command");
-    return;
+    return false;
   }
 
@@ -2146 +2152 @@
   if (!strcmp(argv[1], "all")) {
     owl_function_error("You may not change the 'all' filter.");
-    return;
+    return false;
   }
 
@@ -2154 +2160 @@
     if (!f) {
       owl_function_error("The filter '%s' does not exist.", argv[1]);
-      return;
+      return false;
     }
     if (owl_util_string_to_color(argv[3])==OWL_COLOR_INVALID) {
       owl_function_error("The color '%s' is not available.", argv[3]);
-      return;
+      return false;
     }
     owl_filter_set_fgcolor(f, owl_util_string_to_color(argv[3]));
     owl_mainwin_redisplay(owl_global_get_mainwin(&g));
-    return;
+    return false;
   }
   if (argc==4 && !strcmp(argv[2], "-b")) {
@@ -2168 +2174 @@
     if (!f) {
       owl_function_error("The filter '%s' does not exist.", argv[1]);
-      return;
+      return false;
     }
     if (owl_util_string_to_color(argv[3])==OWL_COLOR_INVALID) {
       owl_function_error("The color '%s' is not available.", argv[3]);
-      return;
+      return false;
     }
     owl_filter_set_bgcolor(f, owl_util_string_to_color(argv[3]));
     owl_mainwin_redisplay(owl_global_get_mainwin(&g));
-    return;
+    return true;
   }
 
@@ -2183 +2189 @@
   if (f == NULL) {
     owl_function_error("Invalid filter");
-    return;
+    return false;
   }
 
@@ -2204 +2210 @@
   }
   owl_mainwin_redisplay(owl_global_get_mainwin(&g));
+  return true;
 }
 
@@ -2455 +2462 @@
   /* if it already exists then go with it.  This lets users override */
   if (owl_global_get_filter(&g, filtname)) {
-    return(g_strdup(filtname));
+    return filtname;
   }
 
@@ -3409 +3416 @@
   char *buff;
 
-  now=time(NULL);
-  date=g_strdup(ctime(&now));
-  date[strlen(date)-1]='\0';
+  now = time(NULL);
+  date = owl_util_time_to_timestr(localtime(&now));
 
   buff = g_strdup_printf("%s %s", date, string);

message.c

@@ -46 +46 @@
   
   /* save the time */
-  m->time=time(NULL);
-  m->timestr=g_strdup(ctime(&(m->time)));
-  m->timestr[strlen(m->timestr)-1]='\0';
+  m->time = time(NULL);
+  m->timestr = owl_util_time_to_timestr(localtime(&m->time));
 
   m->fmtext = NULL;
@@ -125 +124 @@
     p = m->attributes->pdata[i];
 
-    tmpbuff = g_strdup(owl_pair_get_value(p));
-    g_strdelimit(tmpbuff, "\n", '~');
-    g_strdelimit(tmpbuff, "\r", '!');
-    buff = g_strdup_printf("  %-15.15s: %s\n", owl_pair_get_key(p), tmpbuff);
-    g_free(tmpbuff);
+    buff = g_strdup(owl_pair_get_value(p));
+    if (buff) {
+      tmpbuff = owl_text_indent(buff, 19, false);
+      g_free(buff);
+      buff = g_strdup_printf("  %-15.15s: %s\n", owl_pair_get_key(p), tmpbuff);
+      g_free(tmpbuff);
+    }
 
     if(buff == NULL) {
@@ -794 +795 @@
   /* save the time, we need to nuke the string saved by message_init */
   if (m->timestr) g_free(m->timestr);
-  m->time=n->z_time.tv_sec;
-  m->timestr=g_strdup(ctime(&(m->time)));
-  m->timestr[strlen(m->timestr)-1]='\0';
+  m->time = n->z_time.tv_sec;
+  m->timestr = owl_util_time_to_timestr(localtime(&m->time));
 
   /* set other info */

owl.c

@@ -389 +389 @@
 }
 
-#define CHECK_RESULT(s, syscall) \
+#define OR_DIE(s, syscall)       \
   G_STMT_START {                 \
-    if ((syscall) != 0) {        \
+    if ((syscall) == -1) {       \
       perror((s));               \
       exit(1);                   \
@@ -402 +402 @@
   sigset_t sigset;
   int ret, i;
-  const int signals[] = { SIGABRT, SIGBUS, SIGCHLD, SIGFPE, SIGHUP, SIGILL,
-                          SIGINT, SIGQUIT, SIGSEGV, SIGTERM, SIGWINCH };
+  const int reset_signals[] = { SIGABRT, SIGBUS, SIGCHLD, SIGFPE, SIGILL,
+                                SIGQUIT, SIGSEGV, };
+  /* Don't bother resetting watched ones because owl_signal_init will. */
+  const int watch_signals[] = { SIGWINCH, SIGTERM, SIGHUP, SIGINT, };
 
   /* Sanitize our signals; the mask and dispositions from our parent
    * aren't really useful. Signal list taken from equivalent code in
    * Chromium. */
-  CHECK_RESULT("sigemptyset", sigemptyset(&sigset));
+  OR_DIE("sigemptyset", sigemptyset(&sigset));
   if ((ret = pthread_sigmask(SIG_SETMASK, &sigset, NULL)) != 0) {
     errno = ret;
     perror("pthread_sigmask");
-  }
-  for (i = 0; i < G_N_ELEMENTS(signals); i++) {
-    CHECK_RESULT("sigaction", sigaction(signals[i], &sig_default, NULL));
+    exit(1);
+  }
+  for (i = 0; i < G_N_ELEMENTS(reset_signals); i++) {
+    OR_DIE("sigaction", sigaction(reset_signals[i], &sig_default, NULL));
   }
 
   /* Turn off SIGPIPE; we check the return value of write. */
-  CHECK_RESULT("sigaction", sigaction(SIGPIPE, &sig_ignore, NULL));
+  OR_DIE("sigaction", sigaction(SIGPIPE, &sig_ignore, NULL));
 
   /* Register some signals with the signal thread. */
-  CHECK_RESULT("sigaddset", sigaddset(&sigset, SIGWINCH));
-  CHECK_RESULT("sigaddset", sigaddset(&sigset, SIGTERM));
-  CHECK_RESULT("sigaddset", sigaddset(&sigset, SIGHUP));
-  CHECK_RESULT("sigaddset", sigaddset(&sigset, SIGINT));
-  owl_signal_init(&sigset, sig_handler, NULL);
+  owl_signal_init(watch_signals, G_N_ELEMENTS(watch_signals),
+                  sig_handler, NULL);
 }
 

owl.h

@@ -75 +75 @@
 
 #define OWL_CONFIG_DIR "/.owl"             /* this is relative to the user's home directory */
-#define OWL_STARTUP_FILE "/.owl/startup"   /* this is relative to the user's home directory */
 
 #define OWL_FMTEXT_ATTR_NONE      0
@@ -206 +205 @@
 #define OWL_META(key) ((key)|010000)
 /* OWL_CTRL is definied in kepress.c */
-
-#define LINE 2048
 
 #ifdef HAVE_LIBZEPHYR

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

@@ -29 +29 @@
 use BarnOwl;
 use BarnOwl::Message::Twitter;
-use POSIX qw(asctime);
+use POSIX qw(strftime);
 
 use LWP::UserAgent;
@@ -247 +247 @@
                        ($self->{cfg}->{account_nickname} ?
                         "[$self->{cfg}->{account_nickname}]" : "") .
-                        ": ratelimited until " . asctime(localtime($timeout)));
+                        ": ratelimited until " . strftime('%c', localtime($timeout)));
     } elsif(exists($ratelimit->{error})) {
         $self->sleep(60*20);

regex.c

@@ -11 +11 @@
 {
   int ret;
-  char buff1[LINE];
+  size_t errbuf_size;
+  char *errbuf;
   const char *ptr;
   
@@ -26 +27 @@
   ret=regcomp(&(re->re), ptr, REG_EXTENDED|REG_ICASE);
   if (ret) {
-    regerror(ret, NULL, buff1, LINE);
-    owl_function_makemsg("Error in regular expression: %s", buff1);
+    errbuf_size = regerror(ret, NULL, NULL, 0);
+    errbuf = g_new(char, errbuf_size);
+    regerror(ret, NULL, errbuf, errbuf_size);
+    owl_function_error("Error in regular expression: %s", errbuf);
+    g_free(errbuf);
     g_free(re->string);
     re->string=NULL;

signal.c

@@ -1 +1 @@
 #include <errno.h>
+#include <glib.h>
 #include <pthread.h>
 #include <signal.h>
@@ -13 +14 @@
 static void *signal_thread_func(void *data);
 
-/* Initializes the signal thread to listen for 'set' on a dedicated
+static void dummy_handler(int signum)
+{
+  /* Do nothing. This should never get called. It'd be nice to report the error
+   * or something, but you can't have nice things in a signal handler. */
+}
+
+#define OR_DIE(s, syscall)       \
+  G_STMT_START {                 \
+    if ((syscall) == -1) {       \
+      perror((s));               \
+      exit(1);                   \
+    }                            \
+  } G_STMT_END
+
+/* Initializes the signal thread to listen for 'signals' on a dedicated
  * thread. 'callback' is called *on the signal thread* when a signal
  * is received.
@@ -19 +34 @@
  * This function /must/ be called before any other threads are
  * created. (Otherwise the signals will not get blocked correctly.) */
-void owl_signal_init(const sigset_t *set, void (*callback)(const siginfo_t*, void*), void *data) {
+void owl_signal_init(const int *signals, int num_signals, void (*callback)(const siginfo_t*, void*), void *data) {
+  struct sigaction sig_dummy = { .sa_handler = dummy_handler };
   int ret;
+  int i;
 
-  signal_set = *set;
   signal_cb = callback;
   signal_cbdata = data;
+
+  /* Stuff the signals into our sigset_t. Also assign all of them to a dummy
+   * handler. Otherwise, if their default is SIG_IGN, they will get dropped if
+   * delivered while processing. On Solaris, they will not get delivered at
+   * all. */
+  OR_DIE("sigemptyset", sigemptyset(&signal_set));
+  for (i = 0; i < num_signals; i++) {
+    OR_DIE("sigaddset", sigaddset(&signal_set, signals[i]));
+    OR_DIE("sigaction", sigaction(signals[i], &sig_dummy, NULL));
+  }
+
   /* Block these signals in all threads, so we can get them. */
-  if ((ret = pthread_sigmask(SIG_BLOCK, set, NULL)) != 0) {
+  if ((ret = pthread_sigmask(SIG_BLOCK, &signal_set, NULL)) != 0) {
     errno = ret;
     perror("pthread_sigmask");
+    exit(1);
   }
   /* Spawn a dedicated thread to sigwait. */

style.c

@@ -65 +65 @@
 
   /* indent and ensure ends with a newline */
-  indent = owl_text_indent(body, OWL_TAB);
+  indent = owl_text_indent(body, OWL_TAB, true);
   curlen = strlen(indent);
-  if (curlen==0 || indent[curlen-1] != '\n') {
-    indent[curlen] = '\n';
-    indent[curlen+1] = '\0';
+  if (curlen == 0 || indent[curlen-1] != '\n') {
+    char *tmp = indent;
+    indent = g_strconcat(tmp, "\n", NULL);
+    g_free(tmp);
   }
 

text.c

@@ -7 +7 @@
 /* Returns a copy of 'in' with each line indented 'n'
  * characters. Result must be freed with g_free. */
-CALLER_OWN char *owl_text_indent(const char *in, int n)
+CALLER_OWN char *owl_text_indent(const char *in, int n, bool indent_first_line)
 {
   const char *ptr1, *ptr2, *last;
   GString *out = g_string_new("");
   int i;
+  bool indent_this_line = indent_first_line;
 
   last=in+strlen(in)-1;
   ptr1=in;
   while (ptr1<=last) {
-    for (i=0; i<n; i++) {
-      g_string_append_c(out, ' ');
-    }
+    if (indent_this_line) {
+      for (i = 0; i < n; i++) {
+        g_string_append_c(out, ' ');
+      }
+    }
+    indent_this_line = true;
     ptr2=strchr(ptr1, '\n');
     if (!ptr2) {

util.c

@@ -296 +296 @@
 }
 
+CALLER_OWN char *owl_util_time_to_timestr(const struct tm *time)
+{
+  /* 32 chosen for first attempt because timestr will end up being
+   * something like "Www Mmm dd hh:mm:ss AM yyyy UTC\0" */ 
+  size_t timestr_size = 16;
+  char *timestr = NULL;
+  do {
+    timestr_size *= 2;
+    timestr = g_renew(char, timestr, timestr_size);
+  } while (strftime(timestr, timestr_size, "%c", time) == 0);
+  return timestr;
+}
+
 /* These are in order of their value in owl.h */
 static const struct {

variable.c

@@ -707 +707 @@
 }
 
-void owl_variable_dict_newvar_bool(owl_vardict *vd, const char *name, const char *summ, const char *desc, bool initval)
+void owl_variable_dict_newvar_bool(owl_vardict *vd, const char *name, const char *summ, const char *desc, int initval)
 {
   owl_variable *old = owl_variable_get_var(vd, name);