Minor fixes.

* .gitignore: Add pathdefs.h
* examples/Makefile.am (muauth_CPPFLAGS)
(muemail_CPPFLAGS): New variables.
* examples/argcv.c (main): Remove unused local.
* include/mailutils/gsasl.h [USE_GSASL]: Change to WITH_GSASL.
* include/mailutils/libcfg.h (mu_acl_cfg_init): New prototype.
* include/mailutils/mu_auth.h (mu_authenticate): Password is const.
* include/mailutils/python.h: Fix indentation.
(mu_py_script_data): module_name is const char *.
* libmu_auth/radius.c: Include radius/debug.h
* libproto/mailer/smtp.c: Include io.h and secret.h
* mail/mail.c: Fix indentation.
* mail/util.c (util_rfc2047_decode): Fix local variable declaration.
* mailbox/mu_auth.c (mu_authenticate): Password is const.
* mh/mh.h (mh_alias_get, mh_alias_get_address)
(mh_alias_get_alias): Name is const.
* mh/mh_alias.y: Likewise.
* mh/mh_list.c (print_header_value): Fix improper use of mu_toupper.
* mh/mh_whatnow.c (invoke): Add typecasts.
* python/libmu_py/nls.c (api_nls_set_locale): Remove unused automatic.
* python/libmu_py/sieve.c (_sieve_error_printer): Provide missing
return value.
(_sieve_debug_printer): Likewise.

2 files changed, 19 insertions, 15 deletions

diff --git a/mail/mail.c b/mail/mail.c
index fbc08a251..64aad6c17 100644
--- a/mail/mail.c
+++ b/mail/mail.c
@@ -38,20 +38,24 @@ static char args_doc[] = N_("[address...]\n-f [OPTION...] [file]\n--file [OPTION
 #define F_OPTION 256
 
 static struct argp_option options[] = {
-  { NULL,     'f', 0,      OPTION_HIDDEN, NULL, 0 },
-  {"file",    F_OPTION,    "FILE",   OPTION_ARG_OPTIONAL|OPTION_HIDDEN, 0},
-
-  {"exist",   'e', 0,      0, N_("Return true if mail exists"), 0},
-  {"byname",  'F', 0,      0, N_("Save messages according to sender"), 0},
-  {"headers", 'H', 0,      0, N_("Write a header summary and exit"), 0},
-  {"ignore",  'i', 0,      0, N_("Ignore interrupts"), 0},
-  {"norc",    'n', 0,      0, N_("Do not read the system mailrc file"), 0},
-  {"nosum",   'N', 0,      0, N_("Do not display initial header summary"), 0},
-  {"print",   'p', 0,      0, N_("Print all mail to standard output"), 0},
-  {"quit",    'q', 0,      0, N_("Cause interrupts to terminate program"), 0},
-  {"read",    'r', 0,      0, N_("Same as -p"), 0},
-  {"subject", 's', N_("SUBJ"), 0, N_("Send a message with a Subject of SUBJ"), 0},
-  {"to",      't', 0,      0, N_("Precede message by a list of addresses"), 0},
+  { NULL,     'f', NULL,      OPTION_HIDDEN, NULL, 0 },
+  {"file",    F_OPTION, "FILE",   OPTION_ARG_OPTIONAL|OPTION_HIDDEN, 0},
+
+  {"exist",   'e', NULL,      0, N_("Return true if mail exists"), 0},
+  {"byname",  'F', NULL,      0, N_("Save messages according to sender"), 0},
+  {"headers", 'H', NULL,      0, N_("Write a header summary and exit"), 0},
+  {"ignore",  'i', NULL,      0, N_("Ignore interrupts"), 0},
+  {"norc",    'n', NULL,      0, N_("Do not read the system mailrc file"), 0},
+  {"nosum",   'N', NULL,      0,
+   N_("Do not display initial header summary"), 0},
+  {"print",   'p', NULL,      0, N_("Print all mail to standard output"), 0},
+  {"read",    'r', NULL,      OPTION_ALIAS },
+  {"quit",    'q', NULL,      0,
+   N_("Cause interrupts to terminate program"), 0},
+  {"subject", 's', N_("SUBJ"), 0,
+   N_("Send a message with the given SUBJECT"), 0},
+  {"to",      't', NULL,      0,
+   N_("Precede message by a list of addresses"), 0},
   {"user",    'u', N_("USER"), 0, N_("Operate on USER's mailbox"), 0},
   {"append",  'a', N_("HEADER: VALUE"), 0,
    N_("Append given header to the message being sent"), 0},
diff --git a/mail/util.c b/mail/util.c
index d2f342e66..b6c3ba5cc 100644
--- a/mail/util.c
+++ b/mail/util.c
@@ -1084,7 +1084,7 @@ void
 util_rfc2047_decode (char **value)
 {
   char locale[32];
-  char *charset = NULL;
+  const char *charset = NULL;
   char *tmp;
   int rc;