(main): Use mu_argp_init.

36 files changed, 74 insertions, 37 deletions

diff --git a/comsat/comsat.c b/comsat/comsat.c
index 66949663a..441dbdcf8 100644
--- a/comsat/comsat.c
+++ b/comsat/comsat.c
@@ -50,7 +50,7 @@ typedef struct utmp UTMP;
 
 #define MAX_TTY_SIZE (sizeof (PATH_TTY_PFX) + sizeof (((UTMP*)0)->ut_line))
 
-const char *argp_program_version = "comsatd (" PACKAGE_STRING ")";
+const char *program_version = "comsatd (" PACKAGE_STRING ")";
 static char doc[] = "GNU comsatd";
 
 static struct argp_option options[] = 
@@ -139,6 +139,7 @@ main(int argc, char **argv)
   /* Native Language Support */
   mu_init_nls ();
 
+  mu_argp_init (program_version, NULL);
   mu_argp_parse (&argp, &argc, &argv, 0, comsat_argp_capa,
                  NULL, &daemon_param);
 
diff --git a/dotlock/dotlock.c b/dotlock/dotlock.c
index b00bfab86..694e3b0e7 100644
--- a/dotlock/dotlock.c
+++ b/dotlock/dotlock.c
@@ -30,7 +30,7 @@
 #include <mailutils/locker.h>
 #include <mailutils/nls.h>
 
-const char *argp_program_version = "GNU dotlock (" PACKAGE_STRING ")";
+const char *program_version = "GNU dotlock (" PACKAGE_STRING ")";
 static char doc[] =
 N_("GNU dotlock -- lock mail spool files"
    "\v"
@@ -38,7 +38,6 @@ N_("GNU dotlock -- lock mail spool files"
    " it's already locked, and 1 if some other kind of error occurred.");
 
 static char args_doc[] = N_("FILE");
-error_t argp_err_exit_status = MU_DL_EX_ERROR;
 
 static struct argp_option options[] = {
   {"unlock", 'u', NULL, 0,
@@ -148,6 +147,8 @@ main (int argc, char *argv[])
   if(setegid(usergid) < 0)
     return MU_DL_EX_ERROR;
 
+  mu_argp_init (program_version, NULL);
+  argp_err_exit_status = MU_DL_EX_ERROR;
   argp_parse (&argp, argc, argv, 0, NULL, NULL);
 
   if ((err = locker_create (&locker, file, flags)))
diff --git a/frm/frm.c b/frm/frm.c
index 9cc2c55b0..f009d989a 100644
--- a/frm/frm.c
+++ b/frm/frm.c
@@ -60,7 +60,7 @@ static int selected;
 
 static int action (observer_t, size_t);
 
-const char *argp_program_version = "frm (" PACKAGE_STRING ")";
+const char *program_version = "frm (" PACKAGE_STRING ")";
 static char doc[] = N_("GNU frm -- display From: lines");
 
 static struct argp_option options[] = {
@@ -306,6 +306,7 @@ main(int argc, char **argv)
   /* Native Language Support */
   mu_init_nls ();
 
+  mu_argp_init (program_version, NULL);
   mu_argp_parse (&argp, &argc, &argv, 0, frm_argp_capa, &c, NULL);
 
   /* have an argument */
diff --git a/from/from.c b/from/from.c
index cc56590c3..379162bad 100644
--- a/from/from.c
+++ b/from/from.c
@@ -46,7 +46,7 @@
 #include <mailutils/stream.h>
 #include <mailutils/nls.h>
 
-const char *argp_program_version = "from (" PACKAGE_STRING ")";
+const char *program_version = "from (" PACKAGE_STRING ")";
 static char doc[] = N_("GNU from -- display from and subject");
 
 static struct argp_option options[] = {
@@ -103,6 +103,7 @@ main(int argc, char **argv)
 
   {
     int opt;
+    mu_argp_init (program_version, NULL);
     mu_argp_parse (&argp, &argc, &argv, 0, capa, &opt, NULL);
     mailbox_name = argv[opt];
   }
diff --git a/guimb/main.c b/guimb/main.c
index 83e59b2c7..04f7c647b 100644
--- a/guimb/main.c
+++ b/guimb/main.c
@@ -116,7 +116,7 @@ parse_opt (int key, char *arg, struct argp_state *state)
   return 0;
 }
 
-const char *argp_program_version = "guimb (" PACKAGE_STRING ")";
+const char *program_version = "guimb (" PACKAGE_STRING ")";
 static char doc[] =
 N_("GNU guimb -- Process the contents of the specified mailboxes "
 "using a Scheme program or expression.");
@@ -149,6 +149,7 @@ main (int argc, char *argv[])
   mu_init_nls ();
 
   append_arg ("");
+  mu_argp_init (program_version, NULL);
   mu_argp_parse (&argp, &argc, &argv, 0, guimb_argp_capa, NULL, &c);
   
   for (; c < argc; c++)
diff --git a/imap4d/imap4d.c b/imap4d/imap4d.c
index 94220e312..c28870fcd 100644
--- a/imap4d/imap4d.c
+++ b/imap4d/imap4d.c
@@ -36,7 +36,7 @@ int login_disabled;
 /* Number of child processes.  */
 volatile size_t children;
 
-const char *argp_program_version = "imap4d (" PACKAGE_STRING ")";
+const char *program_version = "imap4d (" PACKAGE_STRING ")";
 static char doc[] = N_("GNU imap4d -- the IMAP4D daemon");
 
 #define ARG_LOGIN_DISABLED 1
@@ -124,6 +124,7 @@ main (int argc, char **argv)
   MU_AUTH_REGISTER_ALL_MODULES ();
   imap4d_capability_init ();
 
+  mu_argp_init (program_version, NULL);
 #ifdef WITH_TLS
   mu_tls_init_argp ();
 #endif /* WITH_TLS */
diff --git a/mail.local/main.c b/mail.local/main.c
index fc40d9b10..6da4df626 100644
--- a/mail.local/main.c
+++ b/mail.local/main.c
@@ -41,7 +41,7 @@ void guess_retval __P((int ec));
 void mailer_err __P((char *fmt, ...));
 void notify_biff __P((mailbox_t mbox, char *name, size_t size));
 
-const char *argp_program_version = "mail.local (" PACKAGE_STRING ")";
+const char *program_version = "mail.local (" PACKAGE_STRING ")";
 static char doc[] =
 N_("GNU mail.local -- the local MDA"
    "\v"
@@ -278,6 +278,7 @@ main (int argc, char *argv[])
   
   mu_argp_error_code = EX_CONFIG;
   MU_AUTH_REGISTER_ALL_MODULES();
+  mu_argp_init (program_version, NULL);
   sieve_argp_init ();
   mu_argp_parse (&argp, &argc, &argv, 0, argp_capa, &arg_index, NULL);
   
diff --git a/mail.remote/mail.remote.c b/mail.remote/mail.remote.c
index aa04f4720..a4cf83c35 100644
--- a/mail.remote/mail.remote.c
+++ b/mail.remote/mail.remote.c
@@ -41,7 +41,7 @@
 #include <mailutils/error.h>