Changeset e19eb97

Timestamp:

Aug 15, 2009, 7:08:18 PM (15 years ago)

Author:

Anders Kaseorg <andersk@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:

1077891a

Parents:

fa4562c

git-author:

Anders Kaseorg <andersk@mit.edu> (08/04/09 02:37:51)

git-committer:

Anders Kaseorg <andersk@mit.edu> (08/15/09 19:08:18)

Message:

Add const qualifiers for char * and void *.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

Files:

• aim.c (modified) (36 diffs)
• buddy.c (modified) (2 diffs)
• buddylist.c (modified) (6 diffs)
• cmd.c (modified) (10 diffs)
• commands.c (modified) (74 diffs)
• dict.c (modified) (4 diffs)
• editwin.c (modified) (22 diffs)
• errqueue.c (modified) (1 diff)
• filter.c (modified) (6 diffs)
• filterelement.c (modified) (7 diffs)
• fmtext.c (modified) (13 diffs)
• functions.c (modified) (74 diffs)
• global.c (modified) (14 diffs)
• help.c (modified) (1 diff)
• history.c (modified) (3 diffs)
• keybinding.c (modified) (2 diffs)
• keymap.c (modified) (6 diffs)
• keypress.c (modified) (2 diffs)
• logging.c (modified) (4 diffs)
• message.c (modified) (33 diffs)
• obarray.c (modified) (4 diffs)
• owl.c (modified) (1 diff)
• owl.h (modified) (8 diffs)
• pair.c (modified) (2 diffs)
• perlconfig.c (modified) (12 diffs)
• perlglue.xs (modified) (26 diffs)
• popexec.c (modified) (1 diff)
• regex.c (modified) (4 diffs)
• stubgen.pl (modified) (1 diff)
• style.c (modified) (4 diffs)
• text.c (modified) (9 diffs)
• util.c (modified) (14 diffs)
• variable.c (modified) (39 diffs)
• view.c (modified) (4 diffs)
• viewwin.c (modified) (2 diffs)
• zbuddylist.c (modified) (3 diffs)
• zcrypt.c (modified) (5 diffs)
• zephyr.c (modified) (24 diffs)
• zwrite.c (modified) (11 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);
 
@@ -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(owl_buddy *b)
 {
   if (b->name) return(b->name);

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;
@@ -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(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(owl_buddylist *bl, const char *screenname)
 {
   owl_buddy *b;

cmd.c

@@ -38 +38 @@
 }
 
-owl_cmd *owl_cmddict_find(owl_cmddict *d, char *name) {
+owl_cmd *owl_cmddict_find(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));
@@ -65 +65 @@
 }
 
-char *_owl_cmddict_execute(owl_cmddict *cd, owl_context *ctx, char **argv, int argc, char *buff) {
+char *_owl_cmddict_execute(owl_cmddict *cd, owl_context *ctx, const char *const *argv, int argc, const char *buff) {
   char *retval = NULL;
   owl_cmd *cmd;
@@ -78 +78 @@
 }
 
-char *owl_cmddict_execute(owl_cmddict *cd, owl_context *ctx, char *cmdbuff) {
+char *owl_cmddict_execute(owl_cmddict *cd, owl_context *ctx, const char *cmdbuff) {
   char **argv;
   int argc;
@@ -103 +103 @@
 }
 
-char *owl_cmddict_execute_argv(owl_cmddict *cd, owl_context *ctx, char **argv, int argc) {
+char *owl_cmddict_execute_argv(owl_cmddict *cd, owl_context *ctx, const char *const *argv, int argc) {
   char *buff, *ptr;
   int len = 0, i;
@@ -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);
@@ -167 +167 @@
 }
 
-char *owl_cmd_execute(owl_cmd *cmd, owl_cmddict *cd, owl_context *ctx, int argc, char **argv, char *cmdbuff) {
+char *owl_cmd_execute(owl_cmd *cmd, owl_cmddict *cd, owl_context *ctx, int argc, const char *const *argv, const char *cmdbuff) {
   static int alias_recurse_depth = 0;
   int ival=0;
-  char *cmdbuffargs;
+  const char *cmdbuffargs;
   char *newcmd, *rv=NULL;
 
@@ -206 +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]);
@@ -238 +238 @@
 
 /* returns a reference */
-char *owl_cmd_get_summary(owl_cmd *cmd) {
+const char *owl_cmd_get_summary(owl_cmd *cmd) {
   return cmd->summary;
 }
@@ -255 +255 @@
 
 
-void owl_cmd_get_help(owl_cmddict *d, char *name, owl_fmtext *fm) {
-  char *s;
+void owl_cmd_get_help(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)" */
@@ -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 *owl_command_aimwrite(int argc, const char *const *argv, const char *buff)
 {
   char *newbuff, *recip;
-  char **myargv;
+  const char *const *myargv;
   int i, j, myargc;
   owl_message *m;
@@ -1964 +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();
@@ -1970 +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
@@ -1998 +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;
@@ -2024 +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);
@@ -2030 +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;
@@ -2064 +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 */
@@ -2088 +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";
@@ -2136 +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);
@@ -2156 +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) {
@@ -2213 +2213 @@
     owl_function_show_quickstart();
   } else if (!strcmp(argv[1], "startup")) {
-    char *filename;
+    const char *filename;
     
     filename=owl_global_get_startupfile(&g);
@@ -2226 +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;
@@ -2239 +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;
@@ -2258 +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;
@@ -2292 +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;
@@ -2326 +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) {
@@ -2336 +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) {
@@ -2350 +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);
@@ -2356 +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);
@@ -2362 +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";
@@ -2399 +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) {
@@ -2411 +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);
@@ -2417 +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);
@@ -2423 +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;
@@ -2457 +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]);
@@ -2469 +2469 @@
 }
 
-char *owl_command_getvar(int argc, char **argv, char *buff)
+char *owl_command_getvar(int argc, const char *const *argv, const char *buff)
 {
   char tmpbuff[1024];
@@ -2483 +2483 @@
 }
 
-char *owl_command_getfilter(int argc, char **argv, char *buf)
+char *owl_command_getfilter(int argc, const char *const *argv, const char *buf)
 {
   owl_filter *f;
@@ -2497 +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;
@@ -2518 +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);
@@ -2528 +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)) {
@@ -2549 +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 */
@@ -2558 +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]);
@@ -2570 +2570 @@
 }
 
-char *owl_command_error(int argc, char **argv, char *buff)
+char *owl_command_error(int argc, const char *const *argv, const char *buff)
 {
     buff = skiptokens(buff, 1);
@@ -2577 +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);
@@ -2588 +2588 @@
   owl_message *m;
   owl_view *v;
-  char *cmd;
+  const char *cmd;
 
   v = owl_global_get_current_view(&g);
@@ -2622 +2622 @@
   owl_message *m;
   owl_view *v;
-  char *cmd;
+  const char *cmd;
 
   v = owl_global_get_current_view(&g);
@@ -2680 +2680 @@
 {
   owl_history *hist;
-  char *ptr;
+  const char *ptr;
 
   hist=owl_editwin_get_history(e);
@@ -2701 +2701 @@
 {
   owl_history *hist;
-  char *ptr;
+  const char *ptr;
 
   hist=owl_editwin_get_history(e);
@@ -2715 +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);

dict.c

@@ -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(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(owl_dict *d, const char *k) {
   int found, pos;
   found = _owl_dict_find_pos(d, k, &pos);
@@ -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;
+  const char *middle, *end, *start;
   char *tmp;
 
@@ -728 +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);
@@ -751 +751 @@
 int owl_editwin_point_move(owl_editwin *e, int delta)
 {
-  char *p;
+  const char *p;
   int change, d = 0;
 
@@ -801 +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))
@@ -811 +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;
@@ -823 +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;
@@ -1030 +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;
@@ -1048 +1048 @@
 static int oe_copy_region(owl_editwin *e)
 {
-  char *p;
+  const char *p;
   int start, end;
 
@@ -1237 +1237 @@
 static int oe_region_width(owl_editwin *e, int start, int end, int offset)
 {
-  char *p;
+  const char *p;
   int width = offset;
   
@@ -1317 +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));

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;
@@ -13 +13 @@
 }
 
