build: Start migrating to stdbool logic

C99 has <stdbool.h> which defines true and false.

Closes #291

diff --git a/alias.c b/alias.c
index 7d9a2b8aa6ef01e448379af6db42289c866af36a..11e614cef63c32402e7426d5892968c2029f855b 100644 (file)
--- a/alias.c
+++ b/alias.c
@@ -606,7 +606,7 @@ static int string_is_address(const char *str, const char *u, const char *d)
   return 0;
 }
 
-/* returns TRUE if the given address belongs to the user. */
+/* returns true if the given address belongs to the user. */
 int mutt_addr_is_user (ADDRESS *addr)
 {
   const char *fqdn;

diff --git a/attach.c b/attach.c
index ac4c33337764c45c8adba38fca9cc72d144d5b69..6353a0423ab6feccd4f0e79cd83373c8dace6159 100644 (file)
--- a/attach.c
+++ b/attach.c
@@ -919,7 +919,7 @@ int mutt_print_attachment (FILE *fp, BODY *a)
   {
     char command[_POSIX_PATH_MAX+STRING];
     rfc1524_entry *entry;
-    int piped = FALSE;
+    int piped = false;
 
     dprint (2, (debugfile, "Using mailcap...\n"));
     

diff --git a/browser.c b/browser.c
index fd18d9b59a8856d4f1e5856a5bf6f8bd8e02e742..5ab2cbcebe1eaf6d670134548160cc7530e1bbca 100644 (file)
--- a/browser.c
+++ b/browser.c
@@ -267,13 +267,13 @@ folder_format_str (char *dest, size_t destlen, size_t col, int cols, char op, co
     case 'D':
       if (folder->ff->local)
       {
-       int do_locales = TRUE;
+       int do_locales = true;
 
        if (op == 'D') {
          t_fmt = NONULL(DateFmt);
          if (*t_fmt == '!') {
            ++t_fmt;
-           do_locales = FALSE;
+           do_locales = false;
          }
        } else {
          tnow = time (NULL);

diff --git a/commands.c b/commands.c
index ce711d3bcc9d9dd4e0691be9aab0b9387a2efa5d..d277170969a2d9226dbeca203f8dc71bb5394239 100644 (file)
--- a/commands.c
+++ b/commands.c
@@ -234,7 +234,7 @@ int mutt_display_message (HEADER *cur)
       mutt_error (_("Error running \"%s\"!"), buf);
     unlink (tempfile);
     if (!option (OPTNOCURSES))
-      keypad (stdscr, TRUE);
+      keypad (stdscr, true);
     if (r != -1)
       mutt_set_flag (Context, cur, MUTT_READ, 1);
     if (r != -1 && option (OPTPROMPTAFTER))
@@ -889,7 +889,7 @@ int mutt_save_message (HEADER *h, int delete,
 
 #ifdef USE_NOTMUCH
       if (Context->magic == MUTT_NOTMUCH)
-        nm_longrun_init(Context, TRUE);
+        nm_longrun_init(Context, true);
 #endif
       for (i = 0; i < Context->vcount; i++)
       {

diff --git a/copy.c b/copy.c
index e226216bd00518bece18484ec3d74f4a0c3773c3..56c008b016a4d98dd741b894631e8288680c0930 100644 (file)
--- a/copy.c
+++ b/copy.c
@@ -132,7 +132,7 @@ mutt_copy_hdr (FILE *in, FILE *out, LOFF_T off_start, LOFF_T off_end, int flags,
 
   hdr_count = 1;
   x = 0;
-  error = FALSE;
+  error = false;
 
   /* We are going to read and collect the headers in an array
    * so we are able to do re-ordering.
@@ -302,7 +302,7 @@ mutt_copy_hdr (FILE *in, FILE *out, LOFF_T off_start, LOFF_T off_end, int flags,
                                   flags & CH_PREFIX ? prefix : 0,
                                    mutt_window_wrap_cols (MuttIndexWindow, Wrap), flags) == -1)
        {
-         error = TRUE;
+         error = true;
          break;
        }
       }
@@ -310,7 +310,7 @@ mutt_copy_hdr (FILE *in, FILE *out, LOFF_T off_start, LOFF_T off_end, int flags,
       {      
        if (fputs (headers[x], out) == EOF)
        {
-         error = TRUE;
+         error = true;
          break;
        }
       }

diff --git a/curs_lib.c b/curs_lib.c
index 0481426f9cf8a34d2c3d263c2cbb6e5a6174201f..6b48a65f0800efe72fc7fd1eb12db14149eeabe6 100644 (file)
--- a/curs_lib.c
+++ b/curs_lib.c
@@ -98,8 +98,8 @@ void mutt_refresh (void)
    customize this is of course the Mutt way.  */
 void mutt_need_hard_redraw (void)
 {
-  keypad (stdscr, TRUE);
-  clearok (stdscr, TRUE);
+  keypad (stdscr, true);
+  clearok (stdscr, true);
   set_option (OPTNEEDREDRAW);
 }
 
@@ -216,8 +216,8 @@ void mutt_edit_file (const char *editor, const char *data)
   /* the terminal may have been resized while the editor owned it */
   mutt_resize_screen ();
 #endif
-  keypad (stdscr, TRUE);
-  clearok (stdscr, TRUE);
+  keypad (stdscr, true);
+  clearok (stdscr, true);
 }
 
 int mutt_yesorno (const char *msg, int def)

diff --git a/curs_main.c b/curs_main.c
index 77b94c35e8633fee4251afe5fb9db3c58abab5da..947d1dcff43fab801bbee217e274dc0c3477c322 100644 (file)
--- a/curs_main.c
+++ b/curs_main.c
@@ -231,7 +231,7 @@ short mutt_ts_capability(void)
   /* If XT (boolean) is set, then this terminal supports the standard escape. */
   /* Beware: tigetflag returns -1 if XT is invalid or not a boolean. */
 #ifdef HAVE_USE_EXTENDED_NAMES
-  use_extended_names (TRUE);
+  use_extended_names (true);
   tcapi = tigetflag("XT");
   if (tcapi == 1)
     return 1;
@@ -1048,7 +1048,7 @@ int mutt_index_menu (void)
         * force a real complete redraw.  clrtobot() doesn't seem to be able
         * to handle every case without this.
         */
-       clearok(stdscr,TRUE);
+       clearok(stdscr,true);
        continue;
       }
 #endif
@@ -1560,7 +1560,7 @@ int mutt_index_menu (void)
 
       case OP_REDRAW:
 
-       clearok (stdscr, TRUE);
+       clearok (stdscr, true);
        menu->redraw = REDRAW_FULL;
        break;
 
@@ -1758,12 +1758,12 @@ int mutt_index_menu (void)
        if (tag) {
          for (j = 0; j < Context->vcount; j++) {
            if (Context->hdrs[Context->v2r[j]]->tagged) {
-             Context->hdrs[Context->v2r[j]]->quasi_deleted = TRUE;
-             Context->changed = TRUE;
+             Context->hdrs[Context->v2r[j]]->quasi_deleted = true;
+             Context->changed = true;
            }
          }
        } else {
-         CURHDR->quasi_deleted = TRUE;
+         CURHDR->quasi_deleted = true;
          Context->changed = 1;
        }
        break;
@@ -1829,7 +1829,7 @@ int mutt_index_menu (void)
            mutt_progress_init(&progress, msgbuf, MUTT_PROGRESS_MSG,
                                   1, Context->tagged);
          }
-         nm_longrun_init(Context, TRUE);
+         nm_longrun_init(Context, true);
          for (px = 0, j = 0; j < Context->vcount; j++) {
            if (Context->hdrs[Context->v2r[j]]->tagged) {
              if (!Context->quiet)
@@ -1837,8 +1837,8 @@ int mutt_index_menu (void)
              nm_modify_message_tags(Context, Context->hdrs[Context->v2r[j]], buf);
              if (op == OP_MAIN_MODIFY_LABELS_THEN_HIDE)
              {
-               Context->hdrs[Context->v2r[j]]->quasi_deleted = TRUE;
-               Context->changed = TRUE;
+               Context->hdrs[Context->v2r[j]]->quasi_deleted = true;
+               Context->changed = true;
              }
            }
          }
@@ -1853,8 +1853,8 @@ int mutt_index_menu (void)
          }
          if (op == OP_MAIN_MODIFY_LABELS_THEN_HIDE)
          {
-           CURHDR->quasi_deleted = TRUE;
-           Context->changed = TRUE;
+           CURHDR->quasi_deleted = true;
+           Context->changed = true;
          }
          if (menu->menu == MENU_PAGER)
          {

diff --git a/edit.c b/edit.c
index b0e7cc7b081dec174e27df3d0b4ba026af09f41f..823a0165d5489a5f2fe695ee886ac1c3607722ff 100644 (file)
--- a/edit.c
+++ b/edit.c
@@ -325,7 +325,7 @@ int mutt_builtin_editor (const char *path, HEADER *msg, HEADER *cur)
   int i;
   char *p;
   
-  scrollok (stdscr, TRUE);
+  scrollok (stdscr, true);
 
   be_edit_header (msg->env, 0);
 

diff --git a/handler.c b/handler.c
index a9fb8483bd7addb52cf4b5f876a837c06c0a6fff..d908ab9a73e22b5d18437cfb159281c4a93a1fdd 100644 (file)
--- a/handler.c
+++ b/handler.c
@@ -1309,7 +1309,7 @@ static int autoview_handler (BODY *a, STATE *s)
   FILE *fpin = NULL;
   FILE *fpout = NULL;
   FILE *fperr = NULL;
-  int piped = FALSE;
+  int piped = false;
   pid_t thepid;
   int rc = 0;
 

diff --git a/init.c b/init.c
index 3e3016d6c45b96d76b41e705ad4a7cb6f4ad306d..f6e16fc3c82378e7df63e6e49b66d35ac35fc2b0 100644 (file)
--- a/init.c
+++ b/init.c
@@ -2618,7 +2618,7 @@ static HEAP *MuttrcHeap;
  *     path of. Should be at least of PATH_MAX length, will contain the full result.
  *  - reference: path to a file which directory will be set as reference for setting
  *      up the absolute path.
- * Returns: TRUE (1) on success, FALSE (0) otherwise.
+ * Returns: true (1) on success, false (0) otherwise.
  */
 static int to_absolute_path(char *path, const char *reference)
 {
@@ -2629,7 +2629,7 @@ static int to_absolute_path(char *path, const char *reference)
   /* if path is already absolute, don't do anything */
   if ((strlen(path) > 1) && (path[0] == '/'))
   {
-    return TRUE;
+    return true;
   }
 
   ref_tmp = strdup(reference);
@@ -2647,10 +2647,10 @@ static int to_absolute_path(char *path, const char *reference)
   if (!path)
   {
     printf("Error: issue converting path to absolute (%s)", strerror(errno));
-    return FALSE;
+    return false;
   }
 
-  return TRUE;
+  return true;
 }
 
 #define MAXERRS 128
@@ -3095,7 +3095,7 @@ static int complete_all_nm_tags (const char *pt)
   memset (Matches, 0, Matches_listsize);
   memset (Completed, 0, sizeof (Completed));
 
-  nm_longrun_init(Context, FALSE);
+  nm_longrun_init(Context, false);
 
   /* Work out how many tags there are. */
   if (nm_get_all_tags(Context, NULL, &tag_count_1) || tag_count_1 == 0)

diff --git a/keymap.c b/keymap.c
index cd8c9a0432f9ddda1193de64d333d8b90c693a78..8daa970e65420de7945502f084efe1c63a78b1ba 100644 (file)
--- a/keymap.c
+++ b/keymap.c
@@ -693,7 +693,7 @@ void init_extended_keys(void)
 #ifdef NCURSES_VERSION
   int j;
 
-  use_extended_names(TRUE);
+  use_extended_names(true);
 
   for (j = 0; KeyNames[j].name; ++j)
   {

diff --git a/lib.h b/lib.h
index bc2e373b2357813394b33d79fe91deadcbab2cfe..cc824003afdeb6b19afaa2128e979f3719176f66 100644 (file)
--- a/lib.h
+++ b/lib.h
@@ -35,6 +35,7 @@
 # include <time.h>
 # include <limits.h>
 # include <stdarg.h>
+# include <stdbool.h>
 # include <signal.h>
 
 # ifndef _POSIX_PATH_MAX
@@ -54,9 +55,6 @@
 #  define N_(a) a
 # endif
 
-# define TRUE 1
-# define FALSE 0
-
 # define HUGE_STRING     8192
 # define LONG_STRING     1024
 # define STRING          256

diff --git a/main.c b/main.c
index 7c239246edf18fb24163a8a41337d7893d8b1c9b..447f8eeb254d2aa77aa7f0aef9edf3f374e0fae6 100644 (file)
--- a/main.c
+++ b/main.c
@@ -157,7 +157,7 @@ static void start_curses (void)
   mutt_signal_init ();
 #endif
   ci_start_color ();
-  keypad (stdscr, TRUE);
+  keypad (stdscr, true);
   cbreak ();
   noecho ();
   nonl ();
@@ -165,7 +165,7 @@ static void start_curses (void)
   typeahead (-1);       /* simulate smooth scrolling */
 #endif
 #if HAVE_META
-  meta (stdscr, TRUE);
+  meta (stdscr, true);
 #endif
 init_extended_keys();
   mutt_reflow_windows ();

diff --git a/menu.c b/menu.c
index 1c47acf70311667c6dbbe9e9e92b59e3fa4a4904..6d7504db0c92ac6163b88cc266f5546d16d00ed2 100644 (file)
--- a/menu.c
+++ b/menu.c
@@ -1016,7 +1016,7 @@ int mutt_menuLoop (MUTTMENU *menu)
       mutt_resize_screen ();
       menu->redraw = REDRAW_FULL;
       SigWinch = 0;
-      clearok(stdscr,TRUE);/*force complete redraw*/
+      clearok(stdscr,true);/*force complete redraw*/
     }
 #endif
 
@@ -1152,7 +1152,7 @@ int mutt_menuLoop (MUTTMENU *menu)
        break;
 
       case OP_REDRAW:
-       clearok (stdscr, TRUE);
+       clearok (stdscr, true);
        menu->redraw = REDRAW_FULL;
        break;
 

diff --git a/mutt.h b/mutt.h
index 686c4643efcbf3b86e3a495fc4837322bc557a27..9c994045d35a5ad7aed97d2579eab19102830719 100644 (file)
--- a/mutt.h
+++ b/mutt.h
@@ -34,6 +34,7 @@
 #include <time.h>
 #include <limits.h>
 #include <stdarg.h>
+#include <stdbool.h>
 #include <signal.h>
 /* On OS X 10.5.x, wide char functions are inlined by default breaking
  * --without-wc-funcs compilation
@@ -65,6 +66,14 @@
 #include "hash.h"
 #include "charset.h"
 
+#ifndef __bool_true_false_are_defined
+# define boot int
+# define _Bool int
+# define false 0
+# define true (!false)
+# define __bool_true_false_are_defined 1
+#endif
+
 #ifndef HAVE_WC_FUNCS
 # ifdef MB_LEN_MAX
 #  undef MB_LEN_MAX
@@ -1135,3 +1144,7 @@ typedef struct
 #include "globals.h"
 
 #endif /*MUTT_H*/
+
+
+
+

diff --git a/mutt_notmuch.c b/mutt_notmuch.c
index c69ce12728566aaeed8bd3c8f00efd9e66a7cb72..b693217fc1287483b5ca3e299ffc740c4bef2f2f 100644 (file)
--- a/mutt_notmuch.c
+++ b/mutt_notmuch.c
@@ -693,7 +693,7 @@ static notmuch_database_t *get_db(struct nm_ctxdata *data, int writable)
     const char *db_filename = get_db_filename(data);
 
     if (db_filename)
-      data->db = do_database_open(db_filename, writable, TRUE);
+      data->db = do_database_open(db_filename, writable, true);
   }
   return data->db;
 }
@@ -1459,7 +1459,7 @@ static int remove_filename(struct nm_ctxdata *data, const char *path)
   notmuch_status_t st;
   notmuch_filenames_t *ls;
   notmuch_message_t *msg = NULL;
-  notmuch_database_t *db = get_db(data, TRUE);
+  notmuch_database_t *db = get_db(data, true);
   int trans;
 
   dprint(2, (debugfile, "nm: remove filename '%s'\n", path));
@@ -1517,7 +1517,7 @@ static int rename_filename(struct nm_ctxdata *data, const char *old,
   notmuch_status_t st;
   notmuch_filenames_t *ls;
   notmuch_message_t *msg;
-  notmuch_database_t *db = get_db(data, TRUE);
+  notmuch_database_t *db = get_db(data, true);
   int trans;
 
   if (!db || !new || !old || (access(new, F_OK) != 0))
@@ -1693,7 +1693,7 @@ int nm_read_entire_thread(CONTEXT *ctx, HEADER *h)
 
   if (!data)
     return -1;
-  if (!(db = get_db(data, FALSE)) || !(msg = get_nm_message(db, h)))
+  if (!(db = get_db(data, false)) || !(msg = get_nm_message(db, h)))
     goto done;
 
   dprint(1, (debugfile,
@@ -1861,7 +1861,7 @@ int nm_modify_message_tags(CONTEXT *ctx, HEADER *hdr, char *buf)
   if (!buf || !*buf || !data)
     return -1;
 
-  if (!(db = get_db(data, TRUE)) || !(msg = get_nm_message(db, hdr)))
+  if (!(db = get_db(data, true)) || !(msg = get_nm_message(db, hdr)))
     goto done;
 
   dprint(1, (debugfile, "nm: tags modify: '%s'\n", buf));
@@ -1872,7 +1872,7 @@ int nm_modify_message_tags(CONTEXT *ctx, HEADER *hdr, char *buf)
   mutt_set_header_color(ctx, hdr);
 
   rc = 0;
-  hdr->changed = TRUE;
+  hdr->changed = true;
 done:
   if (!is_longrun(data))
     release_db(data);
@@ -1951,7 +1951,7 @@ int nm_nonctx_get_count(char *path, int *all, int *new)
 
   /* don't be verbose about connection, as we're called from
    * sidebar/buffy very often */
-  db = do_database_open(db_filename, FALSE, FALSE);
+  db = do_database_open(db_filename, false, false);
   if (!db)
     goto done;
 
@@ -2027,7 +2027,7 @@ int nm_record_message(CONTEXT *ctx, char *path, HEADER *h)
 
   if (!path || !data || (access(path, F_OK) != 0))
     return 0;
-  db = get_db(data, TRUE);
+  db = get_db(data, true);
   if (!db)
     return -1;
 
@@ -2075,7 +2075,7 @@ int nm_get_all_tags(CONTEXT *ctx, char **tag_list, int *tag_count)
   if (!data)
     return -1;
 
-  if (!(db = get_db(data, FALSE)) ||
+  if (!(db = get_db(data, false)) ||
       !(tags = notmuch_database_get_all_tags(db)))
     goto done;
 
@@ -2124,7 +2124,7 @@ static int nm_open_mailbox(CONTEXT *ctx)
 
   progress_reset(ctx);
 
-  q = get_query(data, FALSE);
+  q = get_query(data, false);
   if (q)
   {
     switch (get_query_type(data))
@@ -2196,7 +2196,7 @@ static int nm_check_mailbox(CONTEXT *ctx, int *index_hint)
 
   dprint(1, (debugfile, "nm: checking (db=%d ctx=%d)\n", mtime, ctx->mtime));
 
-  q = get_query(data, FALSE);
+  q = get_query(data, false);
   if (!q)
     goto done;
 

diff --git a/nntp.c b/nntp.c
index e991027110edee3ca37dc39989bb7fb6aa0b98e2..85d27b49c4db120ce49480e8f3d8cbeb0ab116c8 100644 (file)
--- a/nntp.c
+++ b/nntp.c
@@ -819,7 +819,7 @@ static int nntp_query (NNTP_DATA *nntp_data, char *line, size_t linelen)
 static int nntp_fetch_lines (NNTP_DATA *nntp_data, char *query, size_t qlen,
                        char *msg, int (*funct) (char *, void *), void *data)
 {
-  int done = FALSE;
+  int done = false;
   int rc;
 
   while (!done)
@@ -861,7 +861,7 @@ static int nntp_fetch_lines (NNTP_DATA *nntp_data, char *query, size_t qlen,
       {
        if (buf[1] == '\0')
        {
-         done = TRUE;
+         done = true;
          break;
        }
        if (buf[1] == '.')
@@ -2192,7 +2192,7 @@ int nntp_check_new_groups (NNTP_SERVER *nserv)
   char buf[LONG_STRING];
   char *msg = _("Checking for new newsgroups...");
   unsigned int i;
-  int rc, update_active = FALSE;
+  int rc, update_active = false;
 
   if (!nserv || !nserv->newgroups_time)
     return -1;
@@ -2211,7 +2211,7 @@ int nntp_check_new_groups (NNTP_SERVER *nserv)
        if (rc < 0)
          return -1;
        if (rc > 0)
-         update_active = TRUE;
+         update_active = true;
       }
     }
     /* select current newsgroup */
@@ -2274,7 +2274,7 @@ int nntp_check_new_groups (NNTP_SERVER *nserv)
        mutt_progress_update (&progress, ++count, -1);
       }
     }
-    update_active = TRUE;
+    update_active = true;
     rc = 1;
   }
   if (update_active)

diff --git a/pager.c b/pager.c
index 777696653f05202302f37e4a8882ba90d55b3627..785531856b527038320d2ae183d6448930f4d92f 100644 (file)
--- a/pager.c
+++ b/pager.c
@@ -2151,7 +2151,7 @@ mutt_pager (const char *banner, const char *fname, int flags, pager_t *extra)
       }
 
       SigWinch = 0;
-      clearok(stdscr,TRUE);/*force complete redraw*/
+      clearok(stdscr,true);/*force complete redraw*/
       continue;
     }
 #endif
@@ -2545,7 +2545,7 @@ search_next:
        break;
 
       case OP_REDRAW:
-       clearok (stdscr, TRUE);
+       clearok (stdscr, true);
        redraw = REDRAW_FULL;
        break;
 

diff --git a/pattern.c b/pattern.c
index a1bcda7d6257e7e65d5826d7a3118f7a5ae5cbc2..383ee12e389d74214c76113619c576be22bd1efa 100644 (file)
--- a/pattern.c
+++ b/pattern.c
@@ -999,8 +999,8 @@ static int eat_date (pattern_t *pat, BUFFER *s, BUFFER *err)
   {
     const char *pc = buffer.data;
 
-    int haveMin = FALSE;
-    int untilNow = FALSE;
+    int haveMin = false;
+    int untilNow = false;
     if (isdigit ((unsigned char)*pc))
     {
       /* minimum date specified */
@@ -1009,7 +1009,7 @@ static int eat_date (pattern_t *pat, BUFFER *s, BUFFER *err)
        FREE (&buffer.data);
        return (-1);
       }
-      haveMin = TRUE;
+      haveMin = true;
       SKIPWS (pc);
       if (*pc == '-')
       {

diff --git a/resize.c b/resize.c
index 2e77d2186380c16bf311409ac531d3d13758ecd2..d71cb34b0bac0a3e5932ff84ef40437235efd5a9 100644 (file)
--- a/resize.c
+++ b/resize.c
@@ -72,7 +72,7 @@ void mutt_resize_screen (void)
   SLsmg_reset_smg ();
   SLsmg_init_smg ();
   stdscr = newwin (0, 0, 0, 0);
-  keypad (stdscr, TRUE);
+  keypad (stdscr, true);
 #else
   resizeterm (SLtt_Screen_Rows, SLtt_Screen_Cols);
 #endif

diff --git a/rfc1524.c b/rfc1524.c
index 330e7ecd21cda481bf38fb59f26a4352f66547a7..535c7163142eeef1fa50eb3ea59f8f9e29424ef9 100644 (file)
--- a/rfc1524.c
+++ b/rfc1524.c
@@ -59,7 +59,7 @@ int rfc1524_expand_command (BODY *a, char *filename, char *_type,
     char *command, int clen)
 {
   int x=0,y=0;
-  int needspipe = TRUE;
+  int needspipe = true;
   char buf[LONG_STRING];
   char type[LONG_STRING];
   
@@ -100,7 +100,7 @@ int rfc1524_expand_command (BODY *a, char *filename, char *_type,
       else if (command[x] == 's' && filename != NULL)
       {
        y += mutt_quote_filename (buf + y, sizeof (buf) - y, filename);
-       needspipe = FALSE;
+       needspipe = false;
       }
       else if (command[x] == 't')
       {
@@ -178,7 +178,7 @@ static int rfc1524_mailcap_parse (BODY *a,
   size_t buflen;
   char *ch;
   char *field;
-  int found = FALSE;
+  int found = false;
   int copiousoutput;
   int composecommand;
   int editcommand;
@@ -199,7 +199,7 @@ static int rfc1524_mailcap_parse (BODY *a,
 
   /* find length of basetype */
   if ((ch = strchr (type, '/')) == NULL)
-    return FALSE;
+    return false;
   btlen = ch - type;
 
   if ((fp = fopen (filename, "r")) != NULL)
@@ -226,11 +226,11 @@ static int rfc1524_mailcap_parse (BODY *a,
        entry->command = safe_strdup (field);
 
       /* parse the optional fields */
-      found = TRUE;
-      copiousoutput = FALSE;
-      composecommand = FALSE;
-      editcommand = FALSE;
-      printcommand = FALSE;
+      found = true;
+      copiousoutput = false;
+      composecommand = false;
+      editcommand = false;
+      printcommand = false;
 
       while (ch)
       {
@@ -241,38 +241,38 @@ static int rfc1524_mailcap_parse (BODY *a,
        if (!ascii_strcasecmp (field, "needsterminal"))
        {
          if (entry)
-           entry->needsterminal = TRUE;
+           entry->needsterminal = true;
        }
        else if (!ascii_strcasecmp (field, "copiousoutput"))
        {
-         copiousoutput = TRUE;
+         copiousoutput = true;
          if (entry)
-           entry->copiousoutput = TRUE;
+           entry->copiousoutput = true;
        }
        else if (!ascii_strncasecmp (field, "composetyped", 12))
        {
          /* this compare most occur before compose to match correctly */
          if (get_field_text (field + 12, entry ? &entry->composetypecommand : NULL,
                              type, filename, line))
-           composecommand = TRUE;
+           composecommand = true;
        }
        else if (!ascii_strncasecmp (field, "compose", 7))
        {
          if (get_field_text (field + 7, entry ? &entry->composecommand : NULL,
                              type, filename, line))
-           composecommand = TRUE;
+           composecommand = true;
        }
        else if (!ascii_strncasecmp (field, "print", 5))
        {
          if (get_field_text (field + 5, entry ? &entry->printcommand : NULL,
                              type, filename, line))
-           printcommand = TRUE;
+           printcommand = true;
        }
        else if (!ascii_strncasecmp (field, "edit", 4))
        {
          if (get_field_text (field + 4, entry ? &entry->editcommand : NULL,
                              type, filename, line))
-           editcommand = TRUE;
+           editcommand = true;
        }
        else if (!ascii_strncasecmp (field, "nametemplate", 12))
        {
@@ -302,7 +302,7 @@ static int rfc1524_mailcap_parse (BODY *a,
            if (mutt_system (test_command))
            {
              /* a non-zero exit code means test failed */
-             found = FALSE;
+             found = false;
            }
            FREE (&test_command);
          }
@@ -312,22 +312,22 @@ static int rfc1524_mailcap_parse (BODY *a,
       if (opt == MUTT_AUTOVIEW)
       {
        if (!copiousoutput)
-         found = FALSE;
+         found = false;
       }
       else if (opt == MUTT_COMPOSE)
       {
        if (!composecommand)
-         found = FALSE;
+         found = false;
       }
       else if (opt == MUTT_EDIT)
       {
        if (!editcommand)
-         found = FALSE;
+         found = false;
       }
       else if (opt == MUTT_PRINT)
       {
        if (!printcommand)
-         found = FALSE;
+         found = false;
       }
       
       if (!found)
@@ -382,7 +382,7 @@ int rfc1524_mailcap_lookup (BODY *a, char *type, rfc1524_entry *entry, int opt)
 {
   char path[_POSIX_PATH_MAX];
   int x;
-  int found = FALSE;
+  int found = false;
   char *curr = MailcapPath;
 
   /* rfc1524 specifies that a path of mailcap files should be searched.