Minor fixes

* libmailutils/tests/modtofsaf.c (main): Trivial fix.
* mail/mail.c: Support "address" capability.
* mu/shell.c: Trivial fixes

@@ -51,7 +51,6 @@ main (int argc, char **argv)
 	  const char *s = mu_file_safety_code_to_name (i);
 	  const char *s = mu_file_safety_code_to_name (i);
 	  printf ("%s\n", s ? s : "UNKNOWN");
 	  printf ("%s\n", s ? s : "UNKNOWN");
 	}
 	}
-      crit &= ~i;
     }
     }
   return 0;
   return 0;
 }
 }

@@ -231,6 +231,7 @@ static struct argp argp = {
 static const char *mail_capa[] = {
 static const char *mail_capa[] = {
   "mailutils",
   "mailutils",
   "common",
   "common",
+  "address",
   "debug",
   "debug",
   "mailbox",
   "mailbox",
   "locking",
   "locking",

@@ -297,11 +297,11 @@ get_history_file_name ()
       
       
       hname = mu_alloc (sizeof HISTFILE_PREFIX + strlen (rl_readline_name) +
       hname = mu_alloc (sizeof HISTFILE_PREFIX + strlen (rl_readline_name) +
 		        sizeof HISTFILE_SUFFIX - 1);
 		        sizeof HISTFILE_SUFFIX - 1);
-      strcpy (hname, "~/.mu_");
+      strcpy (hname, HISTFILE_PREFIX);
       strcat (hname, rl_readline_name);
       strcat (hname, rl_readline_name);
       strcat (hname, HISTFILE_SUFFIX);
       strcat (hname, HISTFILE_SUFFIX);
       filename = mu_tilde_expansion (hname, MU_HIERARCHY_DELIMITER, NULL);
       filename = mu_tilde_expansion (hname, MU_HIERARCHY_DELIMITER, NULL);
-      free(hname);
+      free (hname);
     }
     }
   return filename;
   return filename;
 }
 }
@@ -348,7 +348,7 @@ mutool_initialize_readline (const char *name)
 static void
 static void
 finish_readline ()
 finish_readline ()
 {
 {
-  write_history (get_history_file_name());
+  write_history (get_history_file_name ());
 }
 }
 
 
 /* Attempt to complete on the contents of TEXT.  START and END bound the
 /* Attempt to complete on the contents of TEXT.  START and END bound the