-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(owl_filter *f)
 {
   return(f->name);
@@ -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, 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(owl_message *m, const char * field)
+{
+  const char *match;
   if (!strcasecmp(field, "class")) {
     match=owl_message_get_class(m);
@@ -60 +60 @@
 static int owl_filterelement_match_re(owl_filterelement *fe, owl_message *m)
 {
-  char * val = owl_filterelement_get_field(m, fe->field);
+  const char * val = owl_filterelement_get_field(m, fe->field);
   return !owl_regex_compare(&(fe->re), val, NULL, NULL);
 }
@@ -79 +79 @@
 static int owl_filterelement_match_perl(owl_filterelement *fe, owl_message *m)
 {
-  char *subname;
+  const char *subname;
   char *perlrv;
   int   tf=0;
@@ -137 +137 @@
 static void owl_filterelement_print_re(owl_filterelement *fe, GString *buf)
 {
-  char *re, *q;
+  const char *re, *q;
   g_string_append(buf, fe->field);
   g_string_append(buf, " ");
@@ -212 +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);
@@ -226 +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);
@@ -234 +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);

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);
@@ -172 +172 @@
 void _owl_fmtext_scan_attributes(owl_fmtext *f, int start, char *attr, short *fgcolor, short *bgcolor) /*noproto*/
 {
-  char *p;
+  const char *p;
   p = strchr(f->textbuff, OWL_FMTEXT_UC_STARTBYTE_UTF8);
   while (p && p < f->textbuff + start) {
@@ -382 +382 @@
 int owl_fmtext_truncate_lines(owl_fmtext *in, int aline, int lines, owl_fmtext *out)
 {
-  char *ptr1, *ptr2;
+  const char *ptr1, *ptr2;
   int i, offset;
   
@@ -426 +426 @@
 void owl_fmtext_truncate_cols(owl_fmtext *in, int acol, int bcol, owl_fmtext *out)
 {
-  char *ptr_s, *ptr_e, *ptr_c, *last;
+  const char *ptr_s, *ptr_e, *ptr_c, *last;
   int col, st, padding, chwidth;
 
@@ -517 +517 @@
 }
 
-char *owl_fmtext_get_text(owl_fmtext *f)
+const char *owl_fmtext_get_text(owl_fmtext *f)
 {
   return(f->textbuff);
@@ -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, *tmpptr;
+  const char *ptr, *txtptr, *tmpptr;
   char *buff;
   int attrstack[32], chrstack[32], colorstack[32];
@@ -770 +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, 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)
+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)
+void owl_function_show_view(const char *viewname)
 {
   owl_view *v;
@@ -92 +92 @@
 }
 
-char *owl_function_style_describe(char *name) {
-  char *desc;
+char *owl_function_style_describe(const char *name) {
+  const char *desc;
   char *s;
   owl_style *style;
@@ -108 +108 @@
 }
 
-char *owl_function_cmd_describe(char *name)
+char *owl_function_cmd_describe(const char *name)
 {
   owl_cmd *cmd = owl_cmddict_find(owl_global_get_cmddict(&g), name);
@@ -115 +115 @@
 }
 
-void owl_function_show_command(char *name)
+void owl_function_show_command(const char *name)
 {
   owl_function_help_for_command(name);
@@ -122 +122 @@
 void owl_function_show_license()
 {
-  char *text;
+  const char *text;
 
   text=""
@@ -168 +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"
@@ -199 +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;
@@ -226 +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;
@@ -247 +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;
@@ -268 +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;
@@ -280 +280 @@
 }
 
-void owl_function_zwrite_setup(char *line)
+void owl_function_zwrite_setup(const char *line)
 {
   owl_editwin *e;
@@ -325 +325 @@
 }
 
-void owl_function_aimwrite_setup(char *line)
+void owl_function_aimwrite_setup(const char *line)
 {
   owl_editwin *e;
@@ -389 +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;
 
@@ -429 +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;
@@ -498 +498 @@
 }
 
-void owl_function_aimwrite(char *line, char *msg)
+void owl_function_aimwrite(const char *line, const char *msg)
 {
   int ret;
-  char *to;
+  const char *to;
   char *format_msg;
   owl_message *m;
@@ -531 +531 @@
 }
 
-void owl_function_send_aimawymsg(char *to, char *msg)
+void owl_function_send_aimawymsg(const char *to, const char *msg)
 {
   int ret;
@@ -563 +563 @@
 }
 
-void owl_function_loopwrite(char *msg)
+void owl_function_loopwrite(const char *msg)
 {
   owl_message *min, *mout;
@@ -590 +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;
@@ -643 +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;
@@ -881 +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;
+  const char *foo;
   char *path;
 
@@ -914 +914 @@
 }
 
-void owl_function_loadloginsubs(char *file)
+void owl_function_loadloginsubs(const char *file)
 {
   int ret;
@@ -934 +934 @@
 }
 
-void owl_function_aimlogin(char *user, char *passwd) {
+void owl_function_aimlogin(const char *user, const char *passwd) {
   int ret;
 
@@ -1236 +1236 @@
 }
 
-void owl_function_debugmsg(char *fmt, ...)
+void owl_function_debugmsg(const char *fmt, ...)
 {
   FILE *file;
@@ -1271 +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;
@@ -1284 +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;
@@ -1326 +1326 @@
 }
 
-void owl_function_popless_text(char *text)
+void owl_function_popless_text(const char *text)
 {
   owl_popwin *pw;
@@ -1360 +1360 @@
 }
 
-void owl_function_popless_file(char *filename)
+void owl_function_popless_file(const char *filename)
 {
   owl_fmtext fm;
@@ -1665 +1665 @@
 void owl_function_printallvars()
 {
-  char *name;
+  const char *name;
   char var[LINE];
   owl_list varnames;
@@ -1695 +1695 @@
   owl_fmtext fm;  
   int i, numvarnames;
-  char *varname;
+  const char *varname;
 
   owl_fmtext_init_null(&fm);
@@ -1713 +1713 @@
 }
 
-void owl_function_show_variable(char *name)
+void owl_function_show_variable(const char *name)
 {
   owl_fmtext fm;  
@@ -1939 +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;
@@ -1958 +1958 @@
 }
 
-void owl_function_start_command(char *line)
+void owl_function_start_command(const char *line)
 {
   owl_editwin *tw;
@@ -1977 +1977 @@
 }
 
-void owl_function_start_question(char *line)
+void owl_function_start_question(const char *line)
 {
   owl_editwin *tw;
@@ -1994 +1994 @@
 }
 
-void owl_function_start_password(char *line)
+void owl_function_start_password(const char *line)
 {
   owl_editwin *tw;
@@ -2012 +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
@@ -2019 +2019 @@
    * else display in a popup
    */
-  char *redirect = " 2>&1 < /dev/null";
+  const char *redirect = " 2>&1 < /dev/null";
   char *newbuff;
   char *out, buff2[1024];
@@ -2067 +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
@@ -2104 +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;
@@ -2152 +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;
@@ -2244 +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 char *argv[5];
 
   owl_function_debugmsg("owl_function_create_negative_filter");
@@ -2300 +2300 @@
 }
 
-void owl_function_show_filter(char *name)
+void owl_function_show_filter(const char *name)
 {
   owl_filter *f;
@@ -2348 +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;
@@ -2426 +2426 @@
  * the filter, which the caller must free.
  */
-char *owl_function_zuserfilt(char *user)
+char *owl_function_zuserfilt(const char *user)
 {
   owl_filter *f;
@@ -2473 +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;
@@ -2509 +2509 @@
 }
 
-char *owl_function_typefilt(char *type)
+char *owl_function_typefilt(const char *type)
 {
   owl_filter *f;
@@ -2582 +2582 @@
   owl_message *m;
   char *zperson, *filtname=NULL;
-  char *argv[1];
+  const char *argv[1];
   
   v=owl_global_get_current_view(&g);
@@ -2653 +2653 @@
   owl_view *v;
   owl_message *m;
-  char *cmdprefix, *mclass, *minst;
+  const char *cmdprefix, *mclass, *minst;
   char *cmd;
   
@@ -2702 +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));
@@ -2714 +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;
@@ -2797 +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;
@@ -2844 +2844 @@
 }
 
-void owl_function_punt(char *filter, int direction)
+void owl_function_punt(const char *filter, int direction)
 {
   owl_filter *f;
@@ -2890 +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)) {
@@ -2904 +2904 @@
   owl_keyhandler *kh;
   int i, numkm;
-  char *kmname;
+  const char *kmname;
 
   kh = owl_global_get_keyhandler(&g);
@@ -2928 +2928 @@
 }
 
-char *owl_function_keymap_summary(char *name)
+char *owl_function_keymap_summary(const char *name)
 {
   owl_keymap *km 
@@ -2937 +2937 @@
 
 /* TODO: implement for real */
-void owl_function_show_keymap(char *name)
+void owl_function_show_keymap(const char *name)
 {
   owl_fmtext fm;
@@ -2953 +2953 @@
 }
 
-void owl_function_help_for_command(char *cmdname)
+void owl_function_help_for_command(const char *cmdname)
 {
   owl_fmtext fm;
@@ -2963 +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
@@ -3059 +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;
@@ -3072 +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;
@@ -3083 +3083 @@
   int x;
   owl_list anyone;
-  char *user;
+  const char *user;
   char *tmp;
   ZLocations_t location[200];
@@ -3189 +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;
@@ -3299 +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);
@@ -3321 +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);
@@ -3331 +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;
@@ -3360 +3360 @@
 }
 
-void owl_function_change_style(owl_view *v, char *stylename)
+void owl_function_change_style(owl_view *v, const char *stylename)
 {
   owl_style *s;
@@ -3394 +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);
@@ -3416 +3416 @@
 }
 
-void owl_function_log_err(char *string)
+void owl_function_log_err(const char *string)
 {
   char *date;
@@ -3444 +3444 @@
 }
 
-void owl_function_makemsg(char *fmt, ...)
+void owl_function_makemsg(const char *fmt, ...)
 {
   va_list ap;
@@ -3474 +3474 @@
   owl_message *m;
   owl_zbuddylist *zbl;
-  char *user;
+  const char *user;
   ZLocations_t location[200];
   int numlocs, ret;
@@ -3525 +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;

global.c

@@ -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(owl_global *g) {
   return owl_editwin_get_command(owl_global_get_typwin(g));
 }
@@ -351 +351 @@
 }
 
-char *owl_global_get_homedir(owl_global *g) {
+const char *owl_global_get_homedir(owl_global *g) {
   if (g->homedir) return(g->homedir);
   return("/");
 }
 
-char *owl_global_get_confdir(owl_global *g) {
+const char *owl_global_get_confdir(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(owl_global *g) {
   if(g->startupfile) return(g->startupfile);
   return("/");
@@ -534 +534 @@
 }
 
-char *owl_global_get_hostname(owl_global *g) {
+const char *owl_global_get_hostname(owl_global *g) {
   if (g->thishost) return(g->thishost);
   return("");
@@ -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(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(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;
@@ -741 +741 @@
 }
 
-char *owl_global_get_aim_screenname(owl_global *g)
+const char *owl_global_get_aim_screenname(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(owl_global *g)
 {
   if (owl_global_is_aimloggedin(g)) {
@@ -757 +757 @@
 }
 
-void owl_global_set_aimloggedin(owl_global *g, char *screenname)
+void owl_global_set_aimloggedin(owl_global *g, const char *screenname)
 {
   char *sn_escaped;
-  char *quote;
+  const char *quote;
   g->aim_loggedin=1;
   if (g->aim_screenname) owl_free(g->aim_screenname);
@@ -843 +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)
+owl_style *owl_global_get_style_by_name(owl_global *g, const char *name)
 {
   return owl_dict_find_element(&(g->styledict), name);
@@ -942 +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);

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;

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;
@@ -100 +100 @@
 }
 
-char *owl_keybinding_get_desc(owl_keybinding *kb)
+const char *owl_keybinding_get_desc(owl_keybinding *kb)
 {
   return kb->desc;

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);
@@ -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;
@@ -103 +103 @@
     char buff[100];
     owl_cmd *cmd;
-    char *tmpdesc, *desc = "";
+    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(owl_keyhandler *kh, const char *mapname)
 {
   return owl_dict_find_element(&kh->keymaps, mapname);
@@ -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 *owl_keyhandler_activate(owl_keyhandler *kh, const char *mapname)
 {
   owl_keymap *km;

keypress.c

@@ -5 +5 @@
 static struct _owl_keypress_specialmap {
   int   kj;
-  char *ks;
+  const char *ks;
 } specialmap[] = {
 #ifdef KEY_CODE_YES
@@ -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;

logging.c

@@ -105 +105 @@
 }
 
-void owl_log_append(owl_message *m, char *filename) {
+void owl_log_append(owl_message *m, const char *filename) {
     FILE *file;
     file=fopen(filename, "a");
@@ -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;
@@ -230 +230 @@
 {
   char filename[MAXPATHLEN], allfilename[MAXPATHLEN], *logpath;
-  char *from=NULL;
+  const char *from=NULL;
   char *frombuff=NULL;
   int len, ch, i, personal;
@@ -243 +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;

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(owl_message *m, const char *attrname)
 {
   int i, j;
@@ -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(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(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(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(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(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(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(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(owl_message *m)
+{
+  const char *opcode;
 
   opcode=owl_message_get_attribute_value(m, "opcode");
@@ -288 +288 @@
 int owl_message_is_loginout(owl_message *m)
 {
-  char *res;
+  const char *res;
 
   res=owl_message_get_attribute_value(m, "loginout");
@@ -297 +297 @@
 int owl_message_is_login(owl_message *m)
 {
-  char *res;
+  const char *res;
 
   res=owl_message_get_attribute_value(m, "loginout");
@@ -308 +308 @@
 int owl_message_is_logout(owl_message *m)
 {
-  char *res;
+  const char *res;
 
   res=owl_message_get_attribute_value(m, "loginout");
@@ -323 +323 @@
 int owl_message_is_private(owl_message *m)
 {
-  char *res;
+  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(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(owl_message *m, const char *type) {
+  const char * t = owl_message_get_attribute_value(m, "type");
   if(!t) return 0;
   return !strcasecmp(t, type);
@@ -399 +399 @@
 }
 
-char *owl_message_get_text(owl_message *m)
+const char *owl_message_get_text(owl_message *m)
 {
   owl_message_format(m);
@@ -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(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);
@@ -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(owl_message *m)
 {
   return(m->hostname);
@@ -542 +542 @@
 
 int owl_message_is_answered(owl_message *m) {
-  char *q;
+  const char *q;
   if(!owl_message_is_question(m)) return 0;
   q = owl_message_get_attribute_value(m, "question");
@@ -568 +568 @@
 char *owl_message_get_cc(owl_message *m)
 {
-  char *cur;
+  const char *cur;
   char *out, *end;
 
@@ -586 +586 @@
 {
   char *cc, *out, *end, *shortuser, *recip;
-  char *user;
+  const char *user;
 
   cc = owl_message_get_cc(m);
@@ -625 +625 @@
 }
 
-char *owl_message_get_type(owl_message *m) {
-  char * type = owl_message_get_attribute_value(m, "type");
+const char *owl_message_get_type(owl_message *m) {
+  const char * type = owl_message_get_attribute_value(m, "type");
   if(!type) {
     return "generic";
@@ -633 +633 @@
 }
 
-char *owl_message_get_direction(owl_message *m) {
+const char *owl_message_get_direction(owl_message *m) {
   switch (m->direction) {
   case OWL_MESSAGE_DIRECTION_IN:
@@ -646 +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;
@@ -657 +657 @@
 
 
-char *owl_message_get_login(owl_message *m) {
+const char *owl_message_get_login(owl_message *m) {
   if (owl_message_is_login(m)) {
     return "login";
@@ -668 +668 @@
 
 
-char *owl_message_get_header(owl_message *m) {
+const char *owl_message_get_header(owl_message *m) {
   return owl_message_get_attribute_value(m, "adminheader");
 }
@@ -688 +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);
@@ -714 +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);
@@ -723 +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);
@@ -737 +737 @@
 {
   struct hostent *hent;
-  char *ptr;
+  const char *ptr;
   char *tmp, *tmp2;
   int len;
@@ -852 +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)
+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;
-  char *ptr;
+  const char *ptr;
 
 #ifdef HAVE_LIBZEPHYR
@@ -898 +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;

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(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(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);
@@ -77 +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, **argvsave;
+  const char *configfile, *tty, *const *argvsave;
   char *perlout, *perlerr;
-  char *confdir;
+  const char *confdir;
   owl_filter *f;
   owl_style *s;
   time_t nexttime, now;
   struct tm *today;
-  char *dir;
+  const char *dir;
   struct termios tio;
   owl_message *m;

owl.h

@@ -202 +202 @@
 #endif
 
-/* Convert char ** into char **.  This conversion is safe,
+/* 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 char **strs(char **pstr)
+static inline const char *const *strs(char *const *pstr)
 {
-  return (char **)pstr;
+  return (const char *const *)pstr;
 }
 
@@ -218 +218 @@
   char *description;            /* detailed description */
   void *val;                    /* current value */
-  int  (*validate_fn)(struct _owl_variable *v, void *newval);
+  int  (*validate_fn)(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.
@@ -226 +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.
@@ -232 +232 @@
                                  * should make a copy. 
                                  * returns 0 on success. */
-  void *(*get_fn)(struct _owl_variable *v);
+  const void *(*get_fn)(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); 
+                          char *buf, int bufsize, const void *val); 
                                 /* converts val to a string 
                                  * and puts into buf */
@@ -299 +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 */
@@ -306 +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 */
@@ -328 +328 @@
 
 typedef struct _owl_pair {
-  char *key;
+  const char *key;
   char *value;
 } owl_pair;
@@ -342 +342 @@
   struct _owl_fmtext_cache * fmtext;
   int delete;
-  char *hostname;
+  const char *hostname;
   owl_list attributes;            /* this is a list of pairs */
   char *timestr;

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(owl_pair *p) {
   return(p->key);
 }

perlconfig.c

@@ -14 +14 @@
 static void owl_perl_xs_init(pTHX)
 {
-  char *file = __FILE__;
+  const char *file = __FILE__;
   dXSUB_SYS;
   {
@@ -26 +26 @@
   HV *h, *stash;
   SV *hr;
-  char *type;
+  const char *type;
   char *ptr, *utype, *blessas;
   int i, j;
@@ -135 +135 @@
   HE * ent;
   I32 count, len;
-  char *key,*val;
+  const char *key,*val;
   HV * hash;
   struct tm tm;
@@ -197 +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, owl_message *m)
 {
   dSP ;
@@ -246 +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(owl_message *m, const char *method, int argc, const char ** argv)
 {
   dSP;
@@ -296 +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;
@@ -372 +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);
@@ -378 +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 *preout;
+  const char *preout;
   char *out;
 
@@ -408 +408 @@
 }
 
-void owl_perlconfig_getmsg(owl_message *m, char *subname)
+void owl_perlconfig_getmsg(owl_message *m, const char *subname)
 {
   char *ptr = NULL;
@@ -419 +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(owl_message *m, const char *subname)
 {
   char *ptr = NULL;
@@ -429 +429 @@
 }
 
-void owl_perlconfig_new_command(char *name)
+void owl_perlconfig_new_command(const char *name)
 {
   dSP;
@@ -452 +452 @@
 }
 
-char *owl_perlconfig_perlcmd(owl_cmd *cmd, int argc, char **argv)
+char *owl_perlconfig_perlcmd(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:
@@ -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;

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(owl_regex *re, const char *string, int *start, int *end)
 {
   int out, ret;
@@ -74 +74 @@
 }
 
-char *owl_regex_get_string(owl_regex *re)
+const char *owl_regex_get_string(owl_regex *re)
 {
   return(re->string);

stubgen.pl

@@ -28 +28 @@
         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(owl_global *g) {\n";
         print "  return owl_variable_get_string(&g->vars, \"$varname\");\n}\n";
     } elsif ($vartype =~ /^INT/ or $vartype =~ /^ENUM/) {

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(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(owl_style *s)
 {
   return(s->name);
 }
 
-char *owl_style_get_description(owl_style *s)
+const char *owl_style_get_description(owl_style *s)
 {
   SV *sv = NULL;
@@ -41 +41 @@
 void owl_style_get_formattext(owl_style *s, owl_fmtext *fm, owl_message *m)
 {
-  char *body;
+  const char *body;
   char *indent;
   int curlen;

text.c

@@ -5 +5 @@
 #include "owl.h"
 
-void owl_text_indent(char *out, char *in, int n)
-{
-  char *ptr1, *ptr2, *last;
+void owl_text_indent(char *out, const char *in, int n)
+{
+  const char *ptr1, *ptr2, *last;
   int i;
 
@@ -29 +29 @@
 }
 
-int owl_text_num_lines(char *in)
+int owl_text_num_lines(const char *in)
 {
   int lines, i;
@@ -46 +46 @@
 
 /* caller must free the return */
-char *owl_text_htmlstrip(char *in)
-{
-  char *ptr1, *end, *ptr2, *ptr3;
+char *owl_text_htmlstrip(const char *in)
+{
+  const char *ptr1, *end, *ptr2, *ptr3;
   char *out, *out2;
 
@@ -129 +129 @@
 
 /* Caller must free return */
-char *owl_text_expand_tabs(char *in)
+char *owl_text_expand_tabs(const char *in)
 {
   int ntabs = 0;
-  char *p = in;
+  const char *p = in;
   char *ret, *out;
   int col;
@@ -166 +166 @@
 
 /* caller must free the return */
-char *owl_text_wordwrap(char *in, int col)
+char *owl_text_wordwrap(const char *in, int col)
 {
   char *out;
@@ -227 +227 @@
 
 /* return 1 if a string is only whitespace, otherwise 0 */
-int only_whitespace(char *s)
+int only_whitespace(const char *s)
 {
   if (g_utf8_validate(s,-1,NULL)) {
-    char *p;
+    const char *p;
     for(p = s; p[0]; p=g_utf8_next_char(p)) {
       if (!g_unichar_isspace(g_utf8_get_char(p))) return 0;
@@ -244 +244 @@
 }
 
-char *owl_getquoting(char *line)
+const char *owl_getquoting(const char *line)
 {
   if (line[0]=='\0') return("'");
@@ -257 +257 @@
  * Caller must free returned string.
  */
-char *owl_text_substitute(char *in, char *from, char *to)
+char *owl_text_substitute(const char *in, const char *from, const char *to)
 {
   
@@ -307 +307 @@
  * On success returns the string, on error returns NULL.
  */
-char *owl_text_quote(char *in, char *toquote, char *quotestr)
+char *owl_text_quote(const char *in, const char *toquote, const char *quotestr)
 {
   int i, x, r, place, escape;

util.c

@@ -6 +6 @@
 #include <pwd.h>
 
-void sepbar(char *in)
+void sepbar(const char *in)
 {
   char buff[1024];
@@ -13 +13 @@
   owl_view *v;
   int x, y, i;
-  char *foo, *appendtosepbar;
+  const char *foo, *appendtosepbar;
 
   sepwin=owl_global_get_curs_sepwin(&g);
@@ -125 +125 @@
 }
 
-char **atokenize(char *buffer, char *sep, int *i)
+char **atokenize(const char *buffer, const char *sep, int *i)
 {
   /* each element of return must be freed by user */
@@ -157 +157 @@
 }
 
-char *skiptokens(char *buff, int n) {
+const char *skiptokens(const char *buff, int n) {
   /* skips n tokens and returns where that would be.
    * TODO: handle quotes more sanely. */
@@ -177 +177 @@
  * duplicate slashes are removed.  Caller must free the return.
  */
-char *owl_util_makepath(char *in)
+char *owl_util_makepath(const char *in)
 {
   int i, j, x;
@@ -262 +262 @@
 }
 
-char **owl_parseline(char *line, int *argc)
+char **owl_parseline(const char *line, int *argc)
 {
   /* break a command line up into argv, argc.  The caller must free
@@ -409 +409 @@
  * if the named color is not available
  */
-int owl_util_string_to_color(char *color)
+int owl_util_string_to_color(const char *color)
 {
   int c;
@@ -439 +439 @@
 
 /* Return a string name of the given owl color */
-char *owl_util_color_to_string(int color)
+const char *owl_util_color_to_string(int color)
 {
   if (color==OWL_COLOR_BLACK)   return("black");
@@ -456 +456 @@
 char *owl_util_get_default_tty()
 {
-  char *tmp;
+  const char *tmp;
   char *out;
 
@@ -480 +480 @@
   owl_message *m;
   owl_fmtext *fm;
-  char *text, *ptr;
+  const char *text, *ptr;
   int place;
 
@@ -532 +532 @@
  * return.
  */
-char *owl_util_stripnewlines(char *in)
+char *owl_util_stripnewlines(const char *in)
 {
   
@@ -558 +558 @@
  * memory.
  */
-void owl_util_file_deleteline(char *filename, char *line, int backup)
+void owl_util_file_deleteline(const char *filename, const char *line, int backup)
 {
   char buff[LINE], *text;
@@ -646 +646 @@
    The caller is responsible for freeing the allocated string.
 */
-char * owl_util_baseclass(char * class)
+char * owl_util_baseclass(const char * class)
 {
   char *start, *end;
@@ -664 +664 @@
 }
 
-char * owl_get_datadir()
-{
-  char * datadir = getenv("BARNOWL_DATA_DIR");
+const char * owl_get_datadir()
+{
+  const char * datadir = getenv("BARNOWL_DATA_DIR");
   if(datadir != NULL)
     return datadir;

variable.c

@@ -375 +375 @@
 /* commonly useful */
 
-int owl_variable_int_validate_gt0(owl_variable *v, void *newval)
+int owl_variable_int_validate_gt0(owl_variable *v, const void *newval)
 {
   if (newval == NULL) return(0);
@@ -382 +382 @@
 }
 
-int owl_variable_int_validate_positive(owl_variable *v, void *newval)
+int owl_variable_int_validate_positive(owl_variable *v, const void *newval)
 {
   if (newval == NULL) return(0);
@@ -390 +390 @@
 
 /* typewinsize */
-int owl_variable_typewinsize_set(owl_variable *v, void *newval)
+int owl_variable_typewinsize_set(owl_variable *v, const void *newval)
 {
   int rv;
@@ -399 +399 @@
 
 /* debug (cache value in g->debug) */
-int owl_variable_debug_set(owl_variable *v, void *newval)
+int owl_variable_debug_set(owl_variable *v, const void *newval)
 {
   if (newval && (*(const int*)newval == 1 || *(const int*)newval == 0)) {
@@ -408 +408 @@
 
 /* When 'aaway' is changed, need to notify the AIM server */
-int owl_variable_aaway_set(owl_variable *v, void *newval)
+int owl_variable_aaway_set(owl_variable *v, const void *newval)
 {
   if (newval) {
@@ -420 +420 @@
 }
 
-int owl_variable_pseudologins_set(owl_variable *v, void *newval)
+int owl_variable_pseudologins_set(owl_variable *v, const void *newval)
 {
   if (newval) {
@@ -432 +432 @@
 /* note that changing the value of this will clobber 
  * any user setting of this */
-int owl_variable_disable_ctrl_d_set(owl_variable *v, void *newval)
+int owl_variable_disable_ctrl_d_set(owl_variable *v, const void *newval)
 {
 
@@ -449 +449 @@
 }
 
-int owl_variable_tty_set(owl_variable *v, void *newval)
+int owl_variable_tty_set(owl_variable *v, const void *newval)
 {
   owl_zephyr_set_locationinfo(owl_global_get_hostname(&g), newval);
@@ -531 +531 @@
 }
 
-owl_variable * owl_variable_newvar(char *name, char *summary, char * description) {
+owl_variable * owl_variable_newvar(const char *name, const char *summary, const char * description) {
   owl_variable * var = owl_malloc(sizeof(owl_variable));
   memset(var, 0, sizeof(owl_variable));
@@ -540 +540 @@
 }
 
-void owl_variable_update(owl_variable *var, char *summary, char *desc) {
+void owl_variable_update(owl_variable *var, const char *summary, const char *desc) {
   if(var->summary) owl_free(var->summary);
   var->summary = owl_strdup(summary);
@@ -547 +547 @@
 }
 
-void owl_variable_dict_newvar_string(owl_vardict * vd, char *name, char *summ, char * desc, char * initval) {
+void owl_variable_dict_newvar_string(owl_vardict * vd, const char *name, const char *summ, const char * desc, const char * initval) {
   owl_variable *old = owl_variable_get_var(vd, name, OWL_VARIABLE_STRING);
   if(old) {
@@ -567 +567 @@
 }
 
-void owl_variable_dict_newvar_int(owl_vardict * vd, char *name, char *summ, char * desc, int initval) {
+void owl_variable_dict_newvar_int(owl_vardict * vd, const char *name, const char *summ, const char * desc, int initval) {
   owl_variable *old = owl_variable_get_var(vd, name, OWL_VARIABLE_INT);
   if(old) {
@@ -588 +588 @@
 }
 
-void owl_variable_dict_newvar_bool(owl_vardict * vd, char *name, char *summ, char * desc, int initval) {
+void owl_variable_dict_newvar_bool(owl_vardict * vd, const char *name, const char *summ, const char * desc, int initval) {
   owl_variable *old = owl_variable_get_var(vd, name, OWL_VARIABLE_BOOL);
   if(old) {
@@ -628 +628 @@
 
 
-char *owl_variable_get_description(owl_variable *v) {
+const char *owl_variable_get_description(owl_variable *v) {
   return v->description;
 }
 
-char *owl_variable_get_summary(owl_variable *v) {
+const char *owl_variable_get_summary(owl_variable *v) {
   return v->summary;
 }
 
-char *owl_variable_get_validsettings(owl_variable *v) {
+const char *owl_variable_get_validsettings(owl_variable *v) {
   if (v->validsettings) {
     return v->validsettings;
@@ -647 +647 @@
 
 /* returns 0 on success, prints a status msg if msg is true */
-int owl_variable_set_fromstring(owl_vardict *d, char *name, char *value, int msg, int requirebool) {
+int owl_variable_set_fromstring(owl_vardict *d, const char *name, const char *value, int msg, int requirebool) {
   owl_variable *v;
   char buff2[1024];
@@ -676 +676 @@
 }
  
-int owl_variable_set_string(owl_vardict *d, char *name, char *newval) {
+int owl_variable_set_string(owl_vardict *d, const char *name, const char *newval) {
   owl_variable *v;
   if (!name) return(-1);
@@ -685 +685 @@
 }
  
-int owl_variable_set_int(owl_vardict *d, char *name, int newval) {
+int owl_variable_set_int(owl_vardict *d, const char *name, int newval) {
   owl_variable *v;
   if (!name) return(-1);
@@ -694 +694 @@
 }
  
-int owl_variable_set_bool_on(owl_vardict *d, char *name) {
+int owl_variable_set_bool_on(owl_vardict *d, const char *name) {
   return owl_variable_set_int(d,name,1);
 }
 
-int owl_variable_set_bool_off(owl_vardict *d, char *name) {
+int owl_variable_set_bool_off(owl_vardict *d, const char *name) {
   return owl_variable_set_int(d,name,0);
 }
 
-int owl_variable_get_tostring(owl_vardict *d, char *name, char *buf, int bufsize) {
+int owl_variable_get_tostring(owl_vardict *d, const char *name, char *buf, int bufsize) {
   owl_variable *v;
   if (!name) return(-1);
@@ -710 +710 @@
 }
 
-int owl_variable_get_default_tostring(owl_vardict *d, char *name, char *buf, int bufsize) {
+int owl_variable_get_default_tostring(owl_vardict *d, const char *name, char *buf, int bufsize) {
   owl_variable *v;
   if (!name) return(-1);
@@ -722 +722 @@
 }
 
-owl_variable *owl_variable_get_var(owl_vardict *d, char *name, int require_type) {
+owl_variable *owl_variable_get_var(owl_vardict *d, const char *name, int require_type) {
   owl_variable *v;
   if (!name) return(NULL);
@@ -731 +731 @@
 
 /* returns a reference */
-void *owl_variable_get(owl_vardict *d, char *name, int require_type) {
+const void *owl_variable_get(owl_vardict *d, const char *name, int require_type) {
   owl_variable *v = owl_variable_get_var(d, name, require_type);
   if(v == NULL) return NULL;
@@ -738 +738 @@
 
 /* returns a reference */
-char *owl_variable_get_string(owl_vardict *d, char *name) {
+const char *owl_variable_get_string(owl_vardict *d, const char *name) {
   return owl_variable_get(d,name, OWL_VARIABLE_STRING);
 }
 
 /* returns a reference */
-void *owl_variable_get_other(owl_vardict *d, char *name) {
+const void *owl_variable_get_other(owl_vardict *d, const char *name) {
   return owl_variable_get(d,name, OWL_VARIABLE_OTHER);
 }
 
-int owl_variable_get_int(owl_vardict *d, char *name) {
+int owl_variable_get_int(owl_vardict *d, const char *name) {
   const int *pi;
   pi = owl_variable_get(d,name,OWL_VARIABLE_INT);
@@ -754 +754 @@
 }
 
-int owl_variable_get_bool(owl_vardict *d, char *name) {
+int owl_variable_get_bool(owl_vardict *d, const char *name) {
   const int *pi;
   pi = owl_variable_get(d,name,OWL_VARIABLE_BOOL);
@@ -761 +761 @@
 }
 
-void owl_variable_describe(owl_vardict *d, char *name, owl_fmtext *fm) {
+void owl_variable_describe(owl_vardict *d, const char *name, owl_fmtext *fm) {
   char defaultbuf[50];
   char buf[1024];
@@ -785 +785 @@
 }
 
-void owl_variable_get_help(owl_vardict *d, char *name, owl_fmtext *fm) {
+void owl_variable_get_help(owl_vardict *d, const char *name, owl_fmtext *fm) {
   char buff[1024];
   int bufflen = 1023;
@@ -839 +839 @@
 /* default common functions */
 
-void *owl_variable_get_default(owl_variable *v) {
+const void *owl_variable_get_default(owl_variable *v) {
   return v->val;
 }
@@ -849 +849 @@
 /* default functions for booleans */
 
-int owl_variable_bool_validate_default(owl_variable *v, void *newval) {
+int owl_variable_bool_validate_default(owl_variable *v, const void *newval) {
   if (newval == NULL) return(0);
   else if (*(const int*)newval==1 || *(const int*)newval==0) return(1);
@@ -855 +855 @@
 }
 
-int owl_variable_bool_set_default(owl_variable *v, void *newval) {
+int owl_variable_bool_set_default(owl_variable *v, const void *newval) {
   if (v->validate_fn) {
     if (!v->validate_fn(v, newval)) return(-1);
@@ -863 +863 @@
 }
 
-int owl_variable_bool_set_fromstring_default(owl_variable *v, char *newval) {
+int owl_variable_bool_set_fromstring_default(owl_variable *v, const char *newval) {
   int i;
   if (!strcmp(newval, "on")) i=1;
@@ -871 +871 @@
 }
 
-int owl_variable_bool_get_tostring_default(owl_variable *v, char* buf, int bufsize, void *val) {
+int owl_variable_bool_get_tostring_default(owl_variable *v, char* buf, int bufsize, const void *val) {
   if (val == NULL) {
     snprintf(buf, bufsize, "<null>");
@@ -889 +889 @@
 /* default functions for integers */
 
-int owl_variable_int_validate_default(owl_variable *v, void *newval) {
+int owl_variable_int_validate_default(owl_variable *v, const void *newval) {
   if (newval == NULL) return(0);
   else return (1);
 }
 
-int owl_variable_int_set_default(owl_variable *v, void *newval) {
+int owl_variable_int_set_default(owl_variable *v, const void *newval) {
   if (v->validate_fn) {
     if (!v->validate_fn(v, newval)) return(-1);
@@ -902 +902 @@
 }
 
-int owl_variable_int_set_fromstring_default(owl_variable *v, char *newval) {
+int owl_variable_int_set_fromstring_default(owl_variable *v, const char *newval) {
   int i;
-  char *ep = "x";
+  const char *ep = "x";
   i = strtol(newval, (char **)&ep, 10);
   if (*ep || ep==newval) return(-1);
@@ -910 +910 @@
 }
 
-int owl_variable_int_get_tostring_default(owl_variable *v, char* buf, int bufsize, void *val) {
+int owl_variable_int_get_tostring_default(owl_variable *v, char* buf, int bufsize, const void *val) {
   if (val == NULL) {
     snprintf(buf, bufsize, "<null>");
@@ -922 +922 @@
 /* default functions for enums (a variant of integers) */
 
-int owl_variable_enum_validate(owl_variable *v, void *newval) {  
+int owl_variable_enum_validate(owl_variable *v, const void *newval) {  
   char **enums;
   int nenums, val;
@@ -936 +936 @@
 }
 
-int owl_variable_enum_set_fromstring(owl_variable *v, char *newval) {
+int owl_variable_enum_set_fromstring(owl_variable *v, const char *newval) {
   char **enums;
   int nenums, i, val=-1;
@@ -952 +952 @@
 }
 
-int owl_variable_enum_get_tostring(owl_variable *v, char* buf, int bufsize, void *val) {
+int owl_variable_enum_get_tostring(owl_variable *v, char* buf, int bufsize, const void *val) {
   char **enums;
   int nenums, i;
@@ -973 +973 @@
 /* default functions for stringeans */
 
-int owl_variable_string_validate_default(struct _owl_variable *v, void *newval) {
+int owl_variable_string_validate_default(struct _owl_variable *v, const void *newval) {
   if (newval == NULL) return(0);
   else return (1);
 }
 
-int owl_variable_string_set_default(owl_variable *v, void *newval) {
+int owl_variable_string_set_default(owl_variable *v, const void *newval) {
   if (v->validate_fn) {
     if (!v->validate_fn(v, newval)) return(-1);
@@ -987 +987 @@
 }
 
-int owl_variable_string_set_fromstring_default(owl_variable *v, char *newval) {
+int owl_variable_string_set_fromstring_default(owl_variable *v, const char *newval) {
   return (v->set_fn(v, newval));
 }
 
-int owl_variable_string_get_tostring_default(owl_variable *v, char* buf, int bufsize, void *val) {
+int owl_variable_string_get_tostring_default(owl_variable *v, char* buf, int bufsize, const void *val) {
   if (val == NULL) {
     snprintf(buf, bufsize, "<null>");
     return -1;
   } else {
-    snprintf(buf, bufsize, "%s", (char*)val);
+    snprintf(buf, bufsize, "%s", (const char*)val);
     return 0;
   }
@@ -1015 +1015 @@
   int numfailed=0;
   char buf[1024];
-  void *v;
+  const void *v;
 
   in_regtest = 1;

view.c

@@ -2 +2 @@
 #include "owl.h"
 
-void owl_view_create(owl_view *v, char *name, owl_filter *f, owl_style *s)
+void owl_view_create(owl_view *v, const char *name, owl_filter *f, owl_style *s)
 {
   v->name=owl_strdup(name);
@@ -11 +11 @@
 }
 
-char *owl_view_get_name(owl_view *v)
+const char *owl_view_get_name(owl_view *v)
 {
   return(v->name);
@@ -67 +67 @@
 }
 
-char *owl_view_get_style_name(owl_view *v) {
+const char *owl_view_get_style_name(owl_view *v) {
   return(owl_style_get_name(v->style));
 }
@@ -154 +154 @@
 }
 
-char *owl_view_get_filtname(owl_view *v)
+const char *owl_view_get_filtname(owl_view *v)
 {
   return(owl_filter_get_name(v->filter));

viewwin.c

@@ -7 +7 @@
  * window that will be used by viewwin
  */
-void owl_viewwin_init_text(owl_viewwin *v, WINDOW *win, int winlines, int wincols, char *text)
+void owl_viewwin_init_text(owl_viewwin *v, WINDOW *win, int winlines, int wincols, const char *text)
 {
   owl_fmtext_init_null(&(v->fmtext));
@@ -25 +25 @@
 }
 
-void owl_viewwin_append_text(owl_viewwin *v, char *text) {
+void owl_viewwin_append_text(owl_viewwin *v, const char *text) {
     owl_fmtext_append_normal(&(v->fmtext), text);
     v->textlines=owl_fmtext_num_lines(&(v->fmtext));  

zbuddylist.c

@@ -6 +6 @@
 }
 
-int owl_zbuddylist_adduser(owl_zbuddylist *zb, char *name)
+int owl_zbuddylist_adduser(owl_zbuddylist *zb, const char *name)
 {
   int i, j;
@@ -24 +24 @@
 }
 
-int owl_zbuddylist_deluser(owl_zbuddylist *zb, char *name)
+int owl_zbuddylist_deluser(owl_zbuddylist *zb, const char *name)
 {
   int i, j;
@@ -45 +45 @@
 }
 
-int owl_zbuddylist_contains_user(owl_zbuddylist *zb, char *name)
+int owl_zbuddylist_contains_user(owl_zbuddylist *zb, const char *name)
 {
   int i, j;

zcrypt.c

@@ -49 +49 @@
 } ZWRITEOPTIONS;
 
-char *GetZephyrVarKeyFile(char *whoami, char *class, char *instance);
+char *GetZephyrVarKeyFile(const char *whoami, const char *class, const char *instance);
 
 #ifndef HAVE_DES_ECB_ENCRYPT_PROTO
@@ -69 +69 @@
  * return 0 on success, otherwise -1
  */
-int owl_zcrypt_decrypt(char *out, char *in, char *class, char *instance) {
-  char *inptr, *endptr;
+int owl_zcrypt_decrypt(char *out, const char *in, const char *class, const char *instance) {
+  const char *inptr, *endptr;
   char *fname, keystring[MAX_KEY];
   FILE *fkey;
@@ -116 +116 @@
 }
 
-int owl_zcrypt_encrypt(char *out, char *in, char *class, char *instance) {
+int owl_zcrypt_encrypt(char *out, const char *in, const char *class, const char *instance) {
   char *fname, keystring[MAX_KEY];
   FILE *fkey;
@@ -123 +123 @@
   char input[8], output[8];
   int size, length, i;
-  char *inbuff = NULL, *inptr;
+  const char *inbuff = NULL, *inptr;
   int use_buffer = FALSE;
   int num_blocks=0, last_block_size=0;
@@ -183 +183 @@
 #define MAX_SEARCH 3
 /* Find the class/instance in the .crypt-table */
-char *GetZephyrVarKeyFile(char *whoami, char *class, char *instance) {
+char *GetZephyrVarKeyFile(const char *whoami, const char *class, const char *instance) {
   char *keyfile = NULL;
   char *varname[MAX_SEARCH];

zephyr.c

@@ -187 +187 @@
 }
 
-char *owl_zephyr_get_sender()
+const char *owl_zephyr_get_sender()
 {
 #ifdef HAVE_LIBZEPHYR
@@ -235 +235 @@
  * zephyr to load the subscriptions.
  */
-int owl_zephyr_loadsubs(char *filename, int error_on_nofile)
+int owl_zephyr_loadsubs(const char *filename, int error_on_nofile)
 {
 #ifdef HAVE_LIBZEPHYR
@@ -350 +350 @@
 }
 
-int owl_zephyr_loadloginsubs(char *filename)
+int owl_zephyr_loadloginsubs(const char *filename)
 {
 #ifdef HAVE_LIBZEPHYR
@@ -422 +422 @@
 }
 
-int owl_zephyr_sub(char *class, char *inst, char *recip)
+int owl_zephyr_sub(const char *class, const char *inst, const char *recip)
 {
 #ifdef HAVE_LIBZEPHYR
@@ -443 +443 @@
 
 
-int owl_zephyr_unsub(char *class, char *inst, char *recip)
+int owl_zephyr_unsub(const char *class, const char *inst, const char *recip)
 {
 #ifdef HAVE_LIBZEPHYR
@@ -635 +635 @@
 
 #ifdef HAVE_LIBZEPHYR
-char *owl_zephyr_get_zsig(ZNotice_t *n, int *k)
+const char *owl_zephyr_get_zsig(ZNotice_t *n, int *k)
 {
   /* return a pointer to the zsig if there is one */
@@ -656 +656 @@
 }
 #else
-char *owl_zephyr_get_zsig(void *n, int *k)
+const char *owl_zephyr_get_zsig(void *n, int *k)
 {
   return("");
@@ -662 +662 @@
 #endif
 
-int send_zephyr(char *opcode, char *zsig, char *class, char *instance, char *recipient, char *message)
+int send_zephyr(const char *opcode, const char *zsig, const char *class, const char *instance, const char *recipient, const char *message)
 {
 #ifdef HAVE_LIBZEPHYR
@@ -717 +717 @@
 #endif
 
-void send_ping(char *to, char *zclass, char *zinstance)
+void send_ping(const char *to, const char *zclass, const char *zinstance)
 {
 #ifdef HAVE_LIBZEPHYR
@@ -885 +885 @@
 #endif
 
-void owl_zephyr_zlocate(char *user, char *out, int auth)
+void owl_zephyr_zlocate(const char *user, char *out, int auth)
 {
 #ifdef HAVE_LIBZEPHYR
@@ -920 +920 @@
 }
 
-void owl_zephyr_addsub(char *filename, char *class, char *inst, char *recip)
+void owl_zephyr_addsub(const char *filename, const char *class, const char *inst, const char *recip)
 {
 #ifdef HAVE_LIBZEPHYR
@@ -963 +963 @@
 }
 
-void owl_zephyr_delsub(char *filename, char *class, char *inst, char *recip)
+void owl_zephyr_delsub(const char *filename, const char *class, const char *inst, const char *recip)
 {
 #ifdef HAVE_LIBZEPHYR
@@ -985 +985 @@
 
 /* caller must free the return */
-char *owl_zephyr_makesubline(char *class, char *inst, char *recip)
+char *owl_zephyr_makesubline(const char *class, const char *inst, const char *recip)
 {
   char *out;
@@ -998 +998 @@
 {
 #ifdef HAVE_LIBZEPHYR
-  char *exposure, *eset;
+  const char *exposure, *eset;
   int ret;
 
@@ -1049 +1049 @@
 }
 
-void owl_zephyr_addbuddy(char *name)
+void owl_zephyr_addbuddy(const char *name)
 {
   char *filename;
@@ -1065 +1065 @@
 }
 
-void owl_zephyr_delbuddy(char *name)
+void owl_zephyr_delbuddy(const char *name)
 {
   char *filename;
@@ -1076 +1076 @@
 /* return auth string */
 #ifdef HAVE_LIBZEPHYR
-char *owl_zephyr_get_authstr(ZNotice_t *n)
+const char *owl_zephyr_get_authstr(ZNotice_t *n)
 {
 
@@ -1092 +1092 @@
 }
 #else
-char *owl_zephyr_get_authstr(void *n)
+const char *owl_zephyr_get_authstr(void *n)
 {
   return("");
@@ -1156 +1156 @@
 }
 
-char *owl_zephyr_get_variable(char *var)
+const char *owl_zephyr_get_variable(const char *var)
 {
 #ifdef HAVE_LIBZEPHYR
@@ -1165 +1165 @@
 }
 
-void owl_zephyr_set_locationinfo(char *host, char *val)
+void owl_zephyr_set_locationinfo(const char *host, const char *val)
 {
 #ifdef HAVE_LIBZEPHYR
@@ -1175 +1175 @@
  * The caller must free the return
  */
-char *short_zuser(char *in)
+char *short_zuser(const char *in)
 {
   char *out, *ptr;
@@ -1192 +1192 @@
  * The caller must free the return.
  */
-char *long_zuser(char *in)
+char *long_zuser(const char *in)
 {
   if (strchr(in, '@')) {
@@ -1204 +1204 @@
  * caller must free the return
  */
-char *owl_zephyr_smartstripped_user(char *in)
+char *owl_zephyr_smartstripped_user(const char *in)
 {
   char *ptr, *realm, *out;
@@ -1247 +1247 @@
  * -1 on failure, 0 on success.
  */
-int owl_zephyr_get_anyone_list(owl_list *in, char *filename)
+int owl_zephyr_get_anyone_list(owl_list *in, const char *filename)
 {
 #ifdef HAVE_LIBZEPHYR

zwrite.c

@@ -5 +5 @@
 #include "owl.h"
 
-int owl_zwrite_create_from_line(owl_zwrite *z, char *line)
+int owl_zwrite_create_from_line(owl_zwrite *z, const char *line)
 {
   int argc, badargs, myargc, i, len;
   char **argv;
-  char **myargv;
+  const char *const *myargv;
   char *msg = NULL;
 
@@ -152 +152 @@
 void owl_zwrite_populate_zsig(owl_zwrite *z)
 {
-  char *zsigproc, *zsigowlvar, *zsigzvar;
+  const char *zsigproc, *zsigowlvar, *zsigzvar;
   char *ptr;
   struct passwd *pw;
@@ -219 +219 @@
   for (i=0; i<j; i++) {
     if (strcmp(z->realm, "")) {
-      to = owl_sprintf("%s@%s", (char *) owl_list_get_element(&(z->recips), i), z->realm);
+      to = owl_sprintf("%s@%s", (const char *) owl_list_get_element(&(z->recips), i), z->realm);
     } else {
       to = owl_strdup(owl_list_get_element(&(z->recips), i));
@@ -229 +229 @@
 }
 
-void owl_zwrite_set_message(owl_zwrite *z, char *msg)
+void owl_zwrite_set_message(owl_zwrite *z, const char *msg)
 {
   int i, j;
@@ -243 +243 @@
       tmp = toline;
       if (strcmp(z->realm, "")) {
-        toline = owl_sprintf( "%s%s@%s ", toline, (char *) owl_list_get_element(&(z->recips), i), z->realm);
+        toline = owl_sprintf( "%s%s@%s ", toline, (const char *) owl_list_get_element(&(z->recips), i), z->realm);
       } else {
-        toline = owl_sprintf( "%s%s ", toline, (char *) owl_list_get_element(&(z->recips), i));
+        toline = owl_sprintf( "%s%s ", toline, (const char *) owl_list_get_element(&(z->recips), i));
       }
       owl_free(tmp);
@@ -263 +263 @@
 }
 
-char *owl_zwrite_get_message(owl_zwrite *z)
+const char *owl_zwrite_get_message(owl_zwrite *z)
 {
   if (z->message) return(z->message);
@@ -286 +286 @@
     for (i=0; i<j; i++) {
       if (strcmp(z->realm, "")) {
-        to = owl_sprintf("%s@%s", (char *) owl_list_get_element(&(z->recips), i), z->realm);
+        to = owl_sprintf("%s@%s", (const char *) owl_list_get_element(&(z->recips), i), z->realm);
       } else {
         to = owl_strdup( owl_list_get_element(&(z->recips), i));
@@ -302 +302 @@
 }
 
-int owl_zwrite_create_and_send_from_line(char *cmd, char *msg)
+int owl_zwrite_create_and_send_from_line(const char *cmd, const char *msg)
 {
   owl_zwrite z;
@@ -317 +317 @@
 }
 
-char *owl_zwrite_get_class(owl_zwrite *z)
+const char *owl_zwrite_get_class(owl_zwrite *z)
 {
   return(z->class);
 }
 
-char *owl_zwrite_get_instance(owl_zwrite *z)
+const char *owl_zwrite_get_instance(owl_zwrite *z)
 {
   return(z->inst);
 }
 
-char *owl_zwrite_get_opcode(owl_zwrite *z)
+const char *owl_zwrite_get_opcode(owl_zwrite *z)
 {
   return(z->opcode);
 }
 
-void owl_zwrite_set_opcode(owl_zwrite *z, char *opcode)
+void owl_zwrite_set_opcode(owl_zwrite *z, const char *opcode)
 {
   if (z->opcode) owl_free(z->opcode);
@@ -338 +338 @@
 }
 
-char *owl_zwrite_get_realm(owl_zwrite *z)
+const char *owl_zwrite_get_realm(owl_zwrite *z)
 {
   return(z->realm);
 }
 
-char *owl_zwrite_get_zsig(owl_zwrite *z)
+const char *owl_zwrite_get_zsig(owl_zwrite *z)
 {
   if (z->zsig) return(z->zsig);
@@ -367 +367 @@
 }
 
-char *owl_zwrite_get_recip_n(owl_zwrite *z, int n)
+const char *owl_zwrite_get_recip_n(owl_zwrite *z, int n)
 {
   return(owl_list_get_element(&(z->recips), n));