Changeset 01ff87d

Timestamp:

Aug 15, 2009, 7:16:47 PM (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:

4db2355

Parents:

96cdeaf (diff), 369a7f0 (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 'andersk/const'

Files:

• aim.c (modified) (37 diffs)
• buddy.c (modified) (5 diffs)
• buddylist.c (modified) (8 diffs)
• cmd.c (modified) (15 diffs)
• commands.c (modified) (76 diffs)
• context.c (modified) (2 diffs)
• dict.c (modified) (6 diffs)
• editwin.c (modified) (22 diffs)
• errqueue.c (modified) (2 diffs)
• filter.c (modified) (13 diffs)
• filterelement.c (modified) (21 diffs)
• fmtext.c (modified) (21 diffs)
• functions.c (modified) (96 diffs)
• global.c (modified) (45 diffs)
• help.c (modified) (1 diff)
• history.c (modified) (4 diffs)
• keybinding.c (modified) (5 diffs)
• keymap.c (modified) (11 diffs)
• keypress.c (modified) (3 diffs)
• keys.c (modified) (1 diff)
• list.c (modified) (2 diffs)
• logging.c (modified) (11 diffs)
• mainwin.c (modified) (4 diffs)
• message.c (modified) (45 diffs)
• messagelist.c (modified) (2 diffs)
• obarray.c (modified) (4 diffs)
• owl.c (modified) (3 diffs)
• owl.h (modified) (12 diffs)
• pair.c (modified) (2 diffs)
• perlconfig.c (modified) (17 diffs)
• perlglue.xs (modified) (27 diffs)
• popexec.c (modified) (3 diffs)
• popwin.c (modified) (3 diffs)
• regex.c (modified) (5 diffs)
• select.c (modified) (5 diffs)
• stubgen.pl (modified) (1 diff)
• style.c (modified) (5 diffs)
• text.c (modified) (9 diffs)
• util.c (modified) (13 diffs)
• variable.c (modified) (37 diffs)
• view.c (modified) (9 diffs)
• viewwin.c (modified) (3 diffs)
• zbuddylist.c (modified) (3 diffs)
• zcrypt.c (modified) (5 diffs)
• zephyr.c (modified) (38 diffs)
• zwrite.c (modified) (16 diffs)

aim.c

@@ -26 +26 @@
 };
 
-static char *msgerrreasons[] = {
+static const char *msgerrreasons[] = {
         "Invalid error",
         "Invalid SNAC",
@@ -136 +136 @@
 
 
-int owl_aim_login(char *screenname, char *password)
+int owl_aim_login(const char *screenname, const char *password)
 {
   struct owlfaim_priv *priv;
@@ -209 +209 @@
 
 /* stuff to run once login has been successful */
-void owl_aim_successful_login(char *screenname)
+void owl_aim_successful_login(const char *screenname)
 {
   char *buff;
@@ -248 +248 @@
 }
 
-void owl_aim_login_error(char *message)
+void owl_aim_login_error(const char *message)
 {
   if (message) {
@@ -261 +261 @@
 }
 
-int owl_aim_send_im(char *to, char *msg)
+int owl_aim_send_im(const char *to, const char *msg)
 {
   int ret;
@@ -271 +271 @@
 }
 
-int owl_aim_send_awaymsg(char *to, char *msg)
+int owl_aim_send_awaymsg(const char *to, const char *msg)
 {
   int ret;
@@ -281 +281 @@
 }
 
-void owl_aim_addbuddy(char *name)
+void owl_aim_addbuddy(const char *name)
 {
 
@@ -295 +295 @@
 }
 
-void owl_aim_delbuddy(char *name)
+void owl_aim_delbuddy(const char *name)
 {
   aim_ssi_delbuddy(owl_global_get_aimsess(&g), name, "Buddies");
@@ -301 +301 @@
 }
 
-void owl_aim_search(char *email)
+void owl_aim_search(const char *email)
 {
   int ret;
@@ -314 +314 @@
 
 
-int owl_aim_set_awaymsg(char *msg)
+int owl_aim_set_awaymsg(const char *msg)
 {
   int len;
@@ -341 +341 @@
 }
 
-void owl_aim_chat_join(char *name, int exchange)
+void owl_aim_chat_join(const char *name, int exchange)
 {
   int ret;
@@ -347 +347 @@
   /*
   OscarData *od = g->proto_data;
-  char *name, *exchange;
+  const char *name, *exchange;
   */
 
@@ -392 +392 @@
 }
 
-void owl_aim_chat_leave(char *chatroom)
-{
-}
-
-int owl_aim_chat_sendmsg(char *chatroom, char *msg)
+void owl_aim_chat_leave(const char *chatroom)
+{
+}
+
+int owl_aim_chat_sendmsg(const char *chatroom, const char *msg)
 {
   return(0);
@@ -402 +402 @@
 
 /* caller must free the return */
-char *owl_aim_normalize_screenname(char *in)
+char *owl_aim_normalize_screenname(const char *in)
 {
   char *out;
@@ -482 +482 @@
   struct client_info_s info = CLIENTINFO_AIM_KNOWNGOOD;
     
-  char *key;
-  va_list ap;
-
-  va_start(ap, fr);
-  key = va_arg(ap, char *);
+  const char *key;
+  va_list ap;
+
+  va_start(ap, fr);
+  key = va_arg(ap, const char *);
   va_end(ap);
 
@@ -706 +706 @@
   va_list ap;
   fu16_t code;
-  char *msg;
+  const char *msg;
   
   va_start(ap, fr);
   code = va_arg(ap, int);
-  msg = va_arg(ap, char *);
+  msg = va_arg(ap, const char *);
   va_end(ap);
   
@@ -740 +740 @@
   fu16_t change = 0, perms, type;
   int length, str;
-  char *val;
+  const char *val;
   va_list ap;
   
@@ -748 +748 @@
   type = (fu16_t)va_arg(ap, unsigned int);
   length = va_arg(ap, int);
-  val = va_arg(ap, char *);
+  val = va_arg(ap, const char *);
   str = va_arg(ap, int);
   va_end(ap);
@@ -900 +900 @@
 static int faimtest_parse_motd(aim_session_t *sess, aim_frame_t *fr, ...)
 {
-  char *msg;
+  const char *msg;
   fu16_t id;
   va_list ap;
   static int codeslen = 5;
-  static char *codes[] = {
+  static const char *codes[] = {
     "Unknown",
     "Mandatory upgrade",
@@ -914 +914 @@
   va_start(ap, fr);
   id = va_arg(ap, int);
-  msg = va_arg(ap, char *);
+  msg = va_arg(ap, const char *);
   va_end(ap);
 
@@ -1072 +1072 @@
   va_list ap;
   fu32_t offset, len;
-  char *modname;
+  const char *modname;
   unsigned char *buf;
   int buflen;
@@ -1079 +1079 @@
   offset = va_arg(ap, fu32_t);
   len = va_arg(ap, fu32_t);
-  modname = va_arg(ap, char *);
+  modname = va_arg(ap, const char *);
   va_end(ap);
   
@@ -1112 +1112 @@
 {
   aim_userinfo_t *userinfo;
-  char *prof_encoding = NULL;
-  char *prof = NULL;
+  const char *prof_encoding = NULL;
+  const char *prof = NULL;
   fu16_t inforeq = 0;
   owl_buddy *b;
@@ -1120 +1120 @@
   userinfo = va_arg(ap, aim_userinfo_t *);
   inforeq = (fu16_t)va_arg(ap, unsigned int);
-  prof_encoding = va_arg(ap, char *);
-  prof = va_arg(ap, char *);
+  prof_encoding = va_arg(ap, const char *);
+  prof = va_arg(ap, const char *);
   va_end(ap);
 
@@ -1497 +1497 @@
 {
   va_list ap;
-  char *destsn;
+  const char *destsn;
   fu16_t reason;
   
   va_start(ap, fr);
   reason = (fu16_t)va_arg(ap, unsigned int);
-  destsn = va_arg(ap, char *);
+  destsn = va_arg(ap, const char *);
   va_end(ap);
   
@@ -1518 +1518 @@
 {
   va_list ap;
-  char *destsn;
+  const char *destsn;
   fu16_t reason;
   
   va_start(ap, fr);
   reason = (fu16_t)va_arg(ap, unsigned int);
-  destsn = va_arg(ap, char *);
+  destsn = va_arg(ap, const char *);
   va_end(ap);
   
@@ -1534 +1534 @@
 static int faimtest_parse_misses(aim_session_t *sess, aim_frame_t *fr, ...)
 {
-  static char *missedreasons[] = {
+  static const char *missedreasons[] = {
     "Invalid (0)",
     "Message too large",
@@ -1566 +1566 @@
   va_list ap;
   fu16_t type;
-  char *sn = NULL;
+  const char *sn = NULL;
   
   va_start(ap, fr);
   type = (fu16_t)va_arg(ap, unsigned int);
-  sn = va_arg(ap, char *);
+  sn = va_arg(ap, const char *);
   va_end(ap);
   
@@ -1580 +1580 @@
 static int faimtest_parse_ratechange(aim_session_t *sess, aim_frame_t *fr, ...)
 {
-  static char *codes[5] = {
+  static const char *codes[5] = {
     "invalid",
     "change",
@@ -1656 +1656 @@
 {
   va_list ap;
-  char *address, *SNs;
+  const char *address, *SNs;
   int num, i;
   owl_list list;
   
   va_start(ap, fr);
-  address = va_arg(ap, char *);
+  address = va_arg(ap, const char *);
   num = va_arg(ap, int);
-  SNs = va_arg(ap, char *);
+  SNs = va_arg(ap, const char *);
   va_end(ap);
 
@@ -1671 +1671 @@
   for (i=0; i<num; i++) {
     owl_function_debugmsg("  %s", &SNs[i*(MAXSNLEN+1)]);
-    owl_list_append_element(&list, &SNs[i*(MAXSNLEN+1)]);
+    owl_list_append_element(&list, (void *)&SNs[i*(MAXSNLEN+1)]);
   }
   owl_function_aimsearch_results(address, &list);
@@ -1681 +1681 @@
 {
   va_list ap;
-  char *address;
-  
-  va_start(ap, fr);
-  address = va_arg(ap, char *);
+  const char *address;
+  
+  va_start(ap, fr);
+  address = va_arg(ap, const char *);
   va_end(ap);
 
@@ -1696 +1696 @@
 {
   va_list ap;
-  char *msg, *url;
+  const char *msg, *url;
   fu16_t width, height, delay;
   
   va_start(ap, fr);
-  msg = va_arg(ap, char *);
-  url = va_arg(ap, char *);
+  msg = va_arg(ap, const char *);
+  url = va_arg(ap, const char *);
   width = va_arg(ap, unsigned int);
   height = va_arg(ap, unsigned int);
@@ -1722 +1722 @@
   va_list ap;
   aim_conn_t *bosconn;
-  char *bosip;
+  const char *bosip;
   fu8_t *cookie;
   
   va_start(ap, fr);
-  bosip = va_arg(ap, char *);
+  bosip = va_arg(ap, const char *);
   cookie = va_arg(ap, fu8_t *);
   va_end(ap);
@@ -1873 +1873 @@
   aim_userinfo_t *userinfo;
   struct aim_chat_roominfo *roominfo;
-  char *roomname;
+  const char *roomname;
   int usercount;
-  char *roomdesc;
+  const char *roomdesc;
   fu16_t flags, unknown_d2, unknown_d5, maxmsglen, maxvisiblemsglen;
   fu32_t creationtime;
@@ -1885 +1885 @@
   va_start(ap, fr);
   roominfo = va_arg(ap, struct aim_chat_roominfo *);
-  roomname = va_arg(ap, char *);
+  roomname = va_arg(ap, const char *);
   usercount = va_arg(ap, int);
   userinfo = va_arg(ap, aim_userinfo_t *);
-  roomdesc = va_arg(ap, char *);
+  roomdesc = va_arg(ap, const char *);
   flags = (fu16_t)va_arg(ap, unsigned int);
   creationtime = va_arg(ap, fu32_t);
@@ -1928 +1928 @@
   va_list ap;
   aim_userinfo_t *userinfo;
-  char *msg;
+  const char *msg;
   char tmpbuf[1152];
   
   va_start(ap, fr);
   userinfo = va_arg(ap, aim_userinfo_t *);      
-  msg = va_arg(ap, char *);
+  msg = va_arg(ap, const char *);
   va_end(ap);
 

buddy.c

@@ -1 +1 @@
 #include "owl.h"
 
-void owl_buddy_create(owl_buddy *b, int proto, char *name)
+void owl_buddy_create(owl_buddy *b, int proto, const char *name)
 {
   b->proto=proto;
@@ -8 +8 @@
 }
 
-char *owl_buddy_get_name(owl_buddy *b)
+const char *owl_buddy_get_name(const owl_buddy *b)
 {
   if (b->name) return(b->name);
@@ -14 +14 @@
 }
 
-int owl_buddy_is_idle(owl_buddy *b)
+int owl_buddy_is_idle(const owl_buddy *b)
 {
   if (b->isidle) return(1);
@@ -30 +30 @@
 }
 
-int owl_buddy_get_proto(owl_buddy *b)
+int owl_buddy_get_proto(const owl_buddy *b)
 {
   return(b->proto);
 }
 
-int owl_buddy_is_proto_aim(owl_buddy *b)
+int owl_buddy_is_proto_aim(const owl_buddy *b)
 {
   if (b->proto==OWL_PROTOCOL_AIM) return(1);
@@ -53 +53 @@
 /* return the number of minutes the buddy has been idle
  */
-int owl_buddy_get_idle_time(owl_buddy *b)
+int owl_buddy_get_idle_time(const owl_buddy *b)
 {
   time_t now;

buddylist.c

@@ -8 +8 @@
 /* add a (logged-in) AIM buddy to the buddy list
  */
-void owl_buddylist_add_aim_buddy(owl_buddylist *bl, char *screenname)
+void owl_buddylist_add_aim_buddy(owl_buddylist *bl, const char *screenname)
 {
   owl_buddy *b;
@@ -19 +19 @@
 /* remove an AIM buddy from the buddy list
  */
-int owl_buddylist_remove_aim_buddy(owl_buddylist *bl, char *name)
+int owl_buddylist_remove_aim_buddy(owl_buddylist *bl, const char *name)
 {
   int i, j;
@@ -40 +40 @@
  * logged in.
  */
-void owl_buddylist_oncoming(owl_buddylist *bl, char *screenname)
+void owl_buddylist_oncoming(owl_buddylist *bl, const char *screenname)
 {
   owl_message *m;
@@ -66 +66 @@
  * has logged out, and sending a message if they were logged in.
  */
-void owl_buddylist_offgoing(owl_buddylist *bl, char *screenname)
+void owl_buddylist_offgoing(owl_buddylist *bl, const char *screenname)
 {
   owl_message *m;
@@ -85 +85 @@
 
 /* return the number of logged in buddies */
-int owl_buddylist_get_size(owl_buddylist *bl)
+int owl_buddylist_get_size(const owl_buddylist *bl)
 {
   return(owl_list_get_size(&(bl->buddies)));
@@ -92 +92 @@
 /* return the buddy with index N.  If out of range, return NULL
  */
-owl_buddy *owl_buddylist_get_buddy_n(owl_buddylist *bl, int index)
+owl_buddy *owl_buddylist_get_buddy_n(const owl_buddylist *bl, int index)
 {
   if (index<0) return(NULL);
@@ -103 +103 @@
  * no such buddy is logged in, return NULL.
  */
-owl_buddy *owl_buddylist_get_aim_buddy(owl_buddylist *bl, char *name)
+owl_buddy *owl_buddylist_get_aim_buddy(const owl_buddylist *bl, const char *name)
 {
   int i, j;
@@ -119 +119 @@
  * otherwise return 0
  */
-int owl_buddylist_is_aim_buddy_loggedin(owl_buddylist *bl, char *screenname)
+int owl_buddylist_is_aim_buddy_loggedin(const owl_buddylist *bl, const char *screenname)
 {
-  owl_buddy *b;
+  const owl_buddy *b;
 
   b=owl_buddylist_get_aim_buddy(bl, screenname);

cmd.c

@@ -5 +5 @@
 #include "owl.h"
 
-extern owl_cmd commands_to_init[];
+extern const owl_cmd commands_to_init[];
 
 /**************************************************************************/
@@ -23 +23 @@
 
 /* for bulk initialization at startup */
-int owl_cmddict_add_from_list(owl_cmddict *cd, owl_cmd *cmds) {
-  owl_cmd *cur;
+int owl_cmddict_add_from_list(owl_cmddict *cd, const owl_cmd *cmds) {
+  const owl_cmd *cur;
   int ret = 0;
   for (cur = cmds; cur->name != NULL; cur++) {
@@ -34 +34 @@
 
 /* free the list with owl_cmddict_namelist_free */
-void owl_cmddict_get_names(owl_cmddict *d, owl_list *l) {
+void owl_cmddict_get_names(const owl_cmddict *d, owl_list *l) {
   owl_dict_get_keys(d, l);
 }
 
-owl_cmd *owl_cmddict_find(owl_cmddict *d, char *name) {
+const owl_cmd *owl_cmddict_find(const owl_cmddict *d, const char *name) {
   return owl_dict_find_element(d, name);
 }
@@ -47 +47 @@
 
 /* creates a new command alias */
-int owl_cmddict_add_alias(owl_cmddict *cd, char *alias_from, char *alias_to) {
+int owl_cmddict_add_alias(owl_cmddict *cd, const char *alias_from, const char *alias_to) {
   owl_cmd *cmd;
   cmd = owl_malloc(sizeof(owl_cmd));
@@ -55 +55 @@
 }
 
-int owl_cmddict_add_cmd(owl_cmddict *cd, owl_cmd * cmd) {
+int owl_cmddict_add_cmd(owl_cmddict *cd, const owl_cmd * cmd) {
   owl_cmd * newcmd = owl_malloc(sizeof(owl_cmd));
   if(owl_cmd_create_from_template(newcmd, cmd) < 0) {
@@ -65 +65 @@
 }
 
-char *_owl_cmddict_execute(owl_cmddict *cd, owl_context *ctx, char **argv, int argc, char *buff) {
+char *_owl_cmddict_execute(const owl_cmddict *cd, const owl_context *ctx, const char *const *argv, int argc, const char *buff) {
   char *retval = NULL;
-  owl_cmd *cmd;
+  const owl_cmd *cmd;
 
   if (!strcmp(argv[0], "")) {
@@ -78 +78 @@
 }
 
-char *owl_cmddict_execute(owl_cmddict *cd, owl_context *ctx, char *cmdbuff) {
+char *owl_cmddict_execute(const owl_cmddict *cd, const owl_context *ctx, const char *cmdbuff) {
   char **argv;
   int argc;
@@ -95 +95 @@
   if (argc < 1) return(NULL);
 
-  retval = _owl_cmddict_execute(cd, ctx, argv, argc, cmdbuff);
+  retval = _owl_cmddict_execute(cd, ctx, strs(argv), argc, cmdbuff);
 
   owl_parsefree(argv, argc);
@@ -103 +103 @@
 }
 
-char *owl_cmddict_execute_argv(owl_cmddict *cd, owl_context *ctx, char **argv, int argc) {
+char *owl_cmddict_execute_argv(const owl_cmddict *cd, const owl_context *ctx, const char *const *argv, int argc) {
   char *buff, *ptr;
   int len = 0, i;
@@ -132 +132 @@
 
 /* sets up a new command based on a template, copying strings */
-int owl_cmd_create_from_template(owl_cmd *cmd, owl_cmd *templ) {
+int owl_cmd_create_from_template(owl_cmd *cmd, const owl_cmd *templ) {
   *cmd = *templ;
   if (!templ->name) return(-1);
@@ -143 +143 @@
 }
 
-int owl_cmd_create_alias(owl_cmd *cmd, char *name, char *aliased_to) {
+int owl_cmd_create_alias(owl_cmd *cmd, const char *name, const char *aliased_to) {
   memset(cmd, 0, sizeof(owl_cmd));
   cmd->name = owl_strdup(name);
@@ -162 +162 @@
 }
 
-int owl_cmd_is_context_valid(owl_cmd *cmd, owl_context *ctx) { 
+int owl_cmd_is_context_valid(const owl_cmd *cmd, const owl_context *ctx) { 
   if (owl_context_matches(ctx, cmd->validctx)) return 1;
   else return 0;
 }
 
-char *owl_cmd_execute(owl_cmd *cmd, owl_cmddict *cd, owl_context *ctx, int argc, char **argv, char *cmdbuff) {
+char *owl_cmd_execute(const owl_cmd *cmd, const owl_cmddict *cd, const owl_context *ctx, int argc, const char *const *argv, const char *cmdbuff) {
   static int alias_recurse_depth = 0;
   int ival=0;
-  char *cmdbuffargs, *newcmd, *rv=NULL;
+  const char *cmdbuffargs;
+  char *newcmd, *rv=NULL;
 
   if (argc < 1) return(NULL);
@@ -205 +206 @@
 
   if (cmd->cmd_i_fn || cmd->cmd_ctxi_fn) {
-      char *ep = "x";
+      const char *ep = "x";
       if (argc != 2) {
         owl_function_makemsg("Wrong number of arguments for %s command.", argv[0]);
         return NULL;
       }
-      ival = strtol(argv[1], &ep, 10);
+      ival = strtol(argv[1], (char **)&ep, 10);
       if (*ep || ep==argv[1]) {
         owl_function_makemsg("Invalid argument '%s' for %s command.", argv[1], argv[0]);
@@ -237 +238 @@
 
 /* returns a reference */
-char *owl_cmd_get_summary(owl_cmd *cmd) {
+const char *owl_cmd_get_summary(const owl_cmd *cmd) {
   return cmd->summary;
 }
 
 /* returns a summary line describing this keymap.  the caller must free. */
-char *owl_cmd_describe(owl_cmd *cmd) {
+char *owl_cmd_describe(const owl_cmd *cmd) {
   char *s;
   int slen;
@@ -254 +255 @@
 
 
-void owl_cmd_get_help(owl_cmddict *d, char *name, owl_fmtext *fm) {
-  char *indent, *s;
+void owl_cmd_get_help(const owl_cmddict *d, const char *name, owl_fmtext *fm) {
+  const char *s;
+  char *indent;
   owl_cmd *cmd;
 

commands.c

@@ -5 +5 @@
 #include "owl.h"
 
-/* fn is "char *foo(int argc, char **argv, char *buff)" */
+/* fn is "char *foo(int argc, const char *const *argv, const char *buff)" */
 #define OWLCMD_ARGS(name, fn, ctx, summary, usage, description) \
         { name, summary, usage, description, ctx, \
@@ -24 +24 @@
           actualname, NULL, NULL, NULL, NULL, NULL, NULL, NULL }
 
-/* fn is "char *foo(void *ctx, int argc, char **argv, char *buff)" */
+/* fn is "char *foo(void *ctx, int argc, const char *const *argv, const char *buff)" */
 #define OWLCMD_ARGS_CTX(name, fn, ctx, summary, usage, description) \
         { name, summary, usage, description, ctx, \
-          NULL, NULL, NULL, NULL, ((char*(*)(void*,int,char**,char*))fn), NULL, NULL, NULL }
+          NULL, NULL, NULL, NULL, ((char*(*)(void*,int,const char*const *,const char*))fn), NULL, NULL, NULL }
 
 /* fn is "void foo(void)" */
@@ -40 +40 @@
 
 
-owl_cmd commands_to_init[]
+const owl_cmd commands_to_init[]
   = {
   OWLCMD_ARGS("zlog", owl_command_zlog, OWL_CTX_ANY,
@@ -1004 +1004 @@
 }
 
-char *owl_command_help(int argc, char **argv, char *buff)
+char *owl_command_help(int argc, const char *const *argv, const char *buff)
 {
   if (argc!=2) {
@@ -1015 +1015 @@
 }
 
-char *owl_command_zlist(int argc, char **argv, char *buff)
+char *owl_command_zlist(int argc, const char *const *argv, const char *buff)
 {
   int elapsed=0, timesort=0;
-  char *file=NULL;
+  const char *file=NULL;
 
   argc--;
@@ -1076 +1076 @@
 }
 
-char *owl_command_aim(int argc, char **argv, char *buff)
+char *owl_command_aim(int argc, const char *const *argv, const char *buff)
 {
   if (argc<2) {
@@ -1096 +1096 @@
 }
 
-char *owl_command_addbuddy(int argc, char **argv, char *buff)
+char *owl_command_addbuddy(int argc, const char *const *argv, const char *buff)
 {
   if (argc!=3) {
@@ -1124 +1124 @@
 }
 
-char *owl_command_delbuddy(int argc, char **argv, char *buff)
+char *owl_command_delbuddy(int argc, const char *const *argv, const char *buff)
 {
   if (argc!=3) {
@@ -1148 +1148 @@
 }
 
-char *owl_command_join(int argc, char **argv, char *buff)
+char *owl_command_join(int argc, const char *const *argv, const char *buff)
 {
   if (argc!=3 && argc!=4) {
@@ -1172 +1172 @@
 }
 
-char *owl_command_startup(int argc, char **argv, char *buff)
-{
-  char *ptr;
+char *owl_command_startup(int argc, const char *const *argv, const char *buff)
+{
+  const char *ptr;
 
   if (argc<2) {
@@ -1193 +1193 @@
 }
 
-char *owl_command_unstartup(int argc, char **argv, char *buff)
-{
-  char *ptr;
+char *owl_command_unstartup(int argc, const char *const *argv, const char *buff)
+{
+  const char *ptr;
 
   if (argc<2) {
@@ -1213 +1213 @@
 }
 
-char *owl_command_dump(int argc, char **argv, char *buff)
+char *owl_command_dump(int argc, const char *const *argv, const char *buff)
 {
   char *filename;
@@ -1227 +1227 @@
 }
 
-char *owl_command_source(int argc, char **argv, char *buff)
+char *owl_command_source(int argc, const char *const *argv, const char *buff)
 {
   if (argc!=2) {
@@ -1238 +1238 @@
 }
 
-char *owl_command_next(int argc, char **argv, char *buff)
+char *owl_command_next(int argc, const char *const *argv, const char *buff)
 {
   char *filter=NULL;
@@ -1268 +1268 @@
 }
 
-char *owl_command_prev(int argc, char **argv, char *buff)
+char *owl_command_prev(int argc, const char *const *argv, const char *buff)
 {
   char *filter=NULL;
@@ -1298 +1298 @@
 }
 
-char *owl_command_smartnarrow(int argc, char **argv, char *buff)
+char *owl_command_smartnarrow(int argc, const char *const *argv, const char *buff)
 {
   char *filtname = NULL;
@@ -1316 +1316 @@
 }
 
-char *owl_command_smartfilter(int argc, char **argv, char *buff)
+char *owl_command_smartfilter(int argc, const char *const *argv, const char *buff)
 {
   char *filtname = NULL;
@@ -1372 +1372 @@
 }
 
-char *owl_command_loadsubs(int argc, char **argv, char *buff)
+char *owl_command_loadsubs(int argc, const char *const *argv, const char *buff)
 {
   if (argc == 2) {
@@ -1386 +1386 @@
 
 
-char *owl_command_loadloginsubs(int argc, char **argv, char *buff)
+char *owl_command_loadloginsubs(int argc, const char *const *argv, const char *buff)
 {
   if (argc == 2) {
@@ -1404 +1404 @@
 }
 
-char *owl_command_start_command(int argc, char **argv, char *buff)
+char *owl_command_start_command(int argc, const char *const *argv, const char *buff)
 {
   buff = skiptokens(buff, 1);
@@ -1411 +1411 @@
 }
 
-char *owl_command_zaway(int argc, char **argv, char *buff)
+char *owl_command_zaway(int argc, const char *const *argv, const char *buff)
 {
   if ((argc==1) ||
@@ -1437 +1437 @@
 
 
-char *owl_command_aaway(int argc, char **argv, char *buff)
+char *owl_command_aaway(int argc, const char *const *argv, const char *buff)
 {
   if ((argc==1) ||
@@ -1463 +1463 @@
 
 
-char *owl_command_away(int argc, char **argv, char *buff)
+char *owl_command_away(int argc, const char *const *argv, const char *buff)
 {
   if ((argc==1) ||
@@ -1506 +1506 @@
 }
 
-char *owl_command_set(int argc, char **argv, char *buff)
-{
-  char *var, *val;
+char *owl_command_set(int argc, const char *const *argv, const char *buff)
+{
+  const char *var, *val;
   int  silent=0;
   int requirebool=0;
@@ -1537 +1537 @@
 }
 
-char *owl_command_unset(int argc, char **argv, char *buff)
-{
-  char *var, *val;
+char *owl_command_unset(int argc, const char *const *argv, const char *buff)
+{
+  const char *var, *val;
   int  silent=0;
 
@@ -1557 +1557 @@
 }
 
-char *owl_command_print(int argc, char **argv, char *buff)
-{
-  char *var;
+char *owl_command_print(int argc, const char *const *argv, const char *buff)
+{
+  const char *var;
   char valbuff[1024];
 
@@ -1582 +1582 @@
 
 
-char *owl_command_exec(int argc, char **argv, char *buff)
+char *owl_command_exec(int argc, const char *const *argv, const char *buff)
 {
   return owl_function_exec(argc, argv, buff, 0);
 }
 
-char *owl_command_pexec(int argc, char **argv, char *buff)
+char *owl_command_pexec(int argc, const char *const *argv, const char *buff)
 {
   return owl_function_exec(argc, argv, buff, 1);
 }
 
-char *owl_command_aexec(int argc, char **argv, char *buff)
+char *owl_command_aexec(int argc, const char *const *argv, const char *buff)
 {
   return owl_function_exec(argc, argv, buff, 2);
 }
 
-char *owl_command_perl(int argc, char **argv, char *buff)
+char *owl_command_perl(int argc, const char *const *argv, const char *buff)
 {
   return owl_function_perl(argc, argv, buff, 0);
 }
 
-char *owl_command_pperl(int argc, char **argv, char *buff)
+char *owl_command_pperl(int argc, const char *const *argv, const char *buff)
 {
   return owl_function_perl(argc, argv, buff, 1);
 }
 
-char *owl_command_aperl(int argc, char **argv, char *buff)
+char *owl_command_aperl(int argc, const char *const *argv, const char *buff)
 {
   return owl_function_perl(argc, argv, buff, 2);
 }
 
-char *owl_command_multi(int argc, char **argv, char *buff)
+char *owl_command_multi(int argc, const char *const *argv, const char *buff)
 {
   char *lastrv = NULL, *newbuff;
@@ -1647 +1647 @@
 
 
-char *owl_command_alias(int argc, char **argv, char *buff)
+char *owl_command_alias(int argc, const char *const *argv, const char *buff)
 {
   if (argc < 3) {
@@ -1659 +1659 @@
 
 
-char *owl_command_bindkey(int argc, char **argv, char *buff)
+char *owl_command_bindkey(int argc, const char *const *argv, const char *buff)
 {
   owl_keymap *km;
@@ -1688 +1688 @@
 }
 
-char *owl_command_debug(int argc, char **argv, char *buff)
+char *owl_command_debug(int argc, const char *const *argv, const char *buff)
 {
   if (argc<2) {
@@ -1704 +1704 @@
 }
 
-char *owl_command_term(int argc, char **argv, char *buff)
+char *owl_command_term(int argc, const char *const *argv, const char *buff)
 {
   if (argc<2) {
@@ -1721 +1721 @@
 }
 
-char *owl_command_zlog(int argc, char **argv, char *buff)
+char *owl_command_zlog(int argc, const char *const *argv, const char *buff)
 {
   if ((argc<2) || (argc>3)) {
@@ -1745 +1745 @@
 }
 
-char *owl_command_subscribe(int argc, char **argv, char *buff)
-{
-  char *class, *instance, *recip="";
+char *owl_command_subscribe(int argc, const char *const *argv, const char *buff)
+{
+  const char *class, *instance, *recip="";
   int temp=0;
   int ret=0;
@@ -1795 +1795 @@
 
 
-char *owl_command_unsubscribe(int argc, char **argv, char *buff)
-{
-  char *class, *instance, *recip="";
+char *owl_command_unsubscribe(int argc, const char *const *argv, const char *buff)
+{
+  const char *class, *instance, *recip="";
   int temp=0;
 
@@ -1843 +1843 @@
 }
 
-char *owl_command_echo(int argc, char **argv, char *buff)
+char *owl_command_echo(int argc, const char *const *argv, const char *buff)
 {
   buff = skiptokens(buff, 1);
@@ -1860 +1860 @@
 }
 
-char *owl_command_zwrite(int argc, char **argv, char *buff)
+char *owl_command_zwrite(int argc, const char *const *argv, const char *buff)
 {
   owl_zwrite z;
@@ -1884 +1884 @@
 }
 
-char *owl_command_aimwrite(int argc, char **argv, char *buff)
-{
-  char *newbuff, *recip, **myargv;
+char *owl_command_aimwrite(int argc, const char *const *argv, const char *buff)
+{
+  char *newbuff, *recip;
+  const char *const *myargv;
   int i, j, myargc;
   owl_message *m;
@@ -1963 +1964 @@
 }
 
-char *owl_command_loopwrite(int argc, char **argv, char *buff)
+char *owl_command_loopwrite(int argc, const char *const *argv, const char *buff)
 {
   owl_function_loopwrite_setup();
@@ -1969 +1970 @@
 }
 
-char *owl_command_zcrypt(int argc, char **argv, char *buff)
+char *owl_command_zcrypt(int argc, const char *const *argv, const char *buff)
 {
 #ifdef OWL_ENABLE_ZCRYPT
@@ -1997 +1998 @@
 }
 
-char *owl_command_reply(int argc, char **argv, char *buff)
+char *owl_command_reply(int argc, const char *const *argv, const char *buff)
 {
   int edit=0;
@@ -2012 +2013 @@
     owl_function_reply(1, !edit);
   } else if (argc==2 && !strcmp(argv[1], "zaway")) {
-    owl_message *m;
-    owl_view    *v;
+    const owl_message *m;
+    const owl_view    *v;
     v = owl_global_get_current_view(&g);    
     m = owl_view_get_element(v, owl_global_get_curmsg(&g));
@@ -2023 +2024 @@
 }
 
-char *owl_command_filter(int argc, char **argv, char *buff)
+char *owl_command_filter(int argc, const char *const *argv, const char *buff)
 {
   owl_function_create_filter(argc, argv);
@@ -2029 +2030 @@
 }
 
-char *owl_command_zlocate(int argc, char **argv, char *buff)
+char *owl_command_zlocate(int argc, const char *const *argv, const char *buff)
 {
   int auth;
@@ -2063 +2064 @@
  * view --home
  */
-char *owl_command_view(int argc, char **argv, char *buff)
+char *owl_command_view(int argc, const char *const *argv, const char *buff)
 {
   /* First take the 'view --home' and 'view -r' cases */
@@ -2087 +2088 @@
   /* Now get 'view -d <expression>' */
   if (argc>=3 && !strcmp(argv[1], "-d")) {
-    char **myargv;
+    const char **myargv;
     int i;
 
-    myargv=owl_malloc((argc*sizeof(char *))+50);
+    myargv=owl_malloc((argc*sizeof(const char *))+50);
     myargv[0]="";
     myargv[1]="owl-dynamic";
@@ -2135 +2136 @@
       argv++;
     } else if (!strcmp(argv[0], "-r")) {
-      char *foo;
+      const char *foo;
       foo=owl_function_create_negative_filter(owl_view_get_filtname(owl_global_get_current_view(&g)));
       owl_function_change_currentview_filter(foo);
@@ -2155 +2156 @@
 }
 
-char *owl_command_show(int argc, char **argv, char *buff)
+char *owl_command_show(int argc, const char *const *argv, const char *buff)
 {
   if (argc<2) {
@@ -2212 +2213 @@
     owl_function_show_quickstart();
   } else if (!strcmp(argv[1], "startup")) {
-    char *filename;
+    const char *filename;
     
     filename=owl_global_get_startupfile(&g);
@@ -2225 +2226 @@
 }
 
-char *owl_command_viewclass(int argc, char **argv, char *buff)
+char *owl_command_viewclass(int argc, const char *const *argv, const char *buff)
 {
   char *filtname;
@@ -2238 +2239 @@
 }
 
-char *owl_command_viewuser(int argc, char **argv, char *buff)
+char *owl_command_viewuser(int argc, const char *const *argv, const char *buff)
 {
   char *filtname;
@@ -2257 +2258 @@
 }
 
-char *owl_command_delete(int argc, char **argv, char *buff)
+char *owl_command_delete(int argc, const char *const *argv, const char *buff)
 {
   int move_after = 1;
@@ -2291 +2292 @@
 }
 
-char *owl_command_undelete(int argc, char **argv, char *buff)
+char *owl_command_undelete(int argc, const char *const *argv, const char *buff)
 {
   int move_after = 1;
@@ -2325 +2326 @@
 }
 
-char *owl_command_colorview(int argc, char **argv, char *buff)
+char *owl_command_colorview(int argc, const char *const *argv, const char *buff)
 {
   if (argc < 2 || argc > 3) {
@@ -2335 +2336 @@
 }
 
-char *owl_command_colorclass(int argc, char **argv, char *buff)
-{
-  char *filtname;
+char *owl_command_colorclass(int argc, const char *const *argv, const char *buff)
+{
+  const char *filtname;
   
   if (argc < 3 || argc > 4) {
@@ -2349 +2350 @@
 }
 
-char *owl_command_zpunt(int argc, char **argv, char *buff)
+char *owl_command_zpunt(int argc, const char *const *argv, const char *buff)
 {
   owl_command_zpunt_and_zunpunt(argc, argv, 0);
@@ -2355 +2356 @@
 }
 
-char *owl_command_zunpunt(int argc, char **argv, char *buff)
+char *owl_command_zunpunt(int argc, const char *const *argv, const char *buff)
 {
   owl_command_zpunt_and_zunpunt(argc, argv, 1);
@@ -2361 +2362 @@
 }
 
-void owl_command_zpunt_and_zunpunt(int argc, char **argv, int type)
+void owl_command_zpunt_and_zunpunt(int argc, const char *const *argv, int type)
 {
   /* if type==0 then zpunt
    * if type==1 then zunpunt
    */
-  char *class, *inst, *recip;
+  const char *class, *inst, *recip;
 
   class="message";
@@ -2398 +2399 @@
 }
 
-char *owl_command_smartzpunt(int argc, char **argv, char *buff)
+char *owl_command_smartzpunt(int argc, const char *const *argv, const char *buff)
 {
   if (argc == 1) {
@@ -2410 +2411 @@
 }
 
-char *owl_command_punt(int argc, char **argv, char *buff)
+char *owl_command_punt(int argc, const char *const *argv, const char *buff)
 {
   owl_command_punt_unpunt(argc, argv, buff, 0);
@@ -2416 +2417 @@
 }
 
-char *owl_command_unpunt(int argc, char **argv, char *buff)
+char *owl_command_unpunt(int argc, const char *const *argv, const char *buff)
 {
   owl_command_punt_unpunt(argc, argv, buff, 1);
@@ -2422 +2423 @@
 }
 
-void owl_command_punt_unpunt(int argc, char ** argv, char *buff, int unpunt)
+void owl_command_punt_unpunt(int argc, const char *const * argv, const char *buff, int unpunt)
 {
   owl_list * fl;
@@ -2456 +2457 @@
 
 
-char *owl_command_getview(int argc, char **argv, char *buff)
-{
-  char *filtname;
+char *owl_command_getview(int argc, const char *const *argv, const char *buff)
+{
+  const char *filtname;
   if (argc != 1) {
     owl_function_makemsg("Wrong number of arguments for %s", argv[0]);
@@ -2464 +2465 @@
   }
   filtname = owl_view_get_filtname(owl_global_get_current_view(&g));
-  if (filtname) filtname = owl_strdup(filtname);
-  return filtname;
-}
-
-char *owl_command_getvar(int argc, char **argv, char *buff)
+  if (filtname) return owl_strdup(filtname);
+  return NULL;
+}
+
+char *owl_command_getvar(int argc, const char *const *argv, const char *buff)
 {
   char tmpbuff[1024];
@@ -2482 +2483 @@
 }
 
-char *owl_command_getfilter(int argc, char **argv, char *buf)
-{
-  owl_filter *f;
+char *owl_command_getfilter(int argc, const char *const *argv, const char *buf)
+{
+  const owl_filter *f;
   if (argc != 2) {
     owl_function_makemsg("Wrong number of arguments for %s", argv[0]);
@@ -2496 +2497 @@
 }
 
-char *owl_command_search(int argc, char **argv, char *buff)
+char *owl_command_search(int argc, const char *const *argv, const char *buff)
 {
   int direction;
-  char *buffstart;
+  const char *buffstart;
 
   direction=OWL_DIRECTION_DOWNWARDS;
@@ -2517 +2518 @@
 }
 
-char *owl_command_setsearch(int argc, char **argv, char *buff)
-{
-  char *buffstart;
+char *owl_command_setsearch(int argc, const char *const *argv, const char *buff)
+{
+  const char *buffstart;
 
   buffstart=skiptokens(buff, 1);
@@ -2527 +2528 @@
 }
 
-char *owl_command_aimlogin(int argc, char **argv, char *buff)
+char *owl_command_aimlogin(int argc, const char *const *argv, const char *buff)
 {
   if ((argc<2) || (argc>3)) {
@@ -2548 +2549 @@
 }
 
-char *owl_command_aimlogout(int argc, char **argv, char *buff)
+char *owl_command_aimlogout(int argc, const char *const *argv, const char *buff)
 {
   /* clear the buddylist */
@@ -2557 +2558 @@
 }
 
-char *owl_command_getstyle(int argc, char **argv, char *buff)
-{
-  char *stylename;
+char *owl_command_getstyle(int argc, const char *const *argv, const char *buff)
+{
+  const char *stylename;
   if (argc != 1) {
     owl_function_makemsg("Wrong number of arguments for %s", argv[0]);
@@ -2565 +2566 @@
   }
   stylename = owl_view_get_style_name(owl_global_get_current_view(&g));
-  if (stylename) stylename = owl_strdup(stylename);
-  return stylename;
-}
-
-char *owl_command_error(int argc, char **argv, char *buff)
+  if (stylename) return owl_strdup(stylename);
+  return NULL;
+}
+
+char *owl_command_error(int argc, const char *const *argv, const char *buff)
 {
     buff = skiptokens(buff, 1);
@@ -2576 +2577 @@
 }
 
-char *owl_command_message(int argc, char **argv, char *buff)
+char *owl_command_message(int argc, const char *const *argv, const char *buff)
 {
     buff = skiptokens(buff, 1);
@@ -2586 +2587 @@
 {
   owl_message *m;
-  owl_view *v;
-  char *cmd;
+  const owl_view *v;
+  const char *cmd;
 
   v = owl_global_get_current_view(&g);
@@ -2620 +2621 @@
 {
   owl_message *m;
-  owl_view *v;
-  char *cmd;
+  const owl_view *v;
+  const char *cmd;
 
   v = owl_global_get_current_view(&g);
@@ -2679 +2680 @@
 {
   owl_history *hist;
-  char *ptr;
+  const char *ptr;
 
   hist=owl_editwin_get_history(e);
@@ -2700 +2701 @@
 {
   owl_history *hist;
-  char *ptr;
+  const char *ptr;
 
   hist=owl_editwin_get_history(e);
@@ -2714 +2715 @@
 }
 
-char *owl_command_edit_insert_text(owl_editwin *e, int argc, char **argv, char *buff)
+char *owl_command_edit_insert_text(owl_editwin *e, int argc, const char *const *argv, const char *buff)
 {
   buff = skiptokens(buff, 1);

context.c

@@ -14 +14 @@
 
 /* returns whether test matches the current context */
-int owl_context_matches(owl_context *ctx, int test)
+int owl_context_matches(const owl_context *ctx, int test)
 {
   /*owl_function_debugmsg(", current: 0x%04x test: 0x%04x\n", ctx->mode, test);*/
@@ -28 +28 @@
 }
 
-void *owl_context_get_data(owl_context *ctx)
+void *owl_context_get_data(const owl_context *ctx)
 {
   return ctx->data;
 }
 
-int owl_context_get_mode(owl_context *ctx)
+int owl_context_get_mode(const owl_context *ctx)
 {
   return ctx->mode & OWL_CTX_MODE_BITS;
 }
 
-int owl_context_get_active(owl_context *ctx)
+int owl_context_get_active(const owl_context *ctx)
 {
   return ctx->mode & OWL_CTX_ACTIVE_BITS;
 }
 
-int owl_context_is_startup(owl_context *ctx)
+int owl_context_is_startup(const owl_context *ctx)
 {
   return (ctx->mode & OWL_CTX_STARTUP)?1:0;
 }
 
-int owl_context_is_interactive(owl_context *ctx)
+int owl_context_is_interactive(const owl_context *ctx)
 {
   return(ctx->mode & OWL_CTX_INTERACTIVE)?1:0;

dict.c

@@ -24 +24 @@
 }
 
-int owl_dict_get_size(owl_dict *d) {
+int owl_dict_get_size(const owl_dict *d) {
   return(d->size);
 }
@@ -31 +31 @@
  * this element would logically go, and stores the index in pos.
  * Returns 1 if found, else 0. */
-int _owl_dict_find_pos(owl_dict *d, char *k, int *pos) {
+int _owl_dict_find_pos(const owl_dict *d, const char *k, int *pos) {
   int lo = 0, hi = d->size;
   while (lo < hi) {
@@ -50 +50 @@
 
 /* returns the value corresponding to key k */
-void *owl_dict_find_element(owl_dict *d, char *k) {
+void *owl_dict_find_element(const owl_dict *d, const char *k) {
   int found, pos;
   found = _owl_dict_find_pos(d, k, &pos);
@@ -61 +61 @@
 /* creates a list and fills it in with keys.  duplicates the keys, 
  * so they will need to be freed by the caller. */
-int owl_dict_get_keys(owl_dict *d, owl_list *l) {
+int owl_dict_get_keys(const owl_dict *d, owl_list *l) {
   int i;
   char *dupk;
@@ -82 +82 @@
    Will return -2 if replace=NULL and match was found.
 */
-int owl_dict_insert_element(owl_dict *d, char *k, void *v, void (*free_on_replace)(void *old)) {
+int owl_dict_insert_element(owl_dict *d, const char *k, void *v, void (*free_on_replace)(void *old)) {
   int pos, found;
   char *dupk;
@@ -113 +113 @@
 /* Doesn't free the value of the element, but does
  * return it so the caller can free it. */
-void *owl_dict_remove_element(owl_dict *d, char *k) {
+void *owl_dict_remove_element(owl_dict *d, const char *k) {
   int i;
   int pos, found;

editwin.c

@@ -45 +45 @@
 static void oe_restore_excursion(owl_editwin *e, oe_excursion *x);
 static void oe_restore_mark_only(owl_editwin *e, oe_excursion *x);
-static int oe_count_glyphs(char *s);
+static int oe_count_glyphs(const char *s);
 static int oe_char_width(gunichar c, int column);
 static int oe_region_width(owl_editwin *e, int start, int end, int width);
@@ -52 +52 @@
 static int owl_editwin_limit_maxcols(int v, int maxv);
 static int owl_editwin_check_dotsend(owl_editwin *e);
-static int owl_editwin_is_char_in(owl_editwin *e, char *set);
+static int owl_editwin_is_char_in(owl_editwin *e, const char *set);
 static gunichar owl_editwin_get_char_at_point(owl_editwin *e);
-static int owl_editwin_replace_internal(owl_editwin *e, int replace, char *s);
-static char *oe_copy_buf(owl_editwin *e, char *buf, int len);
+static int owl_editwin_replace_internal(owl_editwin *e, int replace, const char *s);
+static const char *oe_copy_buf(owl_editwin *e, const char *buf, int len);
 static int oe_copy_region(owl_editwin *e);
 static char *oe_chunk(owl_editwin *e, int start, int end);
@@ -71 +71 @@
 }
 
-static int oe_count_glyphs(char *s)
+static int oe_count_glyphs(const char *s)
 {
   int count = 0;
-  char *p;
+  const char *p;
 
   for(p = s; *p != 0; p = g_utf8_find_next_char(p, NULL))
@@ -175 +175 @@
 }
 
-void owl_editwin_set_command(owl_editwin *e, char *command)
+void owl_editwin_set_command(owl_editwin *e, const char *command)
 {
   if(e->command) owl_free(e->command);
@@ -181 +181 @@
 }
 
-char *owl_editwin_get_command(owl_editwin *e)
+const char *owl_editwin_get_command(owl_editwin *e)
 {
   if(e->command) return e->command;
@@ -230 +230 @@
  * previous text (including locked text) will be overwritten
  */
-void owl_editwin_set_locktext(owl_editwin *e, char *text)
+void owl_editwin_set_locktext(owl_editwin *e, const char *text)
 {
   oe_set_index(e, 0);
@@ -378 +378 @@
 }
 
-static inline char *oe_next_point(owl_editwin *e, char *p)
-{
-  char *boundary = e->buff + e->bufflen + 1;
-  char *q;
+static inline const char *oe_next_point(owl_editwin *e, const char *p)
+{
+  const char *boundary = e->buff + e->bufflen + 1;
+  const char *q;
 
   q = g_utf8_find_next_char(p, boundary);
@@ -392 +392 @@
 }
 
-static inline char *oe_prev_point(owl_editwin *e, char *p)
-{
-  char *boundary = e->buff + e->lock;
+static inline const char *oe_prev_point(owl_editwin *e, const char *p)
+{
+  const char *boundary = e->buff + e->lock;
 
   p = g_utf8_find_prev_char(boundary, p);
@@ -422 +422 @@
   int width = 0, cw;
   gunichar c;
-  char *p;
+  const char *p;
 
   while(1) {
@@ -576 +576 @@
 }
 
-int owl_editwin_replace_region(owl_editwin *e, char *s)
+int owl_editwin_replace_region(owl_editwin *e, const char *s)
 {
   oe_excursion x;
@@ -594 +594 @@
 
 /* replace 'replace' characters at the point with s, returning the change in size */
-int owl_editwin_replace(owl_editwin *e, int replace, char *s)
+int owl_editwin_replace(owl_editwin *e, int replace, const char *s)
 {
   int start, end, i;
-  char *p;
+  const char *p;
 
   if (!g_utf8_validate(s, -1, NULL)) {
@@ -615 +615 @@
 }
 
-static int owl_editwin_replace_internal(owl_editwin *e, int replace, char *s)
+static int owl_editwin_replace_internal(owl_editwin *e, int replace, const char *s)
 {
   int start, end, free, need, size, change;
@@ -694 +694 @@
 void owl_editwin_transpose_chars(owl_editwin *e)
 {
-  char *middle, *end, *start, *tmp;
+  const char *middle, *end, *start;
+  char *tmp;
 
   if (e->bufflen == 0) return;
@@ -727 +728 @@
  * right
  */
-void owl_editwin_insert_string(owl_editwin *e, char *s)
+void owl_editwin_insert_string(owl_editwin *e, const char *s)
 {
   owl_editwin_replace(e, 0, s);
@@ -750 +751 @@
 int owl_editwin_point_move(owl_editwin *e, int delta)
 {
-  char *p;
+  const char *p;
   int change, d = 0;
 
@@ -800 +801 @@
 }
 
-static int owl_editwin_is_char_in(owl_editwin *e, char *set)
-{
-  char *p;
+static int owl_editwin_is_char_in(owl_editwin *e, const char *set)
+{
+  const char *p;
 
   for (p = set; *p != 0; p = g_utf8_find_next_char(p, NULL))
@@ -810 +811 @@
 }
 
-int owl_editwin_move_if_in(owl_editwin *e, int delta, char *set)
+int owl_editwin_move_if_in(owl_editwin *e, int delta, const char *set)
 {
   int change, distance = 0;
@@ -822 +823 @@
 }
 
-int owl_editwin_move_if_not_in(owl_editwin *e, int delta, char *set)
+int owl_editwin_move_if_not_in(owl_editwin *e, int delta, const char *set)
 {
   int change, distance = 0;
@@ -1029 +1030 @@
 }
 
-static char *oe_copy_buf(owl_editwin *e, char *buf, int len)
+static const char *oe_copy_buf(owl_editwin *e, const char *buf, int len)
 {
   char *p;
@@ -1047 +1048 @@
 static int oe_copy_region(owl_editwin *e)
 {
-  char *p;
+  const char *p;
   int start, end;
 
@@ -1236 +1237 @@
 static int oe_region_width(owl_editwin *e, int start, int end, int offset)
 {
-  char *p;
+  const char *p;
   int width = offset;
   
@@ -1316 +1317 @@
 }
 
-char *owl_editwin_get_text(owl_editwin *e)
+const char *owl_editwin_get_text(owl_editwin *e)
 {
   return(e->buff+e->lock);

errqueue.c

@@ -6 +6 @@
 }
 
-void owl_errqueue_append_err(owl_errqueue *eq, char *msg)
+void owl_errqueue_append_err(owl_errqueue *eq, const char *msg)
 {
   owl_list_append_element(&(eq->errlist), owl_strdup(msg));
@@ -12 +12 @@
 
 /* fmtext should already be initialized */
-void owl_errqueue_to_fmtext(owl_errqueue *eq, owl_fmtext *fm)
+void owl_errqueue_to_fmtext(const owl_errqueue *eq, owl_fmtext *fm)
 {
   int i, j;

filter.c

@@ -2 +2 @@
 #include "owl.h"
 
-int owl_filter_init_fromstring(owl_filter *f, char *name, char *string)
+int owl_filter_init_fromstring(owl_filter *f, const char *name, const char *string)
 {
   char **argv;
@@ -8 +8 @@
 
   argv=owl_parseline(string, &argc);
-  out=owl_filter_init(f, name, argc, argv);
+  out=owl_filter_init(f, name, argc, strs(argv));
   owl_parsefree(argv, argc);
   return(out);
 }
 
-int owl_filter_init(owl_filter *f, char *name, int argc, char **argv)
+int owl_filter_init(owl_filter *f, const char *name, int argc, const char *const *argv)
 {
   f->name=owl_strdup(name);
@@ -56 +56 @@
 /* A primitive expression is one without any toplevel ``and'' or ``or''s*/
 
-static owl_filterelement * owl_filter_parse_primitive_expression(int argc, char **argv, int *next)
+static owl_filterelement * owl_filter_parse_primitive_expression(int argc, const char *const *argv, int *next)
 {
   owl_filterelement *fe, *op;
@@ -112 +112 @@
 }
 
-owl_filterelement * owl_filter_parse_expression(int argc, char **argv, int *next)
+owl_filterelement * owl_filter_parse_expression(int argc, const char *const *argv, int *next)
 {
   int i = 0, skip;
@@ -151 +151 @@
 }
 
-char *owl_filter_get_name(owl_filter *f)
+const char *owl_filter_get_name(const owl_filter *f)
 {
   return(f->name);
@@ -161 +161 @@
 }
 
-int owl_filter_get_fgcolor(owl_filter *f)
+int owl_filter_get_fgcolor(const owl_filter *f)
 {
   return(f->fgcolor);
@@ -171 +171 @@
 }
 
-int owl_filter_get_bgcolor(owl_filter *f)
+int owl_filter_get_bgcolor(const owl_filter *f)
 {
   return(f->bgcolor);
@@ -181 +181 @@
 }
 
-int owl_filter_get_cachedmsgid(owl_filter *f)
+int owl_filter_get_cachedmsgid(const owl_filter *f)
 {
   return(f->cachedmsgid);
@@ -189 +189 @@
  * return 0.
  */
-int owl_filter_message_match(owl_filter *f, owl_message *m)
+int owl_filter_message_match(const owl_filter *f, const owl_message *m)
 {
   int ret;
@@ -198 +198 @@
 
 
-char* owl_filter_print(owl_filter *f)
+char* owl_filter_print(const owl_filter *f)
 {
   GString *out = g_string_new("");
@@ -231 +231 @@
 
 /* Return 1 if the filters 'a' and 'b' are equivalent, 0 otherwise */
-int owl_filter_equiv(owl_filter *a, owl_filter *b)
+int owl_filter_equiv(const owl_filter *a, const owl_filter *b)
 {
   char *buffa, *buffb;
@@ -250 +250 @@
 
 
-int owl_filter_is_toodeep(owl_filter *f)
+int owl_filter_is_toodeep(const owl_filter *f)
 {
   return owl_filterelement_is_toodeep(f, f->root);
@@ -270 +270 @@
 #ifdef OWL_INCLUDE_REG_TESTS
 
-int owl_filter_test_string(char * filt, owl_message *m, int shouldmatch) /* noproto */ {
+int owl_filter_test_string(const char * filt, const owl_message *m, int shouldmatch) /* noproto */ {
   owl_filter f;
   int ok;

filterelement.c

@@ -1 +1 @@
 #include "owl.h"
 
-static char * owl_filterelement_get_field(owl_message *m, char * field)
-{
-  char *match;
+static const char * owl_filterelement_get_field(const owl_message *m, const char * field)
+{
+  const char *match;
   if (!strcasecmp(field, "class")) {
     match=owl_message_get_class(m);
@@ -48 +48 @@
 }
 
-static int owl_filterelement_match_false(owl_filterelement *fe, owl_message *m)
+static int owl_filterelement_match_false(const owl_filterelement *fe, const owl_message *m)
 {
   return 0;
 }
 
-static int owl_filterelement_match_true(owl_filterelement *fe, owl_message *m)
+static int owl_filterelement_match_true(const owl_filterelement *fe, const owl_message *m)
 {
   return 1;
 }
 
-static int owl_filterelement_match_re(owl_filterelement *fe, owl_message *m)
-{
-  char * val = owl_filterelement_get_field(m, fe->field);
+static int owl_filterelement_match_re(const owl_filterelement *fe, const owl_message *m)
+{
+  const char * val = owl_filterelement_get_field(m, fe->field);
   return !owl_regex_compare(&(fe->re), val, NULL, NULL);
 }
 
-static int owl_filterelement_match_filter(owl_filterelement *fe, owl_message *m)
-{
-  owl_filter *subfilter;
+static int owl_filterelement_match_filter(const owl_filterelement *fe, const owl_message *m)
+{
+  const owl_filter *subfilter;
   subfilter=owl_global_get_filter(&g, fe->field);
   if (!subfilter) {
@@ -77 +77 @@
 }
 
-static int owl_filterelement_match_perl(owl_filterelement *fe, owl_message *m)
-{
-  char *subname, *perlrv;
+static int owl_filterelement_match_perl(const owl_filterelement *fe, const owl_message *m)
+{
+  const char *subname;
+  char *perlrv;
   int   tf=0;
 
@@ -96 +97 @@
 }
 
-static int owl_filterelement_match_group(owl_filterelement *fe, owl_message *m)
+static int owl_filterelement_match_group(const owl_filterelement *fe, const owl_message *m)
 {
   return owl_filterelement_match(fe->left, m);
@@ -105 +106 @@
 */
 
-static int owl_filterelement_match_and(owl_filterelement *fe, owl_message *m)
+static int owl_filterelement_match_and(const owl_filterelement *fe, const owl_message *m)
 {
   return owl_filterelement_match(fe->left, m) &&
@@ -111 +112 @@
 }
 
-static int owl_filterelement_match_or(owl_filterelement *fe, owl_message *m)
+static int owl_filterelement_match_or(const owl_filterelement *fe, const owl_message *m)
 {
   return owl_filterelement_match(fe->left, m) ||
@@ -117 +118 @@
 }
 
-static int owl_filterelement_match_not(owl_filterelement *fe, owl_message *m)
+static int owl_filterelement_match_not(const owl_filterelement *fe, const owl_message *m)
 {
   return !owl_filterelement_match(fe->left, m);
@@ -124 +125 @@
 /* Print methods */
 
-static void owl_filterelement_print_true(owl_filterelement *fe, GString *buf)
+static void owl_filterelement_print_true(const owl_filterelement *fe, GString *buf)
 {
   g_string_append(buf, "true");
 }
 
-static void owl_filterelement_print_false(owl_filterelement *fe, GString *buf)
+static void owl_filterelement_print_false(const owl_filterelement *fe, GString *buf)
 {
   g_string_append(buf, "false");
 }
 
-static void owl_filterelement_print_re(owl_filterelement *fe, GString *buf)
-{
-  char *re, *q;
+static void owl_filterelement_print_re(const owl_filterelement *fe, GString *buf)
+{
+  const char *re, *q;
   g_string_append(buf, fe->field);
   g_string_append(buf, " ");
@@ -147 +148 @@
 }
 
-static void owl_filterelement_print_filter(owl_filterelement *fe, GString *buf)
+static void owl_filterelement_print_filter(const owl_filterelement *fe, GString *buf)
 {
   g_string_append(buf, "filter ");
@@ -153 +154 @@
 }
 
-static void owl_filterelement_print_perl(owl_filterelement *fe, GString *buf)
+static void owl_filterelement_print_perl(const owl_filterelement *fe, GString *buf)
 {
   g_string_append(buf, "perl ");
@@ -159 +160 @@
 }
 
-static void owl_filterelement_print_group(owl_filterelement *fe, GString *buf)
+static void owl_filterelement_print_group(const owl_filterelement *fe, GString *buf)
 {
   g_string_append(buf, "( ");
@@ -166 +167 @@
 }
 
-static void owl_filterelement_print_or(owl_filterelement *fe, GString *buf)
+static void owl_filterelement_print_or(const owl_filterelement *fe, GString *buf)
 {
   owl_filterelement_print(fe->left, buf);
@@ -173 +174 @@
 }
 
-static void owl_filterelement_print_and(owl_filterelement *fe, GString *buf)
+static void owl_filterelement_print_and(const owl_filterelement *fe, GString *buf)
 {
   owl_filterelement_print(fe->left, buf);
@@ -180 +181 @@
 }
 
-static void owl_filterelement_print_not(owl_filterelement *fe, GString *buf)
+static void owl_filterelement_print_not(const owl_filterelement *fe, GString *buf)
 {
   g_string_append(buf, " not ");
@@ -211 +212 @@
 }
 
-int owl_filterelement_create_re(owl_filterelement *fe, char *field, char *re)
+int owl_filterelement_create_re(owl_filterelement *fe, const char *field, const char *re)
 {
   owl_filterelement_create(fe);
@@ -225 +226 @@
 }
 
-void owl_filterelement_create_filter(owl_filterelement *fe, char *name)
+void owl_filterelement_create_filter(owl_filterelement *fe, const char *name)
 {
   owl_filterelement_create(fe);
@@ -233 +234 @@
 }
 
-void owl_filterelement_create_perl(owl_filterelement *fe, char *name)
+void owl_filterelement_create_perl(owl_filterelement *fe, const char *name)
 {
   owl_filterelement_create(fe);
@@ -275 +276 @@
 }
 
-int owl_filterelement_match(owl_filterelement *fe, owl_message *m)
+int owl_filterelement_match(const owl_filterelement *fe, const owl_message *m)
 {
   if(!fe) return 0;
@@ -285 +286 @@
 static int fe_visited  = 1;
 
-int owl_filterelement_is_toodeep(owl_filter *f, owl_filterelement *fe)
+int owl_filterelement_is_toodeep(const owl_filter *f, const owl_filterelement *fe)
 {
   int rv;
@@ -299 +300 @@
 }
 
-int _owl_filterelement_is_toodeep(owl_filterelement *fe, owl_dict *seen)
+int _owl_filterelement_is_toodeep(const owl_filterelement *fe, owl_dict *seen)
 {
   int rv = 0;
-  owl_filter *f;
+  const owl_filter *f;
 
   if(fe->match_message == owl_filterelement_match_filter) {
@@ -337 +338 @@
 }
 
-void owl_filterelement_print(owl_filterelement *fe, GString *buf)
+void owl_filterelement_print(const owl_filterelement *fe, GString *buf)
 {
   if(!fe || !fe->print_elt) return;

fmtext.c

@@ -43 +43 @@
  * 'color'
  */
-void owl_fmtext_append_attr(owl_fmtext *f, char *text, char attr, short fgcolor, short bgcolor)
+void owl_fmtext_append_attr(owl_fmtext *f, const char *text, char attr, short fgcolor, short bgcolor)
 {
   char attrbuff[6];
@@ -83 +83 @@
 
 /* Append normal, uncolored text 'text' to 'f' */
-void owl_fmtext_append_normal(owl_fmtext *f, char *text)
+void owl_fmtext_append_normal(owl_fmtext *f, const char *text)
 {
   owl_fmtext_append_attr(f, text, OWL_FMTEXT_ATTR_NONE, OWL_COLOR_DEFAULT, OWL_COLOR_DEFAULT);
@@ -89 +89 @@
 
 /* Append normal, uncolored text specified by format string to 'f' */
-void owl_fmtext_appendf_normal(owl_fmtext *f, char *fmt, ...)
+void owl_fmtext_appendf_normal(owl_fmtext *f, const char *fmt, ...)
 {
   va_list ap;
@@ -103 +103 @@
 
 /* Append normal text 'text' to 'f' with color 'color' */
-void owl_fmtext_append_normal_color(owl_fmtext *f, char *text, int fgcolor, int bgcolor)
+void owl_fmtext_append_normal_color(owl_fmtext *f, const char *text, int fgcolor, int bgcolor)
 {
   owl_fmtext_append_attr(f, text, OWL_FMTEXT_ATTR_NONE, fgcolor, bgcolor);
@@ -109 +109 @@
 
 /* Append bold text 'text' to 'f' */
-void owl_fmtext_append_bold(owl_fmtext *f, char *text)
+void owl_fmtext_append_bold(owl_fmtext *f, const char *text)
 {
   owl_fmtext_append_attr(f, text, OWL_FMTEXT_ATTR_BOLD, OWL_COLOR_DEFAULT, OWL_COLOR_DEFAULT);
@@ -115 +115 @@
 
 /* Append reverse video text 'text' to 'f' */
-void owl_fmtext_append_reverse(owl_fmtext *f, char *text)
+void owl_fmtext_append_reverse(owl_fmtext *f, const char *text)
 {
   owl_fmtext_append_attr(f, text, OWL_FMTEXT_ATTR_REVERSE, OWL_COLOR_DEFAULT, OWL_COLOR_DEFAULT);
@@ -121 +121 @@
 
 /* Append reversed and bold, uncolored text 'text' to 'f' */
-void owl_fmtext_append_reversebold(owl_fmtext *f, char *text)
+void owl_fmtext_append_reversebold(owl_fmtext *f, const char *text)
 {
   owl_fmtext_append_attr(f, text, OWL_FMTEXT_ATTR_REVERSE | OWL_FMTEXT_ATTR_BOLD, OWL_COLOR_DEFAULT, OWL_COLOR_DEFAULT);
@@ -170 +170 @@
 
 /* Internal function. Scan for attribute characters. */
-void _owl_fmtext_scan_attributes(owl_fmtext *f, int start, char *attr, short *fgcolor, short *bgcolor) /*noproto*/
-{
-  char *p;
+void _owl_fmtext_scan_attributes(const owl_fmtext *f, int start, char *attr, short *fgcolor, short *bgcolor) /*noproto*/
+{
+  const char *p;
   p = strchr(f->textbuff, OWL_FMTEXT_UC_STARTBYTE_UTF8);
   while (p && p < f->textbuff + start) {
@@ -184 +184 @@
  * bytes.
  */
-void _owl_fmtext_append_fmtext(owl_fmtext *f, owl_fmtext *in, int start, int stop) /*noproto*/
+void _owl_fmtext_append_fmtext(owl_fmtext *f, const owl_fmtext *in, int start, int stop) /*noproto*/
 {
   char attrbuff[6];
@@ -230 +230 @@
 
 /* append fmtext 'in' to 'f' */
-void owl_fmtext_append_fmtext(owl_fmtext *f, owl_fmtext *in)
+void owl_fmtext_append_fmtext(owl_fmtext *f, const owl_fmtext *in)
 {
   _owl_fmtext_append_fmtext(f, in, 0, in->textlen);
@@ -248 +248 @@
  * freeing the return
  */
-char *owl_fmtext_print_plain(owl_fmtext *f)
+char *owl_fmtext_print_plain(const owl_fmtext *f)
 {
   return owl_strip_format_chars(f->textbuff);
@@ -278 +278 @@
  * must already be initiatlized with curses
  */
-void _owl_fmtext_curs_waddstr(owl_fmtext *f, WINDOW *w, int do_search) /*noproto*/
+void _owl_fmtext_curs_waddstr(const owl_fmtext *f, WINDOW *w, int do_search) /*noproto*/
 {
   /* char *tmpbuff; */
@@ -367 +367 @@
 }
 
-void owl_fmtext_curs_waddstr(owl_fmtext *f, WINDOW *w)
+void owl_fmtext_curs_waddstr(const owl_fmtext *f, WINDOW *w)
 {
   _owl_fmtext_curs_waddstr(f, w, owl_global_is_search_active(&g));
 }
 
-void owl_fmtext_curs_waddstr_without_search(owl_fmtext *f, WINDOW *w)
+void owl_fmtext_curs_waddstr_without_search(const owl_fmtext *f, WINDOW *w)
 {
   _owl_fmtext_curs_waddstr(f, w, 0);
@@ -380 +380 @@
  * 'lines' number of lines into 'out'
  */
-int owl_fmtext_truncate_lines(owl_fmtext *in, int aline, int lines, owl_fmtext *out)
-{
-  char *ptr1, *ptr2;
+int owl_fmtext_truncate_lines(const owl_fmtext *in, int aline, int lines, owl_fmtext *out)
+{
+  const char *ptr1, *ptr2;
   int i, offset;
   
@@ -424 +424 @@
  * character and stop there.
  */
-void owl_fmtext_truncate_cols(owl_fmtext *in, int acol, int bcol, owl_fmtext *out)
-{
-  char *ptr_s, *ptr_e, *ptr_c, *last;
+void owl_fmtext_truncate_cols(const owl_fmtext *in, int acol, int bcol, owl_fmtext *out)
+{
+  const char *ptr_s, *ptr_e, *ptr_c, *last;
   int col, st, padding, chwidth;
 
@@ -500 +500 @@
 
 /* Return the number of lines in 'f' */
-int owl_fmtext_num_lines(owl_fmtext *f)
+int owl_fmtext_num_lines(const owl_fmtext *f)
 {
   int lines, i;
@@ -517 +517 @@
 }
 
-char *owl_fmtext_get_text(owl_fmtext *f)
+const char *owl_fmtext_get_text(const owl_fmtext *f)
 {
   return(f->textbuff);
@@ -534 +534 @@
 
 /* Make a copy of the fmtext 'src' into 'dst' */
-void owl_fmtext_copy(owl_fmtext *dst, owl_fmtext *src)
+void owl_fmtext_copy(owl_fmtext *dst, const owl_fmtext *src)
 {
   int mallocsize;
@@ -555 +555 @@
  *  insensitive search.
  */
-int owl_fmtext_search(owl_fmtext *f, owl_regex *re)
+int owl_fmtext_search(const owl_fmtext *f, const owl_regex *re)
 {
   if (owl_regex_compare(re, f->textbuff, NULL, NULL) == 0) return(1);
@@ -565 +565 @@
  * formatting syntax to set appropriate attributes.
  */
-void owl_fmtext_append_ztext(owl_fmtext *f, char *text)
+void owl_fmtext_append_ztext(owl_fmtext *f, const char *text)
 {
   int stacksize, curattrs, curcolor;
-  char *ptr, *txtptr, *buff, *tmpptr;
+  const char *ptr, *txtptr, *tmpptr;
+  char *buff;
   int attrstack[32], chrstack[32], colorstack[32];
 
@@ -769 +770 @@
  * If format_fn is specified, passes it the list element value
  * and it will return a string which this needs to free. */
-void owl_fmtext_append_list(owl_fmtext *f, owl_list *l, char *join_with, char *(format_fn)(char *))
+void owl_fmtext_append_list(owl_fmtext *f, const owl_list *l, const char *join_with, char *(format_fn)(const char *))
 {
   int i, size;
-  char *elem;
+  const char *elem;
   char *text;
 

functions.c

@@ -13 +13 @@
 #include "owl.h"
 
-char *owl_function_command(char *cmdbuff)
+char *owl_function_command(const char *cmdbuff)
 {
   owl_function_debugmsg("executing command: %s", cmdbuff);
@@ -20 +20 @@
 }
 
-char *owl_function_command_argv(char **argv, int argc)
+char *owl_function_command_argv(const char *const *argv, int argc)
 {
   return owl_cmddict_execute_argv(owl_global_get_cmddict(&g),
@@ -27 +27 @@
 }
 
-void owl_function_command_norv(char *cmdbuff)
+void owl_function_command_norv(const char *cmdbuff)
 {
   char *rv;
@@ -34 +34 @@
 }
 
-void owl_function_command_alias(char *alias_from, char *alias_to)
+void owl_function_command_alias(const char *alias_from, const char *alias_to)
 {
   owl_cmddict_add_alias(owl_global_get_cmddict(&g), alias_from, alias_to);
 }
 
-owl_cmd *owl_function_get_cmd(char *name)
+const owl_cmd *owl_function_get_cmd(const char *name)
 {
   return owl_cmddict_find(owl_global_get_cmddict(&g), name);
@@ -60 +60 @@
 }
 
-void owl_function_show_view(char *viewname)
-{
-  owl_view *v;
+void owl_function_show_view(const char *viewname)
+{
+  const owl_view *v;
   owl_fmtext fm;
 
@@ -92 +92 @@
 }
 
-char *owl_function_style_describe(char *name) {
-  char *desc, *s;
-  owl_style *style;
+char *owl_function_style_describe(const char *name) {
+  const char *desc;
+  char *s;
+  const owl_style *style;
   style = owl_global_get_style_by_name(&g, name);
   if (style) {
@@ -107 +108 @@
 }
 
-char *owl_function_cmd_describe(char *name)
-{
-  owl_cmd *cmd = owl_cmddict_find(owl_global_get_cmddict(&g), name);
+char *owl_function_cmd_describe(const char *name)
+{
+  const owl_cmd *cmd = owl_cmddict_find(owl_global_get_cmddict(&g), name);
   if (cmd) return owl_cmd_describe(cmd);
   else return(NULL);
 }
 
-void owl_function_show_command(char *name)
+void owl_function_show_command(const char *name)
 {
   owl_function_help_for_command(name);
@@ -121 +122 @@
 void owl_function_show_license()
 {
-  char *text;
+  const char *text;
 
   text=""
@@ -167 +168 @@
 void owl_function_show_quickstart()
 {
-    char *message =
+    const char *message =
     "Move between messages with the arrow keys, and press 'r' to reply.\n"
     "For more info, press 'h' or visit http://barnowl.mit.edu/\n\n"
@@ -198 +199 @@
  * and redisplay if necessary.
  */
-void owl_function_adminmsg(char *header, char *body)
+void owl_function_adminmsg(const char *header, const char *body)
 {
   owl_message *m;
@@ -225 +226 @@
  * that.
  */
-owl_message *owl_function_make_outgoing_zephyr(char *body, char *zwriteline, char *zsig)
+owl_message *owl_function_make_outgoing_zephyr(const char *body, const char *zwriteline, const char *zsig)
 {
   owl_message *m;
@@ -246 +247 @@
  * owl_global_messagequeue_addmsg() for that .
  */
-owl_message *owl_function_make_outgoing_aim(char *body, char *to)
+owl_message *owl_function_make_outgoing_aim(const char *body, const char *to)
 {
   owl_message *m;
@@ -267 +268 @@
  * owl_global_messagequeue_addmsg() for that.
  */
-owl_message *owl_function_make_outgoing_loopback(char *body)
+owl_message *owl_function_make_outgoing_loopback(const char *body)
 {
   owl_message *m;
@@ -279 +280 @@
 }
 
-void owl_function_zwrite_setup(char *line)
+void owl_function_zwrite_setup(const char *line)
 {
   owl_editwin *e;
@@ -324 +325 @@
 }
 
-void owl_function_aimwrite_setup(char *line)
+void owl_function_aimwrite_setup(const char *line)
 {
   owl_editwin *e;
@@ -388 +389 @@
  * the message is expected to be set from the zwrite line itself
  */
-void owl_function_zwrite(char *line, char *msg)
+void owl_function_zwrite(const char *line, const char *msg)
 {
   owl_zwrite z;
-  char *mymsg;
+  const char *mymsg;
   owl_message *m;
 
@@ -428 +429 @@
  * the message is expected to be set from the zwrite line itself
  */
-void owl_function_zcrypt(char *line, char *msg)
+void owl_function_zcrypt(const char *line, const char *msg)
 {
   owl_zwrite z;
-  char *mymsg;
+  const char *mymsg;
   char *cryptmsg;
   owl_message *m;
@@ -497 +498 @@
 }
 
-void owl_function_aimwrite(char *line, char *msg)
+void owl_function_aimwrite(const char *line, const char *msg)
 {
   int ret;
-  char *to, *format_msg;
+  const char *to;
+  char *format_msg;
   owl_message *m;
 
@@ -529 +531 @@
 }
 
-void owl_function_send_aimawymsg(char *to, char *msg)
+void owl_function_send_aimawymsg(const char *to, const char *msg)
 {
   int ret;
@@ -561 +563 @@
 }
 
-void owl_function_loopwrite(char *msg)
+void owl_function_loopwrite(const char *msg)
 {
   owl_message *min, *mout;
@@ -588 +590 @@
  * If last_if_none, will stop at the last message in the view
  * if no matching messages are found.  */
-void owl_function_nextmsg_full(char *filter, int skip_deleted, int last_if_none)
+void owl_function_nextmsg_full(const char *filter, int skip_deleted, int last_if_none)
 {
   int curmsg, i, viewsize, found;
-  owl_view *v;
-  owl_filter *f = NULL;
-  owl_message *m;
+  const owl_view *v;
+  const owl_filter *f = NULL;
+  const owl_message *m;
 
   v=owl_global_get_current_view(&g);
@@ -641 +643 @@
 }
 
-void owl_function_prevmsg_full(char *filter, int skip_deleted, int first_if_none)
+void owl_function_prevmsg_full(const char *filter, int skip_deleted, int first_if_none)
 {
   int curmsg, i, viewsize, found;
-  owl_view *v;
-  owl_filter *f = NULL;
-  owl_message *m;
+  const owl_view *v;
+  const owl_filter *f = NULL;
+  const owl_message *m;
 
   v=owl_global_get_current_view(&g);
@@ -772 +774 @@
 {
   int curmsg;
-  owl_message *m;
+  const owl_message *m;
   owl_messagelist *ml;
   owl_view *v;
@@ -816 +818 @@
 {
   int oldcurmsg, curmsg;
-  owl_view *v;
+  const owl_view *v;
 
   v=owl_global_get_current_view(&g);
@@ -879 +881 @@
  * only, no error message is printed.
  */
-void owl_function_loadsubs(char *file)
+void owl_function_loadsubs(const char *file)
 {
   int ret, ret2;
-  char *foo, *path;
+  const char *foo;
+  char *path;
 
   if (file==NULL) {
@@ -911 +914 @@
 }
 
-void owl_function_loadloginsubs(char *file)
+void owl_function_loadloginsubs(const char *file)
 {
   int ret;
@@ -931 +934 @@
 }
 
-void owl_function_aimlogin(char *user, char *passwd) {
+void owl_function_aimlogin(const char *user, const char *passwd) {
   int ret;
 
@@ -1038 +1041 @@
 {
   int recwinlines, topmsg, curmsg;
-  owl_view *v;
+  const owl_view *v;
 
   v=owl_global_get_current_view(&g);
@@ -1082 +1085 @@
  * and the number of lines in the recwin.
  */
-int owl_function_calculate_topmsg_top(int direction, owl_view *v, int curmsg, int topmsg, int recwinlines)
+int owl_function_calculate_topmsg_top(int direction, const owl_view *v, int curmsg, int topmsg, int recwinlines)
 {
   return(curmsg);
 }
 
-int owl_function_calculate_topmsg_neartop(int direction, owl_view *v, int curmsg, int topmsg, int recwinlines)
+int owl_function_calculate_topmsg_neartop(int direction, const owl_view *v, int curmsg, int topmsg, int recwinlines)
 {
   if (curmsg>0 
@@ -1098 +1101 @@
 }
   
-int owl_function_calculate_topmsg_center(int direction, owl_view *v, int curmsg, int topmsg, int recwinlines)
+int owl_function_calculate_topmsg_center(int direction, const owl_view *v, int curmsg, int topmsg, int recwinlines)
 {
   int i, last, lines;
@@ -1112 +1115 @@
 }
   
-int owl_function_calculate_topmsg_paged(int direction, owl_view *v, int curmsg, int topmsg, int recwinlines, int center_on_page)
+int owl_function_calculate_topmsg_paged(int direction, const owl_view *v, int curmsg, int topmsg, int recwinlines, int center_on_page)
 {
   int i, last, lines, savey;
@@ -1152 +1155 @@
 }
 
-int owl_function_calculate_topmsg_normal(int direction, owl_view *v, int curmsg, int topmsg, int recwinlines)
+int owl_function_calculate_topmsg_normal(int direction, const owl_view *v, int curmsg, int topmsg, int recwinlines)
 {
   int savey, i, foo, y;
@@ -1233 +1236 @@
 }
 
-void owl_function_debugmsg(char *fmt, ...)
+void owl_function_debugmsg(const char *fmt, ...)
 {
   FILE *file;
@@ -1268 +1271 @@
 }
 
-int owl_function_subscribe(char *class, char *inst, char *recip)
+int owl_function_subscribe(const char *class, const char *inst, const char *recip)
 {
   int ret;
@@ -1281 +1284 @@
 }
 
-void owl_function_unsubscribe(char *class, char *inst, char *recip)
+void owl_function_unsubscribe(const char *class, const char *inst, const char *recip)
 {
   int ret;
@@ -1323 +1326 @@
 }
 
-void owl_function_popless_text(char *text)
+void owl_function_popless_text(const char *text)
 {
   owl_popwin *pw;
@@ -1340 +1343 @@
 }
 
-void owl_function_popless_fmtext(owl_fmtext *fm)
+void owl_function_popless_fmtext(const owl_fmtext *fm)
 {
   owl_popwin *pw;
@@ -1357 +1360 @@
 }
 
-void owl_function_popless_file(char *filename)
+void owl_function_popless_file(const char *filename)
 {
   owl_fmtext fm;
@@ -1408 +1411 @@
 void owl_function_info()
 {
-  owl_message *m;
+  const owl_message *m;
   owl_fmtext fm, attrfm;
-  owl_view *v;
+  const owl_view *v;
 #ifdef HAVE_LIBZEPHYR
-  ZNotice_t *n;
+  const ZNotice_t *n;
 #endif
 
@@ -1543 +1546 @@
 void owl_function_curmsg_to_popwin()
 {
-  owl_view *v;
-  owl_message *m;
-  owl_style *s;
+  const owl_view *v;
+  const owl_message *m;
+  const owl_style *s;
   owl_fmtext fm;
 
@@ -1570 +1573 @@
 
   int offset, curmsg, lines;
-  owl_view *v;
+  const owl_view *v;
   owl_message *m;
 
@@ -1662 +1665 @@
 void owl_function_printallvars()
 {
-  char *name;
+  const char *name;
   char var[LINE];
   owl_list varnames;
@@ -1692 +1695 @@
   owl_fmtext fm;  
   int i, numvarnames;
-  char *varname;
+  const char *varname;
 
   owl_fmtext_init_null(&fm);
@@ -1710 +1713 @@
 }
 
-void owl_function_show_variable(char *name)
+void owl_function_show_variable(const char *name)
 {
   owl_fmtext fm;  
@@ -1724 +1727 @@
 void owl_function_delete_by_id(int id, int flag)
 {
-  owl_messagelist *ml;
+  const owl_messagelist *ml;
   owl_message *m;
   ml = owl_global_get_msglist(&g);
@@ -1748 +1751 @@
   int i, j, count;
   owl_message *m;
-  owl_view *v;
-  owl_filter *f;
+  const owl_view *v;
+  const owl_filter *f;
 
   /* get the trash filter */
@@ -1883 +1886 @@
 {
   char *buff=NULL;
-  owl_message *m;
-  owl_filter *f;
+  const owl_message *m;
+  const owl_filter *f;
   
   if (owl_view_get_size(owl_global_get_current_view(&g))==0) {
@@ -1936 +1939 @@
 }
 
-void owl_function_zlocate(int argc, char **argv, int auth)
+void owl_function_zlocate(int argc, const char *const *argv, int auth)
 {
   owl_fmtext fm;
@@ -1955 +1958 @@
 }
 
-void owl_function_start_command(char *line)
+void owl_function_start_command(const char *line)
 {
   owl_editwin *tw;
@@ -1974 +1977 @@
 }
 
-void owl_function_start_question(char *line)
+void owl_function_start_question(const char *line)
 {
   owl_editwin *tw;
@@ -1991 +1994 @@
 }
 
-void owl_function_start_password(char *line)
+void owl_function_start_password(const char *line)
 {
   owl_editwin *tw;
@@ -2009 +2012 @@
 }
 
-char *owl_function_exec(int argc, char **argv, char *buff, int type)
+char *owl_function_exec(int argc, const char *const *argv, const char *buff, int type)
 {
   /* if type == 1 display in a popup
@@ -2016 +2019 @@
    * else display in a popup
    */
-  char *newbuff, *redirect = " 2>&1 < /dev/null";
+  const char *redirect = " 2>&1 < /dev/null";
+  char *newbuff;
   char *out, buff2[1024];
   int size;
@@ -2063 +2067 @@
 }
 
-char *owl_function_perl(int argc, char **argv, char *buff, int type)
+char *owl_function_perl(int argc, const char *const *argv, const char *buff, int type)
 {
   /* if type == 1 display in a popup
@@ -2100 +2104 @@
  * should have the pointer.
  */
-void owl_function_change_currentview_filter(char *filtname)
+void owl_function_change_currentview_filter(const char *filtname)
 {
   owl_view *v;
   owl_filter *f;
   int curid=-1, newpos, curmsg;
-  owl_message *curm=NULL;
+  const owl_message *curm=NULL;
 
   v=owl_global_get_current_view(&g);
@@ -2148 +2152 @@
  * with a new definition.
  */
-void owl_function_create_filter(int argc, char **argv)
+void owl_function_create_filter(int argc, const char *const *argv)
 {
   owl_filter *f;
-  owl_view *v;
+  const owl_view *v;
   int ret, inuse=0;
 
@@ -2240 +2244 @@
  * Returns the name of the negated filter, which the caller must free.
  */
-char *owl_function_create_negative_filter(char *filtername)
+char *owl_function_create_negative_filter(const char *filtername)
 {
   char *newname;
-  owl_filter *tmpfilt;
-  char *argv[5];
+  const owl_filter *tmpfilt;
+  const char *argv[5];
 
   owl_function_debugmsg("owl_function_create_negative_filter");
@@ -2270 +2274 @@
 void owl_function_show_filters()
 {
-  owl_list *l;
-  owl_filter *f;
+  const owl_list *l;
+  const owl_filter *f;
   int i, j;
   owl_fmtext fm;
@@ -2296 +2300 @@
 }
 
-void owl_function_show_filter(char *name)
-{
-  owl_filter *f;
+void owl_function_show_filter(const char *name)
+{
+  const owl_filter *f;
   char *buff, *tmp;
 
@@ -2315 +2319 @@
 void owl_function_show_zpunts()
 {
-  owl_filter *f;
-  owl_list *fl;
+  const owl_filter *f;
+  const owl_list *fl;
   char buff[5000];
   char *tmp;
@@ -2344 +2348 @@
  * name of the filter, which the caller must free.
  */
-char *owl_function_classinstfilt(char *c, char *i) 
+char *owl_function_classinstfilt(const char *c, const char *i) 
 {
   owl_filter *f;
@@ -2422 +2426 @@
  * the filter, which the caller must free.
  */
-char *owl_function_zuserfilt(char *user)
+char *owl_function_zuserfilt(const char *user)
 {
   owl_filter *f;
@@ -2469 +2473 @@
  * Returns the name of the filter, which the caller must free.
  */
-char *owl_function_aimuserfilt(char *user)
+char *owl_function_aimuserfilt(const char *user)
 {
   owl_filter *f;
@@ -2505 +2509 @@
 }
 
-char *owl_function_typefilt(char *type)
+char *owl_function_typefilt(const char *type)
 {
   owl_filter *f;
@@ -2541 +2545 @@
 void owl_function_delete_curview_msgs(int flag)
 {
-  owl_view *v;
+  const owl_view *v;
   int i, j;
 
@@ -2575 +2579 @@
 char *owl_function_smartfilter(int type)
 {
-  owl_view *v;
-  owl_message *m;
+  const owl_view *v;
+  const owl_message *m;
   char *zperson, *filtname=NULL;
-  char *argv[1];
+  const char *argv[1];
   
   v=owl_global_get_current_view(&g);
@@ -2647 +2651 @@
   /* Starts a zpunt command based on the current class,instance pair. 
    * If type=0, uses just class.  If type=1, uses instance as well. */
-  owl_view *v;
-  owl_message *m;
-  char *cmd, *cmdprefix, *mclass, *minst;
+  const owl_view *v;
+  const owl_message *m;
+  const char *cmdprefix, *mclass, *minst;
+  char *cmd;
   
   v=owl_global_get_current_view(&g);
@@ -2697 +2702 @@
  * be 'color'
  */
-void owl_function_color_current_filter(char *fgcolor, char *bgcolor)
-{
-  char *name;
+void owl_function_color_current_filter(const char *fgcolor, const char *bgcolor)
+{
+  const char *name;
 
   name=owl_view_get_filtname(owl_global_get_current_view(&g));
@@ -2709 +2714 @@
  * the "all" filter, return -2.  Return 0 on success
  */
-int owl_function_color_filter(char *filtname, char *fgcolor, char *bgcolor)
+int owl_function_color_filter(const char *filtname, const char *fgcolor, const char *bgcolor)
 {
   owl_filter *f;
@@ -2792 +2797 @@
  *   if direction==1 then unpunt
  */
-void owl_function_zpunt(char *class, char *inst, char *recip, int direction)
+void owl_function_zpunt(const char *class, const char *inst, const char *recip, int direction)
 {
   char *puntexpr, *classexpr, *instexpr, *recipexpr;
@@ -2839 +2844 @@
 }
 
-void owl_function_punt(char *filter, int direction)
+void owl_function_punt(const char *filter, int direction)
 {
   owl_filter *f;
@@ -2885 +2890 @@
 }
 
-void owl_function_activate_keymap(char *keymap)
+void owl_function_activate_keymap(const char *keymap)
 {
   if (!owl_keyhandler_activate(owl_global_get_keyhandler(&g), keymap)) {
@@ -2896 +2901 @@
   owl_list l;
   owl_fmtext fm;
-  owl_keymap *km;
-  owl_keyhandler *kh;
+  const owl_keymap *km;
+  const owl_keyhandler *kh;
   int i, numkm;
-  char *kmname;
+  const char *kmname;
 
   kh = owl_global_get_keyhandler(&g);
@@ -2923 +2928 @@
 }
 
-char *owl_function_keymap_summary(char *name)
-{
-  owl_keymap *km 
+char *owl_function_keymap_summary(const char *name)
+{
+  const owl_keymap *km 
     = owl_keyhandler_get_keymap(owl_global_get_keyhandler(&g), name);
   if (km) return owl_keymap_summary(km);
@@ -2932 +2937 @@
 
 /* TODO: implement for real */
-void owl_function_show_keymap(char *name)
+void owl_function_show_keymap(const char *name)
 {
   owl_fmtext fm;
-  owl_keymap *km;
+  const owl_keymap *km;
 
   owl_fmtext_init_null(&fm);
@@ -2948 +2953 @@
 }
 
-void owl_function_help_for_command(char *cmdname)
+void owl_function_help_for_command(const char *cmdname)
 {
   owl_fmtext fm;
@@ -2958 +2963 @@
 }
 
-void owl_function_search_start(char *string, int direction)
+void owl_function_search_start(const char *string, int direction)
 {
   /* direction is OWL_DIRECTION_DOWNWARDS or OWL_DIRECTION_UPWARDS or
@@ -2993 +2998 @@
    */
 
-  owl_view *v;
+  const owl_view *v;
   int viewsize, i, curmsg, start;
   owl_message *m;
@@ -3054 +3059 @@
 /* strips formatting from ztext and returns the unformatted text. 
  * caller is responsible for freeing. */
-char *owl_function_ztext_stylestrip(char *zt)
+char *owl_function_ztext_stylestrip(const char *zt)
 {
   owl_fmtext fm;
@@ -3067 +3072 @@
 
 /* Popup a buddylisting.  If filename is NULL use the default .anyone */
-void owl_function_buddylist(int aim, int zephyr, char *filename)
+void owl_function_buddylist(int aim, int zephyr, const char *filename)
 {
   int i, j, idle;
   int interrupted = 0;
   owl_fmtext fm;
-  owl_buddylist *bl;
-  owl_buddy *b;
+  const owl_buddylist *bl;
+  const owl_buddy *b;
   char *timestr;
 #ifdef HAVE_LIBZEPHYR
   int x;
   owl_list anyone;
-  char *tmp, *user;
+  const char *user;
+  char *tmp;
   ZLocations_t location[200];
   int numlocs, ret;
@@ -3126 +3132 @@
         for (i=0; i<j; i++) {
           user=owl_list_get_element(&anyone, i);
-          ret=ZLocateUser(user, &numlocs, ZAUTH);
+          ret=ZLocateUser(zstr(user), &numlocs, ZAUTH);
 
           owl_function_mask_sigint(NULL);
@@ -3183 +3189 @@
 
 /* Dump messages in the current view to the file 'filename'. */
-void owl_function_dump(char *filename) 
+void owl_function_dump(const char *filename) 
 {
   int i, j, count;
   owl_message *m;
-  owl_view *v;
+  const owl_view *v;
   FILE *file;
   char *plaintext;
@@ -3293 +3299 @@
  * startupfile.
  */
-void owl_function_addstartup(char *buff)
+void owl_function_addstartup(const char *buff)
 {
   FILE *file;
-  char *filename;
+  const char *filename;
 
   filename=owl_global_get_startupfile(&g);
@@ -3315 +3321 @@
 
 /* Remove the specified command from the startup file. */
-void owl_function_delstartup(char *buff)
-{
-  char *filename;
+void owl_function_delstartup(const char *buff)
+{
+  const char *filename;
   filename=owl_global_get_startupfile(&g);
   owl_util_file_deleteline(filename, buff, 1);
@@ -3325 +3331 @@
  * is NULL, use the default owl startup commands file.
  */
-void owl_function_source(char *filename)
+void owl_function_source(const char *filename)
 {
   char *path;
@@ -3354 +3360 @@
 }
 
-void owl_function_change_style(owl_view *v, char *stylename)
-{
-  owl_style *s;
+void owl_function_change_style(owl_view *v, const char *stylename)
+{
+  const owl_style *s;
 
   s=owl_global_get_style_by_name(&g, stylename);
@@ -3372 +3378 @@
 {
   owl_view *v;
-  owl_style *s;
+  const owl_style *s;
 
   v=owl_global_get_current_view(&g);
@@ -3388 +3394 @@
 }
 
-void owl_function_error(char *fmt, ...)
+void owl_function_error(const char *fmt, ...)
 {
   va_list ap;
   char *buff;
-  char *nl;
+  const char *nl;
 
   va_start(ap, fmt);
@@ -3410 +3416 @@
 }
 
-void owl_function_log_err(char *string)
+void owl_function_log_err(const char *string)
 {
   char *date;
@@ -3438 +3444 @@
 }
 
-void owl_function_makemsg(char *fmt, ...)
+void owl_function_makemsg(const char *fmt, ...)
 {
   va_list ap;
@@ -3468 +3474 @@
   owl_message *m;
   owl_zbuddylist *zbl;
-  char *user;
+  const char *user;
   ZLocations_t location[200];
   int numlocs, ret;
@@ -3480 +3486 @@
   for (i=0; i<j; i++) {
     user=owl_list_get_element(&anyone, i);
-    ret=ZLocateUser(user, &numlocs, ZAUTH);
+    ret=ZLocateUser(zstr(user), &numlocs, ZAUTH);
     if (ret!=ZERR_NONE) {
       owl_function_error("Error getting location for %s", user);
@@ -3519 +3525 @@
 }
 
-void owl_function_aimsearch_results(char *email, owl_list *namelist)
+void owl_function_aimsearch_results(const char *email, owl_list *namelist)
 {
   owl_fmtext fm;
@@ -3561 +3567 @@
 }
 
-void _owl_function_mark_message(owl_message *m)
+void _owl_function_mark_message(const owl_message *m)
 {
   if (m)
@@ -3569 +3575 @@
 void owl_function_mark_message()
 {
-  owl_message *m;
-  owl_view *v;
+  const owl_message *m;
+  const owl_view *v;
 
   v=owl_global_get_current_view(&g);
@@ -3589 +3595 @@
 {
   int marked_id;
-  owl_message *m;
-  owl_view *v;
+  const owl_message *m;
+  const owl_view *v;
 
   marked_id=owl_global_get_markedmsgid(&g);

global.c

@@ -168 +168 @@
 }
                          
-int owl_global_get_lines(owl_global *g) {
+int owl_global_get_lines(const owl_global *g) {
   return(g->lines);
 }
 
-int owl_global_get_cols(owl_global *g) {
+int owl_global_get_cols(const owl_global *g) {
   return(g->cols);
 }
 
-int owl_global_get_recwin_lines(owl_global *g) {
+int owl_global_get_recwin_lines(const owl_global *g) {
   return(g->recwinlines);
 }
@@ -182 +182 @@
 /* curmsg */
 
-int owl_global_get_curmsg(owl_global *g) {
+int owl_global_get_curmsg(const owl_global *g) {
   return(g->curmsg);
 }
@@ -195 +195 @@
 /* topmsg */
 
-int owl_global_get_topmsg(owl_global *g) {
+int owl_global_get_topmsg(const owl_global *g) {
   return(g->topmsg);
 }
@@ -205 +205 @@
 /* markedmsgid */
 
-int owl_global_get_markedmsgid(owl_global *g) {
+int owl_global_get_markedmsgid(const owl_global *g) {
   return(g->markedmsgid);
 }
@@ -212 +212 @@
   g->markedmsgid=i;
   /* i; index of message in the current view.
-  owl_message *m;
+  const owl_message *m;
   owl_view *v;
 
@@ -245 +245 @@
 /* curses windows */
 
-WINDOW *owl_global_get_curs_recwin(owl_global *g) {
+WINDOW *owl_global_get_curs_recwin(const owl_global *g) {
   return(g->recwin);
 }
 
-WINDOW *owl_global_get_curs_sepwin(owl_global *g) {
+WINDOW *owl_global_get_curs_sepwin(const owl_global *g) {
   return(g->sepwin);
 }
 
-WINDOW *owl_global_get_curs_msgwin(owl_global *g) {
+WINDOW *owl_global_get_curs_msgwin(const owl_global *g) {
   return(g->msgwin);
 }
 
-WINDOW *owl_global_get_curs_typwin(owl_global *g) {
+WINDOW *owl_global_get_curs_typwin(const owl_global *g) {
   return(g->typwin);
 }
@@ -263 +263 @@
 /* typwin */
 
-owl_editwin *owl_global_get_typwin(owl_global *g) {
+owl_editwin *owl_global_get_typwin(const owl_global *g) {
   return(g->tw);
 }
@@ -269 +269 @@
 /* buffercommand */
 
-void owl_global_set_buffercommand(owl_global *g, char *command) {
+void owl_global_set_buffercommand(owl_global *g, const char *command) {
   owl_editwin_set_command(owl_global_get_typwin(g), command);
 }
 
-char *owl_global_get_buffercommand(owl_global *g) {
+const char *owl_global_get_buffercommand(const owl_global *g) {
   return owl_editwin_get_command(owl_global_get_typwin(g));
 }
@@ -281 +281 @@
 }
 
-void (*owl_global_get_buffercallback(owl_global *g))(owl_editwin*) {
+void (*owl_global_get_buffercallback(const owl_global *g))(owl_editwin*) {
   return owl_editwin_get_callback(owl_global_get_typwin(g));
 }
@@ -287 +287 @@
 /* refresh */
 
-int owl_global_is_needrefresh(owl_global *g) {
+int owl_global_is_needrefresh(const owl_global *g) {
   if (g->needrefresh==1) return(1);
   return(0);
@@ -318 +318 @@
 }
 
-int owl_global_get_rightshift(owl_global *g) {
+int owl_global_get_rightshift(const owl_global *g) {
   return(g->rightshift);
 }
@@ -324 +324 @@
 /* typwin */
 
-int owl_global_is_typwin_active(owl_global *g) {
+int owl_global_is_typwin_active(const owl_global *g) {
   if (g->typwinactive==1) return(1);
   return(0);
@@ -351 +351 @@
 }
 
-char *owl_global_get_homedir(owl_global *g) {
+const char *owl_global_get_homedir(const owl_global *g) {
   if (g->homedir) return(g->homedir);
   return("/");
 }
 
-char *owl_global_get_confdir(owl_global *g) {
+const char *owl_global_get_confdir(const owl_global *g) {
   if (g->confdir) return(g->confdir);
   return("/");
@@ -364 +364 @@
  * Setting this also sets startupfile to confdir/startup
  */
-void owl_global_set_confdir(owl_global *g, char *cd) {
+void owl_global_set_confdir(owl_global *g, const char *cd) {
   free(g->confdir);
   g->confdir = owl_strdup(cd);
@@ -371 +371 @@
 }
 
-char *owl_global_get_startupfile(owl_global *g) {
+const char *owl_global_get_startupfile(const owl_global *g) {
   if(g->startupfile) return(g->startupfile);
   return("/");
 }
 
-int owl_global_get_direction(owl_global *g) {
+int owl_global_get_direction(const owl_global *g) {
   return(g->direction);
 }
@@ -394 +394 @@
 }
 
-void *owl_global_get_perlinterp(owl_global *g) {
+void *owl_global_get_perlinterp(const owl_global *g) {
   return(g->perl);
 }
 
-int owl_global_is_config_format(owl_global *g) {
+int owl_global_is_config_format(const owl_global *g) {
   if (g->config_format) return(1);
   return(0);
@@ -498 +498 @@
 /* debug */
 
-int owl_global_is_debug_fast(owl_global *g) {
+int owl_global_is_debug_fast(const owl_global *g) {
   if (g->debug) return(1);
   return(0);
@@ -505 +505 @@
 /* starttime */
 
-time_t owl_global_get_starttime(owl_global *g) {
+time_t owl_global_get_starttime(const owl_global *g) {
   return(g->starttime);
 }
 
-time_t owl_global_get_runtime(owl_global *g) {
+time_t owl_global_get_runtime(const owl_global *g) {
   return(time(NULL)-g->starttime);
 }
 
-time_t owl_global_get_lastinputtime(owl_global *g) {
+time_t owl_global_get_lastinputtime(const owl_global *g) {
   return(g->lastinputtime);
 }
@@ -521 +521 @@
 }
 
-time_t owl_global_get_idletime(owl_global *g) {
+time_t owl_global_get_idletime(const owl_global *g) {
   return(time(NULL)-g->lastinputtime);
 }
 
-void owl_global_get_runtime_string(owl_global *g, char *buff) {
+void owl_global_get_runtime_string(const owl_global *g, char *buff) {
   time_t diff;
 
@@ -534 +534 @@
 }
 
-char *owl_global_get_hostname(owl_global *g) {
+const char *owl_global_get_hostname(const owl_global *g) {
   if (g->thishost) return(g->thishost);
   return("");
@@ -549 +549 @@
 }
 
-int owl_global_get_userclue(owl_global *g) {
+int owl_global_get_userclue(const owl_global *g) {
   return(g->userclue);
 }
 
-int owl_global_is_userclue(owl_global *g, int clue) {
+int owl_global_is_userclue(const owl_global *g, int clue) {
   if (g->userclue & clue) return(1);
   return(0);
@@ -567 +567 @@
 /* vert offset */
 
-int owl_global_get_curmsg_vert_offset(owl_global *g) {
+int owl_global_get_curmsg_vert_offset(const owl_global *g) {
   return(g->curmsg_vert_offset);
 }
@@ -577 +577 @@
 /* startup args */
 
-void owl_global_set_startupargs(owl_global *g, int argc, char **argv) {
+void owl_global_set_startupargs(owl_global *g, int argc, const char *const *argv) {
   int i, len;
 
@@ -595 +595 @@
 }
 
-char *owl_global_get_startupargs(owl_global *g) {
+const char *owl_global_get_startupargs(const owl_global *g) {
   if (g->startupargs) return(g->startupargs);
   return("");
@@ -616 +616 @@
 }
 
-owl_filter *owl_global_get_filter(owl_global *g, char *name) {
+owl_filter *owl_global_get_filter(const owl_global *g, const char *name) {
   int i, j;
   owl_filter *f;
@@ -634 +634 @@
 }
 
-void owl_global_remove_filter(owl_global *g, char *name) {
+void owl_global_remove_filter(owl_global *g, const char *name) {
   int i, j;
   owl_filter *f;
@@ -663 +663 @@
 /* has colors */
 
-int owl_global_get_hascolors(owl_global *g) {
+int owl_global_get_hascolors(const owl_global *g) {
   if (g->hascolors) return(1);
   return(0);
@@ -670 +670 @@
 /* color pairs */
 
-int owl_global_get_colorpairs(owl_global *g) {
+int owl_global_get_colorpairs(const owl_global *g) {
   return(g->colorpairs);
 }
@@ -684 +684 @@
 }
 
-int owl_global_message_is_puntable(owl_global *g, owl_message *m) {
-  owl_list *pl;
+int owl_global_message_is_puntable(owl_global *g, const owl_message *m) {
+  const owl_list *pl;
   int i, j;
 
@@ -697 +697 @@
 
 int owl_global_should_followlast(owl_global *g) {
-  owl_view *v;
+  const owl_view *v;
   
   if (!owl_global_is__followlast(g)) return(0);
@@ -707 +707 @@
 }
 
-int owl_global_is_search_active(owl_global *g) {
+int owl_global_is_search_active(const owl_global *g) {
   if (owl_regex_is_set(&g->search_re)) return(1);
   return(0);
 }
 
-void owl_global_set_search_re(owl_global *g, owl_regex *re) {
+void owl_global_set_search_re(owl_global *g, const owl_regex *re) {
   if (owl_regex_is_set(&g->search_re)) {
     owl_regex_free(&g->search_re);
@@ -721 +721 @@
 }
 
-owl_regex *owl_global_get_search_re(owl_global *g) {
+const owl_regex *owl_global_get_search_re(const owl_global *g) {
   return &g->search_re;
 }
@@ -729 +729 @@
 }
 
-int owl_global_get_newmsgproc_pid(owl_global *g) {
+int owl_global_get_newmsgproc_pid(const owl_global *g) {
   return(g->newmsgproc_pid);
 }
@@ -735 +735 @@
 /* AIM stuff */
 
-int owl_global_is_aimloggedin(owl_global *g)
+int owl_global_is_aimloggedin(const owl_global *g)
 {
   if (g->aim_loggedin) return(1);
@@ -741 +741 @@
 }
 
-char *owl_global_get_aim_screenname(owl_global *g)
+const char *owl_global_get_aim_screenname(const owl_global *g)
 {
   if (owl_global_is_aimloggedin(g)) {
@@ -749 +749 @@
 }
 
-char *owl_global_get_aim_screenname_for_filters(owl_global *g)
+const char *owl_global_get_aim_screenname_for_filters(const owl_global *g)
 {
   if (owl_global_is_aimloggedin(g)) {
@@ -757 +757 @@
 }
 
-void owl_global_set_aimloggedin(owl_global *g, char *screenname)
-{
-  char *sn_escaped, *quote;
+void owl_global_set_aimloggedin(owl_global *g, const char *screenname)
+{
+  char *sn_escaped;
+  const char *quote;
   g->aim_loggedin=1;
   if (g->aim_screenname) owl_free(g->aim_screenname);
@@ -775 +776 @@
 }
 
-int owl_global_is_doaimevents(owl_global *g)
+int owl_global_is_doaimevents(const owl_global *g)
 {
   if (g->aim_doprocessing) return(1);
@@ -842 +843 @@
 /* Return the style with name 'name'.  If it does not exist return
  * NULL */
-owl_style *owl_global_get_style_by_name(owl_global *g, char *name)
+const owl_style *owl_global_get_style_by_name(const owl_global *g, const char *name)
 {
   return owl_dict_find_element(&(g->styledict), name);
@@ -849 +850 @@
 /* creates a list and fills it in with keys.  duplicates the keys, 
  * so they will need to be freed by the caller. */
-int owl_global_get_style_names(owl_global *g, owl_list *l) {
+int owl_global_get_style_names(const owl_global *g, owl_list *l) {
   return owl_dict_get_keys(&(g->styledict), l);
 }
@@ -872 +873 @@
 }
 
-int owl_global_is_haveaim(owl_global *g)
+int owl_global_is_haveaim(const owl_global *g)
 {
   if (g->haveaim) return(1);
@@ -888 +889 @@
 }
 
-int owl_global_is_ignore_aimlogin(owl_global *g)
+int owl_global_is_ignore_aimlogin(const owl_global *g)
 {
     return g->ignoreaimlogin;
@@ -898 +899 @@
 }
 
-int owl_global_is_havezephyr(owl_global *g)
+int owl_global_is_havezephyr(const owl_global *g)
 {
   if (g->havezephyr) return(1);
@@ -941 +942 @@
 }
 
-char * owl_global_intern(owl_global *g, char * string)
+const char * owl_global_intern(owl_global *g, const char * string)
 {
   return owl_obarray_insert(&(g->obarray), string);
@@ -956 +957 @@
 }
 
-int owl_global_is_interrupted(owl_global *g) {
+int owl_global_is_interrupted(const owl_global *g) {
   return g->interrupted;
 }

help.c

@@ -5 +5 @@
 {
   owl_fmtext fm;
-  char *varname;
+  const char *varname;
   owl_list varnames;
   int i, numvarnames;

history.c

@@ -15 +15 @@
 }
 
-char *owl_history_get_prev(owl_history *h)
+const char *owl_history_get_prev(owl_history *h)
 {
 
@@ -32 +32 @@
 }
 
-char *owl_history_get_next(owl_history *h)
+const char *owl_history_get_next(owl_history *h)
 {
   if (!h) return NULL;
@@ -44 +44 @@
 }
 
-void owl_history_store(owl_history *h, char *line)
+void owl_history_store(owl_history *h, const char *line)
 {
   int size;
@@ -85 +85 @@
 }
 
-int owl_history_is_touched(owl_history *h)
+int owl_history_is_touched(const owl_history *h)
 {
   if (!h) return(0);

keybinding.c

@@ -12 +12 @@
 
 /* sets up a new keybinding for a command */
-int owl_keybinding_init(owl_keybinding *kb, char *keyseq, char *command, void (*function_fn)(void), char *desc)
+int owl_keybinding_init(owl_keybinding *kb, const char *keyseq, const char *command, void (*function_fn)(void), const char *desc)
 {
   char **ktokens;
@@ -68 +68 @@
 
 /* executes a keybinding */
-void owl_keybinding_execute(owl_keybinding *kb, int j)
+void owl_keybinding_execute(const owl_keybinding *kb, int j)
 {
   if (kb->type == OWL_KEYBINDING_COMMAND && kb->command) {
@@ -95 +95 @@
 
 /* returns 0 on success */
-int owl_keybinding_tostring(owl_keybinding *kb, char *buff, int bufflen)
+int owl_keybinding_tostring(const owl_keybinding *kb, char *buff, int bufflen)
 {
   return owl_keybinding_stack_tostring(kb->keys, kb->len, buff, bufflen);
 }
 
-char *owl_keybinding_get_desc(owl_keybinding *kb)
+const char *owl_keybinding_get_desc(const owl_keybinding *kb)
 {
   return kb->desc;
@@ -106 +106 @@
 
 /* returns 0 on no match, 1 on subset match, and 2 on complete match */
-int owl_keybinding_match(owl_keybinding *kb, owl_keyhandler *kh)
+int owl_keybinding_match(const owl_keybinding *kb, const owl_keyhandler *kh)
 {
   int i;
@@ -126 +126 @@
 
 /* returns 1 if keypress sequence is the same */
-int owl_keybinding_equal(owl_keybinding *kb1, owl_keybinding *kb2)
+int owl_keybinding_equal(const owl_keybinding *kb1, const owl_keybinding *kb2)
 {
   int i;

keymap.c

@@ -3 +3 @@
 
 /* returns 0 on success */
-int owl_keymap_init(owl_keymap *km, char *name, char *desc, void (*default_fn)(owl_input), void (*prealways_fn)(owl_input), void (*postalways_fn)(owl_input))
+int owl_keymap_init(owl_keymap *km, const char *name, const char *desc, void (*default_fn)(owl_input), void (*prealways_fn)(owl_input), void (*postalways_fn)(owl_input))
 {
   if (!name || !desc) return(-1);
@@ -24 +24 @@
 }
 
-void owl_keymap_set_submap(owl_keymap *km, owl_keymap *submap)
+void owl_keymap_set_submap(owl_keymap *km, const owl_keymap *submap)
 {
   km->submap = submap;
@@ -30 +30 @@
 
 /* creates and adds a key binding */
-int owl_keymap_create_binding(owl_keymap *km, char *keyseq, char *command, void (*function_fn)(void), char *desc)
+int owl_keymap_create_binding(owl_keymap *km, const char *keyseq, const char *command, void (*function_fn)(void), const char *desc)
 {
   owl_keybinding *kb, *curkb;
@@ -54 +54 @@
 
 /* returns a summary line describing this keymap.  the caller must free. */
-char *owl_keymap_summary(owl_keymap *km)
+char *owl_keymap_summary(const owl_keymap *km)
 {
   char *s;
@@ -66 +66 @@
 
 /* Appends details about the keymap to fm */
-void owl_keymap_get_details(owl_keymap *km, owl_fmtext *fm)
+void owl_keymap_get_details(const owl_keymap *km, owl_fmtext *fm)
 {
   int i, nbindings; 
-  owl_keybinding *kb;
+  const owl_keybinding *kb;
   
   owl_fmtext_append_bold(fm, "KEYMAP - ");
@@ -102 +102 @@
   for (i=0; i<nbindings; i++) {
     char buff[100];
-    owl_cmd *cmd;
-    char *tmpdesc, *desc = "";
+    const owl_cmd *cmd;
+    const char *tmpdesc, *desc = "";
 
     kb = owl_list_get_element(&km->bindings, i);
@@ -149 +149 @@
 }
 
-owl_keymap *owl_keyhandler_create_and_add_keymap(owl_keyhandler *kh, char *name, char *desc, void (*default_fn)(owl_input), void (*prealways_fn)(owl_input), void (*postalways_fn)(owl_input))
+owl_keymap *owl_keyhandler_create_and_add_keymap(owl_keyhandler *kh, const char *name, const char *desc, void (*default_fn)(owl_input), void (*prealways_fn)(owl_input), void (*postalways_fn)(owl_input))
 {
   owl_keymap *km;
@@ -167 +167 @@
 }
 
-owl_keymap *owl_keyhandler_get_keymap(owl_keyhandler *kh, char *mapname)
+owl_keymap *owl_keyhandler_get_keymap(const owl_keyhandler *kh, const char *mapname)
 {
   return owl_dict_find_element(&kh->keymaps, mapname);
@@ -173 +173 @@
 
 /* free the list with owl_cmddict_namelist_free */
-void owl_keyhandler_get_keymap_names(owl_keyhandler *kh, owl_list *l)
+void owl_keyhandler_get_keymap_names(const owl_keyhandler *kh, owl_list *l)
 {
   owl_dict_get_keys(&kh->keymaps, l);
@@ -187 +187 @@
 /* sets the active keymap, which will also reset any key state.
  * returns the new keymap, or NULL on failure. */
-owl_keymap *owl_keyhandler_activate(owl_keyhandler *kh, char *mapname)
-{
-  owl_keymap *km;
+const owl_keymap *owl_keyhandler_activate(owl_keyhandler *kh, const char *mapname)
+{
+  const owl_keymap *km;
   if (kh->active && !strcmp(mapname, kh->active->name)) return(kh->active);
   km = owl_dict_find_element(&kh->keymaps, mapname);
@@ -202 +202 @@
 int owl_keyhandler_process(owl_keyhandler *kh, owl_input j)
 {
-  owl_keymap     *km;
-  owl_keybinding *kb;
+  const owl_keymap     *km;
+  const owl_keybinding *kb;
   int i, match;
 

keypress.c

@@ -3 +3 @@
 #include "owl.h"
 
-static struct _owl_keypress_specialmap {
+static const struct _owl_keypress_specialmap {
   int   kj;
-  char *ks;
+  const char *ks;
 } specialmap[] = {
 #ifdef KEY_CODE_YES
@@ -133 +133 @@
 {
   char kb[64], kb2[2];
-  struct _owl_keypress_specialmap *sm;
+  const struct _owl_keypress_specialmap *sm;
 
   *kb = '\0';
@@ -175 +175 @@
 
 /* returns ERR on failure, else a keycode */
-int owl_keypress_fromstring(char *kb)
+int owl_keypress_fromstring(const char *kb)
 {
-  struct _owl_keypress_specialmap *sm;
+  const struct _owl_keypress_specialmap *sm;
   int ismeta=0, isctrl=0;
   int j = ERR;

keys.c

@@ -344 +344 @@
 void owl_keys_popless_postalways(owl_input j) {
   owl_viewwin *v = owl_global_get_viewwin(&g);
-  owl_popwin *pw = owl_global_get_popwin(&g);
+  const owl_popwin *pw = owl_global_get_popwin(&g);
 
   if (pw && owl_popwin_is_active(pw) && v) {

list.c

@@ -14 +14 @@
 }
 
-int owl_list_get_size(owl_list *l)
+int owl_list_get_size(const owl_list *l)
 {
   return(l->size);
@@ -33 +33 @@
 }
 
-void *owl_list_get_element(owl_list *l, int n)
+void *owl_list_get_element(const owl_list *l, int n)
 {
   if (n>l->size-1) return(NULL);

logging.c

@@ -9 +9 @@
  * functions in this file as necessary.
  */
-void owl_log_message(owl_message *m) {
+void owl_log_message(const owl_message *m) {
   owl_function_debugmsg("owl_log_message: entering");
 
@@ -37 +37 @@
 
 /* Return 1 if we should log the given message, otherwise return 0 */
-int owl_log_shouldlog_message(owl_message *m) {
-  owl_filter *f;
+int owl_log_shouldlog_message(const owl_message *m) {
+  const owl_filter *f;
 
   /* If there's a logfilter and this message matches it, log */
@@ -70 +70 @@
 }
 
-void owl_log_zephyr(owl_message *m, FILE *file) {
+void owl_log_zephyr(const owl_message *m, FILE *file) {
     char *tmp;
     tmp=short_zuser(owl_message_get_sender(m));
@@ -82 +82 @@
 }
 
-void owl_log_aim(owl_message *m, FILE *file) {
+void owl_log_aim(const owl_message *m, FILE *file) {
     fprintf(file, "From: <%s> To: <%s>\n", owl_message_get_sender(m), owl_message_get_recipient(m));
     fprintf(file, "Time: %s\n\n", owl_message_get_timestr(m));
@@ -93 +93 @@
 }
 
-void owl_log_jabber(owl_message *m, FILE *file) {
+void owl_log_jabber(const owl_message *m, FILE *file) {
     fprintf(file, "From: <%s> To: <%s>\n",owl_message_get_sender(m), owl_message_get_recipient(m));
     fprintf(file, "Time: %s\n\n", owl_message_get_timestr(m));
@@ -99 +99 @@
 }
 
-void owl_log_generic(owl_message *m, FILE *file) {
+void owl_log_generic(const owl_message *m, FILE *file) {
     fprintf(file, "From: <%s> To: <%s>\n", owl_message_get_sender(m), owl_message_get_recipient(m));
     fprintf(file, "Time: %s\n\n", owl_message_get_timestr(m));
@@ -105 +105 @@
 }
 
-void owl_log_append(owl_message *m, char *filename) {
+void owl_log_append(const owl_message *m, const char *filename) {
     FILE *file;
     file=fopen(filename, "a");
@@ -124 +124 @@
 }
 
-void owl_log_outgoing(owl_message *m)
+void owl_log_outgoing(const owl_message *m)
 {
   char filename[MAXPATHLEN], *logpath;
@@ -171 +171 @@
 
 
-void owl_log_outgoing_zephyr_error(char *to, char *text)
+void owl_log_outgoing_zephyr_error(const char *to, const char *text)
 {
   FILE *file;
@@ -227 +227 @@
 }
 
-void owl_log_incoming(owl_message *m)
+void owl_log_incoming(const owl_message *m)
 {
   char filename[MAXPATHLEN], allfilename[MAXPATHLEN], *logpath;
-  char *frombuff=NULL, *from=NULL;
+  const char *from=NULL;
+  char *frombuff=NULL;
   int len, ch, i, personal;
 
@@ -242 +243 @@
   } else if (owl_message_is_type_jabber(m)) {
     /* This needs to be fixed to handle groupchat */
-    char* msgtype = owl_message_get_attribute_value(m,"jtype");
+    const char* msgtype = owl_message_get_attribute_value(m,"jtype");
     if (msgtype && !strcmp(msgtype,"groupchat")) {
       personal = 0;

mainwin.c

@@ -14 +14 @@
   int topmsg, curmsg, fgcolor, bgcolor;
   WINDOW *recwin;
-  owl_view *v;
-  owl_list *filtlist;
-  owl_filter *f;
+  const owl_view *v;
+  const owl_list *filtlist;
+  const owl_filter *f;
 
   recwin=owl_global_get_curs_recwin(&g);
@@ -142 +142 @@
 
 
-int owl_mainwin_is_curmsg_truncated(owl_mainwin *mw)
+int owl_mainwin_is_curmsg_truncated(const owl_mainwin *mw)
 {
   if (mw->curtruncated) return(1);
@@ -148 +148 @@
 }
 
-int owl_mainwin_is_last_msg_truncated(owl_mainwin *mw)
+int owl_mainwin_is_last_msg_truncated(const owl_mainwin *mw)
 {
   if (mw->lasttruncated) return(1);
@@ -154 +154 @@
 }
 
-int owl_mainwin_get_last_msg(owl_mainwin *mw)
+int owl_mainwin_get_last_msg(const owl_mainwin *mw)
 {
   /* return the number of the last message displayed. -1 if none */

message.c

@@ -55 +55 @@
  * name already exists, replace the old value with the new value
  */
-void owl_message_set_attribute(owl_message *m, char *attrname, const char *attrvalue)
+void owl_message_set_attribute(owl_message *m, const char *attrname, const char *attrvalue)
 {
   int i, j;
@@ -82 +82 @@
  * the attribute does not exist
  */
-char *owl_message_get_attribute_value(owl_message *m, char *attrname)
+const char *owl_message_get_attribute_value(const owl_message *m, const char *attrname)
 {
   int i, j;
@@ -107 +107 @@
  * function to indent fmtext.
  */
-void owl_message_attributes_tofmtext(owl_message *m, owl_fmtext *fm) {
+void owl_message_attributes_tofmtext(const owl_message *m, owl_fmtext *fm) {
   int i, j;
   owl_pair *p;
@@ -145 +145 @@
 void owl_message_format(owl_message *m)
 {
-  owl_style *s;
-  owl_view *v;
+  const owl_style *s;
+  const owl_view *v;
 
   if (!m->fmtext) {
@@ -159 +159 @@
 }
 
-void owl_message_set_class(owl_message *m, char *class)
+void owl_message_set_class(owl_message *m, const char *class)
 {
   owl_message_set_attribute(m, "class", class);
 }
 
-char *owl_message_get_class(owl_message *m)
-{
-  char *class;
+const char *owl_message_get_class(const owl_message *m)
+{
+  const char *class;
 
   class=owl_message_get_attribute_value(m, "class");
@@ -173 +173 @@
 }
 
-void owl_message_set_instance(owl_message *m, char *inst)
+void owl_message_set_instance(owl_message *m, const char *inst)
 {
   owl_message_set_attribute(m, "instance", inst);
 }
 
-char *owl_message_get_instance(owl_message *m)
-{
-  char *instance;
+const char *owl_message_get_instance(const owl_message *m)
+{
+  const char *instance;
 
   instance=owl_message_get_attribute_value(m, "instance");
@@ -187 +187 @@
 }
 
-void owl_message_set_sender(owl_message *m, char *sender)
+void owl_message_set_sender(owl_message *m, const char *sender)
 {
   owl_message_set_attribute(m, "sender", sender);
 }
 
-char *owl_message_get_sender(owl_message *m)
-{
-  char *sender;
+const char *owl_message_get_sender(const owl_message *m)
+{
+  const char *sender;
 
   sender=owl_message_get_attribute_value(m, "sender");
@@ -201 +201 @@
 }
 
-void owl_message_set_zsig(owl_message *m, char *zsig)
+void owl_message_set_zsig(owl_message *m, const char *zsig)
 {
   owl_message_set_attribute(m, "zsig", zsig);
 }
 
-char *owl_message_get_zsig(owl_message *m)
-{
-  char *zsig;
+const char *owl_message_get_zsig(const owl_message *m)
+{
+  const char *zsig;
 
   zsig=owl_message_get_attribute_value(m, "zsig");
@@ -215 +215 @@
 }
 
-void owl_message_set_recipient(owl_message *m, char *recip)
+void owl_message_set_recipient(owl_message *m, const char *recip)
 {
   owl_message_set_attribute(m, "recipient", recip);
 }
 
-char *owl_message_get_recipient(owl_message *m)
+const char *owl_message_get_recipient(const owl_message *m)
 {
   /* this is stupid for outgoing messages, we need to fix it. */
 
-  char *recip;
+  const char *recip;
 
   recip=owl_message_get_attribute_value(m, "recipient");
@@ -236 +236 @@
 }
 
-char *owl_message_get_realm(owl_message *m)
-{
-  char *realm;
+const char *owl_message_get_realm(const owl_message *m)
+{
+  const char *realm;
   
   realm=owl_message_get_attribute_value(m, "realm");
@@ -245 +245 @@
 }
 
-void owl_message_set_body(owl_message *m, char *body)
+void owl_message_set_body(owl_message *m, const char *body)
 {
   owl_message_set_attribute(m, "body", body);
 }
 
-char *owl_message_get_body(owl_message *m)
-{
-  char *body;
+const char *owl_message_get_body(const owl_message *m)
+{
+  const char *body;
 
   body=owl_message_get_attribute_value(m, "body");
@@ -260 +260 @@
 
 
-void owl_message_set_opcode(owl_message *m, char *opcode)
+void owl_message_set_opcode(owl_message *m, const char *opcode)
 {
   owl_message_set_attribute(m, "opcode", opcode);
 }
 
-char *owl_message_get_opcode(owl_message *m)
-{
-  char *opcode;
+const char *owl_message_get_opcode(const owl_message *m)
+{
+  const char *opcode;
 
   opcode=owl_message_get_attribute_value(m, "opcode");
@@ -286 +286 @@
 }
 
-int owl_message_is_loginout(owl_message *m)
-{
-  char *res;
+int owl_message_is_loginout(const owl_message *m)
+{
+  const char *res;
 
   res=owl_message_get_attribute_value(m, "loginout");
@@ -295 +295 @@
 }
 
-int owl_message_is_login(owl_message *m)
-{
-  char *res;
+int owl_message_is_login(const owl_message *m)
+{
+  const char *res;
 
   res=owl_message_get_attribute_value(m, "loginout");
@@ -306 +306 @@
 
 
-int owl_message_is_logout(owl_message *m)
-{
-  char *res;
+int owl_message_is_logout(const owl_message *m)
+{
+  const char *res;
 
   res=owl_message_get_attribute_value(m, "loginout");
@@ -321 +321 @@
 }
 
-int owl_message_is_private(owl_message *m)
-{
-  char *res;
+int owl_message_is_private(const owl_message *m)
+{
+  const char *res;
 
   res=owl_message_get_attribute_value(m, "isprivate");
@@ -330 +330 @@
 }
 
-char *owl_message_get_timestr(owl_message *m)
+const char *owl_message_get_timestr(const owl_message *m)
 {
   if (m->timestr) return(m->timestr);
@@ -356 +356 @@
 }
 
-void owl_message_set_type(owl_message *m, char* type)
+void owl_message_set_type(owl_message *m, const char* type)
 {
   owl_message_set_attribute(m, "type", type);
 }
 
-int owl_message_is_type(owl_message *m, char *type) {
-  char * t = owl_message_get_attribute_value(m, "type");
+int owl_message_is_type(const owl_message *m, const char *type) {
+  const char * t = owl_message_get_attribute_value(m, "type");
   if(!t) return 0;
   return !strcasecmp(t, type);
 }
                                                 
-int owl_message_is_type_admin(owl_message *m)
+int owl_message_is_type_admin(const owl_message *m)
 {
   return owl_message_is_type(m, "admin");
 }
 
-int owl_message_is_type_zephyr(owl_message *m)
+int owl_message_is_type_zephyr(const owl_message *m)
 {
   return owl_message_is_type(m, "zephyr");
 }
 
-int owl_message_is_type_aim(owl_message *m)
+int owl_message_is_type_aim(const owl_message *m)
 {
   return owl_message_is_type(m, "aim");
@@ -383 +383 @@
 
 /* XXX TODO: deprecate this */
-int owl_message_is_type_jabber(owl_message *m)
+int owl_message_is_type_jabber(const owl_message *m)
 {
   return owl_message_is_type(m, "jabber");
 }
 
-int owl_message_is_type_loopback(owl_message *m)
+int owl_message_is_type_loopback(const owl_message *m)
 {
   return owl_message_is_type(m, "loopback");
 }
 
-int owl_message_is_pseudo(owl_message *m)
+int owl_message_is_pseudo(const owl_message *m)
 {
   if (owl_message_get_attribute_value(m, "pseudo")) return(1);
@@ -399 +399 @@
 }
 
-char *owl_message_get_text(owl_message *m)
+const char *owl_message_get_text(owl_message *m)
 {
   owl_message_format(m);
@@ -425 +425 @@
 }
 
-int owl_message_is_direction_in(owl_message *m)
+int owl_message_is_direction_in(const owl_message *m)
 {
   if (m->direction==OWL_MESSAGE_DIRECTION_IN) return(1);
@@ -431 +431 @@
 }
 
-int owl_message_is_direction_out(owl_message *m)
+int owl_message_is_direction_out(const owl_message *m)
 {
   if (m->direction==OWL_MESSAGE_DIRECTION_OUT) return(1);
@@ -437 +437 @@
 }
 
-int owl_message_is_direction_none(owl_message *m)
+int owl_message_is_direction_none(const owl_message *m)
 {
   if (m->direction==OWL_MESSAGE_DIRECTION_NONE) return(1);
@@ -462 +462 @@
 }
 
-char *owl_message_get_zwriteline(owl_message *m)
-{
-  char *z = owl_message_get_attribute_value(m, "zwriteline");
+const char *owl_message_get_zwriteline(const owl_message *m)
+{
+  const char *z = owl_message_get_attribute_value(m, "zwriteline");
   if (!z) return "";
   return z;
 }
 
-void owl_message_set_zwriteline(owl_message *m, char *line)
+void owl_message_set_zwriteline(owl_message *m, const char *line)
 {
   owl_message_set_attribute(m, "zwriteline", line);
 }
 
-int owl_message_is_delete(owl_message *m)
+int owl_message_is_delete(const owl_message *m)
 {
   if (m == NULL) return(0);
@@ -482 +482 @@
 
 #ifdef HAVE_LIBZEPHYR
-ZNotice_t *owl_message_get_notice(owl_message *m)
+const ZNotice_t *owl_message_get_notice(const owl_message *m)
 {
   return(&(m->notice));
 }
 #else
-void *owl_message_get_notice(owl_message *m)
+void *owl_message_get_notice(const owl_message *m)
 {
   return(NULL);
@@ -493 +493 @@
 #endif
 
-void owl_message_set_hostname(owl_message *m, char *hostname)
+void owl_message_set_hostname(owl_message *m, const char *hostname)
 {
   m->hostname=owl_global_intern(&g, hostname);
 }
 
-char *owl_message_get_hostname(owl_message *m)
+const char *owl_message_get_hostname(const owl_message *m)
 {
   return(m->hostname);
@@ -524 +524 @@
 }
 
-int owl_message_is_personal(owl_message *m)
-{
-  owl_filter * f = owl_global_get_filter(&g, "personal");
+int owl_message_is_personal(const owl_message *m)
+{
+  const owl_filter * f = owl_global_get_filter(&g, "personal");
   if(!f) {
       owl_function_error("personal filter is not defined");
@@ -534 +534 @@
 }
 
-int owl_message_is_question(owl_message *m)
+int owl_message_is_question(const owl_message *m)
 {
   if(!owl_message_is_type_admin(m)) return 0;
@@ -541 +541 @@
 }
 
-int owl_message_is_answered(owl_message *m) {
-  char *q;
+int owl_message_is_answered(const owl_message *m) {
+  const char *q;
   if(!owl_message_is_question(m)) return 0;
   q = owl_message_get_attribute_value(m, "question");
@@ -553 +553 @@
 }
 
-int owl_message_is_mail(owl_message *m)
+int owl_message_is_mail(const owl_message *m)
 {
   if (owl_message_is_type_zephyr(m)) {
@@ -566 +566 @@
 
 /* caller must free return value. */
-char *owl_message_get_cc(owl_message *m)
-{
-  char *cur, *out, *end;
+char *owl_message_get_cc(const owl_message *m)
+{
+  const char *cur;
+  char *out, *end;
 
   cur = owl_message_get_body(m);
@@ -582 +583 @@
 
 /* caller must free return value */
-char *owl_message_get_cc_without_recipient(owl_message *m)
-{
-  char *cc, *out, *end, *user, *shortuser, *recip;
+char *owl_message_get_cc_without_recipient(const owl_message *m)
+{
+  char *cc, *out, *end, *shortuser, *recip;
+  const char *user;
 
   cc = owl_message_get_cc(m);
@@ -618 +620 @@
 }
 
-int owl_message_get_id(owl_message *m)
+int owl_message_get_id(const owl_message *m)
 {
   return(m->id);
 }
 
-char *owl_message_get_type(owl_message *m) {
-  char * type = owl_message_get_attribute_value(m, "type");
+const char *owl_message_get_type(const owl_message *m) {
+  const char * type = owl_message_get_attribute_value(m, "type");
   if(!type) {
     return "generic";
@@ -631 +633 @@
 }
 
-char *owl_message_get_direction(owl_message *m) {
+const char *owl_message_get_direction(const owl_message *m) {
   switch (m->direction) {
   case OWL_MESSAGE_DIRECTION_IN:
@@ -644 +646 @@
 }
 
-int owl_message_parse_direction(char *d) {
+int owl_message_parse_direction(const char *d) {
   if(!strcmp(d, "in")) {
     return OWL_MESSAGE_DIRECTION_IN;
@@ -655 +657 @@
 
 
-char *owl_message_get_login(owl_message *m) {
+const char *owl_message_get_login(const owl_message *m) {
   if (owl_message_is_login(m)) {
     return "login";
@@ -666 +668 @@
 
 
-char *owl_message_get_header(owl_message *m) {
+const char *owl_message_get_header(const owl_message *m) {
   return owl_message_get_attribute_value(m, "adminheader");
 }
@@ -673 +675 @@
  * case insensitive because the functions it uses are
  */
-int owl_message_search(owl_message *m, owl_regex *re)
+int owl_message_search(owl_message *m, const owl_regex *re)
 {
 
@@ -686 +688 @@
  *                 1 it's a login message
  */
-void owl_message_create_aim(owl_message *m, char *sender, char *recipient, char *text, int direction, int loginout)
+void owl_message_create_aim(owl_message *m, const char *sender, const char *recipient, const char *text, int direction, int loginout)
 {
   owl_message_init(m);
@@ -712 +714 @@
 }
 
-void owl_message_create_admin(owl_message *m, char *header, char *text)
+void owl_message_create_admin(owl_message *m, const char *header, const char *text)
 {
   owl_message_init(m);
@@ -721 +723 @@
 
 /* caller should set the direction */
-void owl_message_create_loopback(owl_message *m, char *text)
+void owl_message_create_loopback(owl_message *m, const char *text)
 {
   owl_message_init(m);
@@ -732 +734 @@
 
 #ifdef HAVE_LIBZEPHYR
-void owl_message_create_from_znotice(owl_message *m, ZNotice_t *n)
+void owl_message_create_from_znotice(owl_message *m, const ZNotice_t *n)
 {
   struct hostent *hent;
-  char *ptr, *tmp, *tmp2;
+  const char *ptr;
+  char *tmp, *tmp2;
   int len;
 
@@ -843 +846 @@
 }
 #else
-void owl_message_create_from_znotice(owl_message *m, void *n)
+void owl_message_create_from_znotice(owl_message *m, const void *n)
 {
 }
@@ -849 +852 @@
 
 /* If 'direction' is '0' it is a login message, '1' is a logout message. */
-void owl_message_create_pseudo_zlogin(owl_message *m, int direction, char *user, char *host, char *time, char *tty)
-{
-  char *longuser, *ptr;
+void owl_message_create_pseudo_zlogin(owl_message *m, int direction, const char *user, const char *host, const char *time, const char *tty)
+{
+  char *longuser;
+  const char *ptr;
 
 #ifdef HAVE_LIBZEPHYR
@@ -894 +898 @@
 }
 
-void owl_message_create_from_zwriteline(owl_message *m, char *line, char *body, char *zsig)
+void owl_message_create_from_zwriteline(owl_message *m, const char *line, const char *body, const char *zsig)
 {
   owl_zwrite z;

messagelist.c

@@ -9 +9 @@
 }
 
-int owl_messagelist_get_size(owl_messagelist *ml)
+int owl_messagelist_get_size(const owl_messagelist *ml)
 {
   return(owl_list_get_size(&(ml->list)));
 }
 
-void *owl_messagelist_get_element(owl_messagelist *ml, int n)
+void *owl_messagelist_get_element(const owl_messagelist *ml, int n)
 {
   return(owl_list_get_element(&(ml->list), n));
 }
 
-owl_message *owl_messagelist_get_by_id(owl_messagelist *ml, int target_id)
+owl_message *owl_messagelist_get_by_id(const owl_messagelist *ml, int target_id)
 {
   /* return the message with id == 'id'.  If it doesn't exist return NULL. */
@@ -90 +90 @@
 }
 
-void owl_messagelist_invalidate_formats(owl_messagelist *ml)
+void owl_messagelist_invalidate_formats(const owl_messagelist *ml)
 {
   int i, j;

obarray.c

@@ -14 +14 @@
  * the index it should be inserted at.
  */
-int owl_obarray_lookup(owl_obarray *oa, char * key, char ** val) /*noproto*/
+int owl_obarray_lookup(const owl_obarray *oa, const char * key, const char ** val) /*noproto*/
 {
   int first, last, mid;
-  char * str;
+  const char * str;
   int cmp;
 
@@ -41 +41 @@
 
 /* Returns NULL if the string doesn't exist in the obarray */
-char * owl_obarray_find(owl_obarray *oa, char * string)
+const char * owl_obarray_find(const owl_obarray *oa, const char * string)
 {
-  char *v;
+  const char *v;
   owl_obarray_lookup(oa, string, &v);
   return v;
@@ -49 +49 @@
 
 /* Inserts the string into the obarray if it doesn't exist */
-char * owl_obarray_insert(owl_obarray *oa, char * string)
+const char * owl_obarray_insert(owl_obarray *oa, const char * string)
 {
-  char *v;
+  const char *v;
   int i;
   i = owl_obarray_lookup(oa, string, &v);
   if(!v) {
-    v = owl_strdup(string);
-    owl_list_insert_element(&(oa->strings), i, v);
+    char *v2 = owl_strdup(string);
+    owl_list_insert_element(&(oa->strings), i, v2);
+    return v2;
   }
   return v;
@@ -76 +77 @@
 int owl_obarray_regtest(void) {
   int numfailed = 0;
-  char *p,*p2;
+  const char *p,*p2;
 
   owl_obarray oa;

owl.c

@@ -44 +44 @@
   int newmsgs, nexttimediff;
   struct sigaction sigact;
-  char *configfile, *tty, *perlout, *perlerr, **argvsave;
-  char *confdir;
+  const char *configfile, *tty, *const *argvsave;
+  char *perlout, *perlerr;
+  const char *confdir;
   owl_filter *f;
-  owl_style *s;
+  const owl_style *s;
   time_t nexttime, now;
   struct tm *today;
-  char *dir;
+  const char *dir;
   struct termios tio;
   owl_message *m;
@@ -58 +59 @@
 
   argcsave=argc;
-  argvsave=argv;
+  argvsave=strs(argv);
   configfile=NULL;
   confdir = NULL;
@@ -486 +487 @@
  */
 int owl_process_message(owl_message *m) {
-  owl_filter *f;
+  const owl_filter *f;
   /* if this message it on the puntlist, nuke it and continue */
   if (owl_global_message_is_puntable(&g, m)) {

owl.h

@@ -194 +194 @@
 #define LINE 2048
 
+#ifdef HAVE_LIBZEPHYR
+/* libzephyr doesn't use const, so we appease the type system with this cast. */
+static inline char *zstr(const char *str)
+{
+  return (char *)str;
+}
+#endif
+
+/* Convert char *const * into const char *const *.  This conversion is safe,
+ * and implicit in C++ (conv.qual 4) but for some reason not in C. */
+static inline const char *const *strs(char *const *pstr)
+{
+  return (const char *const *)pstr;
+}
+
 typedef struct _owl_variable {
   char *name;
@@ -203 +218 @@
   char *description;            /* detailed description */
   void *val;                    /* current value */
-  int  (*validate_fn)(struct _owl_variable *v, void *newval);
+  int  (*validate_fn)(const struct _owl_variable *v, const void *newval);
                                 /* returns 1 if newval is valid */
-  int  (*set_fn)(struct _owl_variable *v, void *newval); 
+  int  (*set_fn)(struct _owl_variable *v, const void *newval); 
                                 /* sets the variable to a value
                                  * of the appropriate type.
@@ -211 +226 @@
                                  * should make a copy. 
                                  * returns 0 on success. */
-  int  (*set_fromstring_fn)(struct _owl_variable *v, char *newval);
+  int  (*set_fromstring_fn)(struct _owl_variable *v, const char *newval);
                                 /* sets the variable to a value
                                  * of the appropriate type.
@@ -217 +232 @@
                                  * should make a copy. 
                                  * returns 0 on success. */
-  void *(*get_fn)(struct _owl_variable *v);
+  const void *(*get_fn)(const struct _owl_variable *v);
                                 /* returns a reference to the current value.
                                  * WARNING:  this approach is hard to make
                                  * thread-safe... */
-  int  (*get_tostring_fn)(struct _owl_variable *v, 
-                          char *buf, int bufsize, void *val); 
+  int  (*get_tostring_fn)(const struct _owl_variable *v, 
+                          char *buf, int bufsize, const void *val); 
                                 /* converts val to a string 
                                  * and puts into buf */
@@ -284 +299 @@
   
   /* These don't take any context */
-  char *(*cmd_args_fn)(int argc, char **argv, char *buff);  
+  char *(*cmd_args_fn)(int argc, const char *const *argv, const char *buff);  
                                 /* takes argv and the full command as buff.
                                  * caller must free return value if !NULL */
@@ -291 +306 @@
 
   /* The following also take the active context if it's valid */
-  char *(*cmd_ctxargs_fn)(void *ctx, int argc, char **argv, char *buff);  
+  char *(*cmd_ctxargs_fn)(void *ctx, int argc, const char *const *argv, const char *buff);  
                                 /* takes argv and the full command as buff.
                                  * caller must free return value if !NULL */
@@ -313 +328 @@
 
 typedef struct _owl_pair {
-  char *key;
+  const char *key;
   char *value;
 } owl_pair;
@@ -327 +342 @@
   struct _owl_fmtext_cache * fmtext;
   int delete;
-  char *hostname;
+  const char *hostname;
   owl_list attributes;            /* this is a list of pairs */
   char *timestr;
@@ -383 +398 @@
 
 typedef struct _owl_filterelement {
-  int (*match_message)(struct _owl_filterelement *fe, owl_message *m);
+  int (*match_message)(const struct _owl_filterelement *fe, const owl_message *m);
   /* Append a string representation of the filterelement onto buf*/
-  void (*print_elt)(struct _owl_filterelement *fe, GString *buf);
+  void (*print_elt)(const struct _owl_filterelement *fe, GString *buf);
   /* Operands for and,or,not*/
   struct _owl_filterelement *left, *right;
@@ -406 +421 @@
   owl_filter *filter;
   owl_messagelist ml;
-  owl_style *style;
+  const owl_style *style;
 } owl_view;
 
@@ -433 +448 @@
   char     *desc;               /* description */
   owl_list  bindings;           /* key bindings */
-  struct _owl_keymap *submap;   /* submap */
+  const struct _owl_keymap *submap;     /* submap */
   void (*default_fn)(owl_input j);      /* default action (takes a keypress) */
   void (*prealways_fn)(owl_input  j);   /* always called before a keypress is received */
@@ -441 +456 @@
 typedef struct _owl_keyhandler {
   owl_dict  keymaps;            /* dictionary of keymaps */
-  owl_keymap *active;           /* currently active keymap */
+  const owl_keymap *active;             /* currently active keymap */
   int       in_esc;             /* escape pressed? */
   int       kpstack[OWL_KEYMAP_MAXSTACK+1]; /* current stack of keypresses */

pair.c

@@ -1 +1 @@
 #include "owl.h"
 
-void owl_pair_create(owl_pair *p, char *key, char *value) {
+void owl_pair_create(owl_pair *p, const char *key, char *value) {
   p->key=key;
   p->value=value;
 }
 
-void owl_pair_set_key(owl_pair *p, char *key) {
+void owl_pair_set_key(owl_pair *p, const char *key) {
   p->key=key;
 }
@@ -14 +14 @@
 }
 
-char *owl_pair_get_key(owl_pair *p) {
+const char *owl_pair_get_key(const owl_pair *p) {
   return(p->key);
 }
 
-char *owl_pair_get_value(owl_pair *p) {
+char *owl_pair_get_value(const owl_pair *p) {
   return(p->value);
 }

perlconfig.c

@@ -14 +14 @@
 static void owl_perl_xs_init(pTHX)
 {
-  char *file = __FILE__;
+  const char *file = __FILE__;
   dXSUB_SYS;
   {
@@ -22 +22 @@
 }
 
-SV *owl_perlconfig_message2hashref(owl_message *m)
+SV *owl_perlconfig_message2hashref(const owl_message *m)
 {
   HV *h, *stash;
   SV *hr;
-  char *ptr, *blessas, *type;
+  const char *type;
+  char *ptr, *utype, *blessas;
   int i, j;
-  owl_pair *pair;
-  owl_filter *wrap;
+  const owl_pair *pair;
+  const owl_filter *wrap;
 
   if (!m) return &PL_sv_undef;
@@ -95 +96 @@
   type = owl_message_get_type(m);
   if(!type || !*type) type = "generic";
-  type = owl_strdup(type);
-  type[0] = toupper(type[0]);
-  blessas = owl_sprintf("BarnOwl::Message::%s", type);
+  utype = owl_strdup(type);
+  utype[0] = toupper(type[0]);
+  blessas = owl_sprintf("BarnOwl::Message::%s", utype);
 
   hr = newRV_noinc((SV*)h);
@@ -106 +107 @@
   }
   hr = sv_bless(hr,stash);
-  owl_free(type);
+  owl_free(utype);
   owl_free(blessas);
   return hr;
@@ -114 +115 @@
 {
   int curmsg;
-  owl_view *v;
+  const owl_view *v;
   v=owl_global_get_current_view(&g);
   if (owl_view_get_size(v) < 1) {
@@ -134 +135 @@
   HE * ent;
   I32 count, len;
-  char *key,*val;
+  const char *key,*val;
   HV * hash;
   struct tm tm;
@@ -179 +180 @@
     n->z_auth = ZAUTH_NO;
     n->z_checked_auth = 0;
-    n->z_class = owl_message_get_class(m);
-    n->z_class_inst = owl_message_get_instance(m);
-    n->z_opcode = owl_message_get_opcode(m);
-    n->z_sender = owl_message_get_sender(m);
-    n->z_recipient = owl_message_get_recipient(m);
-    n->z_default_format = "[zephyr created from perl]";
-    n->z_multinotice = "[zephyr created from perl]";
+    n->z_class = zstr(owl_message_get_class(m));
+    n->z_class_inst = zstr(owl_message_get_instance(m));
+    n->z_opcode = zstr(owl_message_get_opcode(m));
+    n->z_sender = zstr(owl_message_get_sender(m));
+    n->z_recipient = zstr(owl_message_get_recipient(m));
+    n->z_default_format = zstr("[zephyr created from perl]");
+    n->z_multinotice = zstr("[zephyr created from perl]");
     n->z_num_other_fields = 0;
     n->z_message = owl_sprintf("%s%c%s", owl_message_get_zsig(m), '\0', owl_message_get_body(m));
@@ -196 +197 @@
 /* Calls in a scalar context, passing it a hash reference.
    If return value is non-null, caller must free. */
-char *owl_perlconfig_call_with_message(char *subname, owl_message *m)
+char *owl_perlconfig_call_with_message(const char *subname, const owl_message *m)
 {
   dSP ;
@@ -245 +246 @@
    If the return value is non-null, the caller must free it.
  */
-char * owl_perlconfig_message_call_method(owl_message *m, char *method, int argc, char ** argv)
+char * owl_perlconfig_message_call_method(const owl_message *m, const char *method, int argc, const char ** argv)
 {
   dSP;
@@ -295 +296 @@
 
 
-char *owl_perlconfig_initperl(char * file, int *Pargc, char ***Pargv, char *** Penv)
+char *owl_perlconfig_initperl(const char * file, int *Pargc, char ***Pargv, char *** Penv)
 {
   int ret;
   PerlInterpreter *p;
   char *err;
-  char *args[4] = {"", "-e", "0;", NULL};
+  const char *args[4] = {"", "-e", "0;", NULL};
   AV *inc;
   char *path;
@@ -312 +313 @@
   owl_global_set_no_have_config(&g);
 
-  ret=perl_parse(p, owl_perl_xs_init, 2, args, NULL);
+  ret=perl_parse(p, owl_perl_xs_init, 2, (char **)args, NULL);
   if (ret || SvTRUE(ERRSV)) {
     err=owl_strdup(SvPV_nolen(ERRSV));
@@ -371 +372 @@
 
 /* returns whether or not a function exists */
-int owl_perlconfig_is_function(char *fn) {
+int owl_perlconfig_is_function(const char *fn) {
   if (get_cv(fn, FALSE)) return(1);
   else return(0);
@@ -377 +378 @@
 
 /* caller is responsible for freeing returned string */
-char *owl_perlconfig_execute(char *line)
+char *owl_perlconfig_execute(const char *line)
 {
   STRLEN len;
   SV *response;
-  char *out, *preout;
+  const char *preout;
+  char *out;
 
   if (!owl_global_have_config(&g)) return NULL;
@@ -406 +408 @@
 }
 
-void owl_perlconfig_getmsg(owl_message *m, char *subname)
+void owl_perlconfig_getmsg(const owl_message *m, const char *subname)
 {
   char *ptr = NULL;
@@ -417 +419 @@
 
 /* Called on all new messages; receivemsg is only called on incoming ones */
-void owl_perlconfig_newmsg(owl_message *m, char *subname)
+void owl_perlconfig_newmsg(const owl_message *m, const char *subname)
 {
   char *ptr = NULL;
@@ -427 +429 @@
 }
 
-void owl_perlconfig_new_command(char *name)
+void owl_perlconfig_new_command(const char *name)
 {
   dSP;
@@ -450 +452 @@
 }
 
-char *owl_perlconfig_perlcmd(owl_cmd *cmd, int argc, char **argv)
+char *owl_perlconfig_perlcmd(const owl_cmd *cmd, int argc, const char *const *argv)
 {
   int i, count;

perlglue.xs

@@ -32 +32 @@
 char *
 command(cmd, ...)
-        char *cmd
+        const char *cmd
         PREINIT:
                 char *rv = NULL;
-                char **argv;
+                const char **argv;
                 int i;
         CODE:
@@ -85 +85 @@
                 RETVAL
 
-char *
+const char *
 zephyr_getsender()
         CODE:
@@ -94 +94 @@
 void
 zephyr_zwrite(cmd,msg)
-        char *cmd
-        char *msg
+        const char *cmd
+        const char *msg
         PREINIT:
                 int i;
@@ -103 +103 @@
 char *
 ztext_stylestrip(ztext)
-        char *ztext
+        const char *ztext
         PREINIT:
                 char *rv = NULL;
@@ -116 +116 @@
 char *
 zephyr_smartstrip_user(in)
-        char *in
+        const char *in
         PREINIT:
                 char *rv = NULL;
@@ -157 +157 @@
 
 void admin_message(header, body) 
-        char *header
-        char *body
+        const char *header
+        const char *body
         CODE:
         {
@@ -165 +165 @@
 
 void start_question(line, callback)
-        char *line
+        const char *line
         SV *callback
         PREINIT:
@@ -181 +181 @@
 
 void start_password(line, callback)
-        char *line
+        const char *line
         SV *callback
         PREINIT:
@@ -197 +197 @@
 
 void start_edit_win(line, callback)
-        char *line
+        const char *line
         SV *callback
         PREINIT:
@@ -223 +223 @@
 
 
-char * 
+const char * 
 get_data_dir ()
         CODE:
@@ -230 +230 @@
         RETVAL
 
-char * 
+const char * 
 get_config_dir ()
         CODE:
@@ -239 +239 @@
 void
 popless_text(text) 
-        char *text
+        const char *text
         CODE:
         {
@@ -247 +247 @@
 void
 popless_ztext(text) 
-        char *text
+        const char *text
         CODE:
         {
@@ -259 +259 @@
 void
 error(text) 
-        char *text
+        const char *text
         CODE:
         {
@@ -267 +267 @@
 void
 debug(text)
-        char *text
+        const char *text
         CODE:
         {
@@ -275 +275 @@
 void
 message(text)
-        char *text
+        const char *text
         CODE:
         {
@@ -283 +283 @@
 void
 create_style(name, object)
-     char *name
+     const char *name
      SV  *object
      PREINIT:
@@ -303 +303 @@
 void
 _remove_filter(filterName)
-        char *filterName
+        const char *filterName
         CODE:
         {
@@ -315 +315 @@
 char *
 wordwrap(in, cols)
-        char *in
+        const char *in
         int cols
         PREINIT:
@@ -346 +346 @@
         PREINIT:
                 AV *filters;
-                owl_list *fl;
-                owl_filter *f;
+                const owl_list *fl;
+                const owl_filter *f;
                 int i;
         CODE:
@@ -368 +368 @@
                 AV *styles;
                 owl_list l;
-                char *name;
+                const char *name;
                 int i;
         CODE:
@@ -393 +393 @@
                 AV *vars;
                 owl_list l;
-                char *name;
+                const char *name;
                 int i;
         CODE:
@@ -448 +448 @@
 void
 new_variable_string(name, ival, summ, desc)
-        char * name
-        char * ival
-        char * summ
-        char * desc
+        const char * name
+        const char * ival
+        const char * summ
+        const char * desc
         CODE:
         owl_variable_dict_newvar_string(owl_global_get_vardict(&g),
@@ -461 +461 @@
 void
 new_variable_int(name, ival, summ, desc)
-        char * name
+        const char * name
         int ival
-        char * summ
-        char * desc
+        const char * summ
+        const char * desc
         CODE:
         owl_variable_dict_newvar_int(owl_global_get_vardict(&g),
@@ -474 +474 @@
 void
 new_variable_bool(name, ival, summ, desc)
-        char * name
+        const char * name
         int ival
-        char * summ
-        char * desc
+        const char * summ
+        const char * desc
         CODE:
         owl_variable_dict_newvar_bool(owl_global_get_vardict(&g),
@@ -520 +520 @@
 replace(count, string)
         int count;
-        char *string;
+        const char *string;
         CODE:
                 RETVAL = owl_editwin_replace(owl_global_get_typwin(&g), count, string);
@@ -536 +536 @@
 int
 replace_region(string)
-        char *string;
+        const char *string;
         CODE:
                 RETVAL = owl_editwin_replace_region(owl_global_get_typwin(&g), string);

popexec.c

@@ -9 +9 @@
 
 /* starts up popexec in a new viewwin */
-owl_popexec *owl_popexec_new(char *command)
+owl_popexec *owl_popexec_new(const char *command)
 {
   owl_popexec *pe;
@@ -61 +61 @@
   } else {
     /* in the child process */
-    char *argv[4];
     int i;
     int fdlimit = sysconf(_SC_OPEN_MAX);
@@ -72 +71 @@
     close(child_write_fd);
 
-    argv[0] = "sh";
-    argv[1] = "-c";
-    argv[2] = command;
-    argv[3] = 0;
-    execv("/bin/sh", argv);
+    execl("/bin/sh", "sh", "-c", command, (const char *)NULL);
     _exit(127);
   }

popwin.c

@@ -66 +66 @@
 }
 
-int owl_popwin_is_active(owl_popwin *pw)
+int owl_popwin_is_active(const owl_popwin *pw)
 {
   if (pw->active==1) return(1);
@@ -73 +73 @@
 
 /* this will refresh the border as well as the text area */
-int owl_popwin_refresh(owl_popwin *pw)
+int owl_popwin_refresh(const owl_popwin *pw)
 {
   touchwin(pw->borderwin);
@@ -84 +84 @@
 }
 
-WINDOW *owl_popwin_get_curswin(owl_popwin *pw)
+WINDOW *owl_popwin_get_curswin(const owl_popwin *pw)
 {
   return(pw->popwin);
 }
 
-int owl_popwin_get_lines(owl_popwin *pw)
+int owl_popwin_get_lines(const owl_popwin *pw)
 {
   return(pw->lines-2);
 }
 
-int owl_popwin_get_cols(owl_popwin *pw)
+int owl_popwin_get_cols(const owl_popwin *pw)
 {
   return(pw->cols-2);
 }
 
-int owl_popwin_needs_first_refresh(owl_popwin *pw)
+int owl_popwin_needs_first_refresh(const owl_popwin *pw)
 {
   if (pw->needsfirstrefresh) return(1);

regex.c

@@ -8 +8 @@
 }
 
-int owl_regex_create(owl_regex *re, char *string)
+int owl_regex_create(owl_regex *re, const char *string)
 {
   int ret;
   char buff1[LINE];
-  char *ptr;
+  const char *ptr;
   
   re->string=owl_strdup(string);
@@ -36 +36 @@
 }
 
-int owl_regex_create_quoted(owl_regex *re, char *string)
+int owl_regex_create_quoted(owl_regex *re, const char *string)
 {
   char *quoted;
@@ -46 +46 @@
 }
 
-int owl_regex_compare(owl_regex *re, char *string, int *start, int *end)
+int owl_regex_compare(const owl_regex *re, const char *string, int *start, int *end)
 {
   int out, ret;
@@ -68 +68 @@
 }
 
-int owl_regex_is_set(owl_regex *re)
+int owl_regex_is_set(const owl_regex *re)
 {
   if (re->string) return(1);
@@ -74 +74 @@
 }
 
-char *owl_regex_get_string(owl_regex *re)
+const char *owl_regex_get_string(const owl_regex *re)
 {
   return(re->string);
 }
 
-void owl_regex_copy(owl_regex *a, owl_regex *b)
+void owl_regex_copy(const owl_regex *a, owl_regex *b)
 {
   owl_regex_create(b, a->string);

select.c

@@ -3 +3 @@
 static int dispatch_active = 0;
 
-int _owl_select_timer_cmp(owl_timer *t1, owl_timer *t2) {
+int _owl_select_timer_cmp(const owl_timer *t1, const owl_timer *t2) {
   return t1->time - t2->time;
 }
 
-int _owl_select_timer_eq(owl_timer *t1, owl_timer *t2) {
+int _owl_select_timer_eq(const owl_timer *t1, const owl_timer *t2) {
   return t1 == t2;
 }
@@ -84 +84 @@
 {
   int i, len;
-  owl_list *dl;
-  owl_dispatch *d;
+  const owl_list *dl;
+  const owl_dispatch *d;
   
   dl = owl_global_get_dispatchlist(&g);
@@ -199 +199 @@
   int i, len, max_fd;
   owl_dispatch *d;
-  owl_list *dl;
+  const owl_list *dl;
 
   dl = owl_global_get_dispatchlist(&g);
@@ -226 +226 @@
    */
   for(i = owl_list_get_size(dl) - 1; i >= 0; i--) {
-    owl_dispatch *d = owl_list_get_element(dl, i);
+    const owl_dispatch *d = owl_list_get_element(dl, i);
     if(d->needs_gc) {
       owl_select_remove_dispatch_at(i);
@@ -237 +237 @@
   int i, len;
   owl_dispatch *d;
-  owl_list *dl;
+  const owl_list *dl;
 
   dl = owl_global_get_dispatchlist(&g);

stubgen.pl

@@ -25 +25 @@
         print "void owl_global_set_${altvarname}_off(owl_global *g) {\n";
         print "  owl_variable_set_bool_off(&g->vars, \"$varname\");\n}\n";
-        print "int owl_global_is_$altvarname(owl_global *g) {\n";
+        print "int owl_global_is_$altvarname(const owl_global *g) {\n";
         print "  return owl_variable_get_bool(&g->vars, \"$varname\");\n}\n";
     } elsif ($vartype =~ /^PATH/ or $vartype =~ /^STRING/) {
-        print "void owl_global_set_$altvarname(owl_global *g, char *text) {\n";
+        print "void owl_global_set_$altvarname(owl_global *g, const char *text) {\n";
         print "  owl_variable_set_string(&g->vars, \"$varname\", text);\n}\n";
-        print "char *owl_global_get_$altvarname(owl_global *g) {\n";
+        print "const char *owl_global_get_$altvarname(const owl_global *g) {\n";
         print "  return owl_variable_get_string(&g->vars, \"$varname\");\n}\n";
     } elsif ($vartype =~ /^INT/ or $vartype =~ /^ENUM/) {
         print "void owl_global_set_$altvarname(owl_global *g, int n) {\n";
         print "  owl_variable_set_int(&g->vars, \"$varname\", n);\n}\n";
-        print "int owl_global_get_$altvarname(owl_global *g) {\n";
+        print "int owl_global_get_$altvarname(const owl_global *g) {\n";
         print "  return owl_variable_get_int(&g->vars, \"$varname\");\n}\n";
     } 

style.c

@@ -2 +2 @@
 #include "owl.h"
 
-void owl_style_create_perl(owl_style *s, char *name, SV *obj)
+void owl_style_create_perl(owl_style *s, const char *name, SV *obj)
 {
   s->name=owl_strdup(name);
@@ -8 +8 @@
 }
 
-int owl_style_matches_name(owl_style *s, char *name)
+int owl_style_matches_name(const owl_style *s, const char *name)
 {
   if (!strcmp(s->name, name)) return(1);
@@ -14 +14 @@
 }
 
-char *owl_style_get_name(owl_style *s)
+const char *owl_style_get_name(const owl_style *s)
 {
   return(s->name);
 }
 
-char *owl_style_get_description(owl_style *s)
+const char *owl_style_get_description(const owl_style *s)
 {
   SV *sv = NULL;
@@ -39 +39 @@
  * 'fm' should already be be initialzed
  */
-void owl_style_get_formattext(owl_style *s, owl_fmtext *fm, owl_message *m)
+void owl_style_get_formattext(const owl_style *s, owl_fmtext *fm, const owl_message *m)
 {
-  char *body, *indent;
+  const char *body;
+  char *indent;
   int curlen;
 
@@ -78 +79 @@
 }
 
-int owl_style_validate(owl_style *s) {
+int owl_style_validate(const owl_style *s) {
   if (!s || !s->perlobj || !SvOK(s->perlobj)) {
     return -1;