Remove left over references to argp; other bugfixes

@@ -248,12 +248,6 @@ mailutils-specific configuration options:
 
 
        Use the GNU gettext library included in the Mailutils distribution.
        Use the GNU gettext library included in the Mailutils distribution.
 
 
-    --with-included-argp
-
-        Use the argp library supplied with the package, instead of the
-        one from your libc. You will need this option if the libc library
-        on your system was compiled without NLS support.
-
 The following options enable DBM support in Mailutils. DBM support is
 The following options enable DBM support in Mailutils. DBM support is
 necessary if you wish to use APOP authentication in POP3 daemon or to
 necessary if you wish to use APOP authentication in POP3 daemon or to
 use DBM-based mail box quotas with maildag.
 use DBM-based mail box quotas with maildag.

@@ -63,12 +63,7 @@ XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
  --flag=mu_cfg_format_error:3:c-format\\\
  --flag=mu_cfg_format_error:3:c-format\\\
  --flag=ali_parse_error:1:c-format\\\
  --flag=ali_parse_error:1:c-format\\\
  --flag=asnprintf:3:c-format --flag=vasnprintf:3:c-format\\\
  --flag=asnprintf:3:c-format --flag=vasnprintf:3:c-format\\\
- --flag=argp_error:2:c-format\\\
- --flag=__argp_error:2:c-format\\\
- --flag=argp_failure:4:c-format\\\
- --flag=__argp_failure:4:c-format\\\
- --flag=argp_fmtstream_printf:2:c-format\\\
- --flag=__argp_fmtstream_printf:2:c-format\\\
+ --flag=mu_parseopt_error:2:c-format\\\
 '
 '
 
 
 # Gettext supplies these files, but we don't need them since
 # Gettext supplies these files, but we don't need them since

@@ -49,7 +49,6 @@ AC_SUBST(MU_LIB_POP)
 AC_SUBST(MU_LIB_SIEVE,'${top_builddir}/libmu_sieve/libmu_sieve.la')
 AC_SUBST(MU_LIB_SIEVE,'${top_builddir}/libmu_sieve/libmu_sieve.la')
 AC_SUBST(MU_LIB_SCM)
 AC_SUBST(MU_LIB_SCM)
 AC_SUBST(MU_LIB_CPP)
 AC_SUBST(MU_LIB_CPP)
-AC_SUBST(MU_LIB_ARGP,'${top_builddir}/libmu_argp/libmu_argp.la')
 AC_SUBST(MU_LIB_PY)
 AC_SUBST(MU_LIB_PY)
 
 
 dnl Other variables
 dnl Other variables
@@ -70,7 +69,7 @@ AC_SUBST(MU_APP_LIBRARIES,'${top_builddir}/lib/libmuaux.la')
 
 
 AC_SUBST(MU_LIB_COMMON_INCLUDES,'-I${top_builddir} -I${top_srcdir}/include  -I${top_builddir}/include')
 AC_SUBST(MU_LIB_COMMON_INCLUDES,'-I${top_builddir} -I${top_srcdir}/include  -I${top_builddir}/include')
 
 
-AC_SUBST(MU_APP_COMMON_INCLUDES,'-I${srcdir} -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_srcdir}/lib/gnu -I${top_builddir}/lib/gnu -I${top_builddir} -I${top_builddir}/include -I${top_srcdir}/libmu_argp -I${top_srcdir}/libmu_cfg')
+AC_SUBST(MU_APP_COMMON_INCLUDES,'-I${srcdir} -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_srcdir}/lib/gnu -I${top_builddir}/lib/gnu -I${top_builddir} -I${top_builddir}/include')
 
 
 dnl Check for programs
 dnl Check for programs
 AC_PROG_CC
 AC_PROG_CC
@@ -125,13 +124,6 @@ AH_BOTTOM([
 AC_SUBST(MU_LINK_POSTFLAGS,[`for opt in $LTLIBICONV; do case $opt in -[[lL]]*) echo $opt;; esac; done|tr '\n' ' '`])
 AC_SUBST(MU_LINK_POSTFLAGS,[`for opt in $LTLIBICONV; do case $opt in -[[lL]]*) echo $opt;; esac; done|tr '\n' ' '`])
 
 
 
 
-dnl Escape defuns that force automake to add their arguments
-dnl to LIBOBJS.
-dnl All dependencies has been handled by gnulib-sync.
-
-AC_DEFINE([GNULIB_ARGP_EXTERN_BASENAME],1,
-          [Define to use our own version of __argp_base_name])
-
 # Check for large file support
 # Check for large file support
 AC_SYS_LARGEFILE
 AC_SYS_LARGEFILE
 
 

@@ -177,7 +177,7 @@ static struct mu_cli_setup cli = {
   N_("[URL ...]"),
   N_("[URL ...]"),
 };
 };
 
 
-static char *frm_argp_capa[] = {
+static char *capa[] = {
   "debug",
   "debug",
   "mailbox",
   "mailbox",
   "locking",
   "locking",
@@ -328,7 +328,7 @@ main (int argc, char **argv)
   mu_register_all_mbox_formats ();
   mu_register_all_mbox_formats ();
 
 
   mu_auth_register_module (&mu_auth_tls_module);
   mu_auth_register_module (&mu_auth_tls_module);
-  mu_cli (argc, argv, &cli, frm_argp_capa, NULL, &argc, &argv);
+  mu_cli (argc, argv, &cli, capa, NULL, &argc, &argv);
 
 
   if (align && (s = util_getcols ()))
   if (align && (s = util_getcols ()))
     init_output (s);
     init_output (s);

 Makefile
 Makefile
 Makefile.in
 Makefile.in
 getopt.h 
 getopt.h 
-argp.h
 regex.h 
 regex.h 
 posix
 posix
 posix/regex.h
 posix/regex.h

@@ -234,16 +234,20 @@ int
 mu_get_auth (struct mu_auth_data **auth, enum mu_auth_key_type type,
 mu_get_auth (struct mu_auth_data **auth, enum mu_auth_key_type type,
              const void *key)
              const void *key)
 {
 {
+  enum mu_auth_mode mode;
+  
   if (!mu_getpw_modules)
   if (!mu_getpw_modules)
     mu_auth_begin_setup ();
     mu_auth_begin_setup ();
   switch (type)
   switch (type)
     {
     {
     case mu_auth_key_name:
     case mu_auth_key_name:
+      mode = mu_auth_getpwnam;
       mu_debug (MU_DEBCAT_AUTH, MU_DEBUG_TRACE1,
       mu_debug (MU_DEBCAT_AUTH, MU_DEBUG_TRACE1,
                 ("Getting auth info for user %s", (char*) key));
                 ("Getting auth info for user %s", (char*) key));
       break;
       break;
 
 
     case mu_auth_key_uid:
     case mu_auth_key_uid:
+      mode = mu_auth_getpwuid;
       mu_debug (MU_DEBCAT_AUTH, MU_DEBUG_TRACE1, 
       mu_debug (MU_DEBCAT_AUTH, MU_DEBUG_TRACE1, 
                 ("Getting auth info for UID %lu",
                 ("Getting auth info for UID %lu",
 		 (unsigned long) *(uid_t*) key));
 		 (unsigned long) *(uid_t*) key));
@@ -254,7 +258,7 @@ mu_get_auth (struct mu_auth_data **auth, enum mu_auth_key_type type,
                 ("Unknown mu_auth_key_type: %d", type));
                 ("Unknown mu_auth_key_type: %d", type));
       return EINVAL;
       return EINVAL;
     }
     }
-  return mu_auth_runlist (mu_getpw_modules, type, key, NULL, auth);
+  return mu_auth_runlist (mu_getpw_modules, mode, key, NULL, auth);
 }
 }
 
 
 struct mu_auth_data *
 struct mu_auth_data *
@@ -289,7 +293,7 @@ mu_authenticate (struct mu_auth_data *auth_data, const char *pass)
     mu_auth_begin_setup ();
     mu_auth_begin_setup ();
   return mu_auth_runlist (mu_auth_modules,
   return mu_auth_runlist (mu_auth_modules,
 			  mu_auth_authenticate,
 			  mu_auth_authenticate,
-			  auth_data, pass, NULL);
+			  auth_data, (void *) pass, NULL);
 }
 }
 
 
 
 
@@ -434,7 +438,7 @@ mu_authentication_clear_list ()
    2) --authentication and --authorization modify only temporary lists,
    2) --authentication and --authorization modify only temporary lists,
       which get flushed to the main ones when mu_auth_finish_setup() is
       which get flushed to the main ones when mu_auth_finish_setup() is
       run. Thus, the default "generic:system" remain in force until
       run. Thus, the default "generic:system" remain in force until
-      argp_parse() exits. */
+      mu_cli_ext exits. */
    
    
 void
 void
 mu_auth_begin_setup (void)
 mu_auth_begin_setup (void)

@@ -38,7 +38,7 @@ mu_set_program_name (const char *arg)
   if (p)
   if (p)
     ++p;
     ++p;
   else
   else
-    p = (char*) arg;
+    p = (char*) mu_full_program_name;
   if (strlen (p) > 3 && memcmp (p, "lt-", 3) == 0)
   if (strlen (p) > 3 && memcmp (p, "lt-", 3) == 0)
     p += 3;
     p += 3;
   free (mu_program_name);
   free (mu_program_name);

@@ -117,32 +117,39 @@ bootstrap_destroy (struct _mu_stream *str)
 
 
 /* Standard I/O streams: */
 /* Standard I/O streams: */
 static struct _mu_file_stream stdstream[2] = {
 static struct _mu_file_stream stdstream[2] = {
-  { { ref_count: 1,
-      buftype: mu_buffer_none,
-      flags: MU_STREAM_READ,
-      destroy: bootstrap_destroy,
-      event_cb: std_bootstrap,
-      event_mask: _MU_STR_EVMASK (_MU_STR_EVENT_BOOTSTRAP)
-    }, fd: MU_STDIN_FD, filename: "<stdin>",
-    flags: _MU_FILE_STREAM_FD_BORROWED|_MU_FILE_STREAM_STATIC_FILENAME },
-  { { ref_count: 1,
-      buftype: mu_buffer_none,
-      flags: MU_STREAM_WRITE,
-      destroy: bootstrap_destroy,
-      event_cb: std_bootstrap,
-      event_mask: _MU_STR_EVMASK (_MU_STR_EVENT_BOOTSTRAP)
-    }, fd: MU_STDOUT_FD, filename: "<stdout>",
-    flags: _MU_FILE_STREAM_FD_BORROWED|_MU_FILE_STREAM_STATIC_FILENAME }
+  { .stream = {
+      .ref_count = 1,
+      .buftype = mu_buffer_none,
+      .flags = MU_STREAM_READ,
+      .destroy = bootstrap_destroy,
+      .event_cb = std_bootstrap,
+      .event_mask = _MU_STR_EVMASK (_MU_STR_EVENT_BOOTSTRAP)
+    },
+    .fd = MU_STDIN_FD,
+    .filename = "<stdin>",
+    .flags = _MU_FILE_STREAM_FD_BORROWED|_MU_FILE_STREAM_STATIC_FILENAME },
+  { .stream = {
+      .ref_count = 1,
+      .buftype = mu_buffer_none,
+      .flags = MU_STREAM_WRITE,
+      .destroy = bootstrap_destroy,
+      .event_cb = std_bootstrap,
+      .event_mask = _MU_STR_EVMASK (_MU_STR_EVENT_BOOTSTRAP)
+    },
+    .fd = MU_STDOUT_FD,
+    .filename = "<stdout>",
+    .flags = _MU_FILE_STREAM_FD_BORROWED|_MU_FILE_STREAM_STATIC_FILENAME }
 };
 };
 
 
 /* Standard error stream: */
 /* Standard error stream: */
 static struct _mu_log_stream default_strerr = {
 static struct _mu_log_stream default_strerr = {
-  { ref_count: 1,
-    buftype: mu_buffer_none,
-    flags: MU_STREAM_WRITE,
-    destroy: bootstrap_destroy,
-    event_cb: std_log_bootstrap,
-    event_mask: _MU_STR_EVMASK (_MU_STR_EVENT_BOOTSTRAP)
+  .base = {
+    .ref_count = 1,
+    .buftype = mu_buffer_none,
+    .flags = MU_STREAM_WRITE,
+    .destroy = bootstrap_destroy,
+    .event_cb = std_log_bootstrap,
+    .event_mask = _MU_STR_EVMASK (_MU_STR_EVENT_BOOTSTRAP)
   }
   }
 };
 };
 
 

@@ -21,7 +21,7 @@
 #include <pick.h>
 #include <pick.h>
   
   
 static node_t *pick_node_create (node_type type, void *a, void *b);
 static node_t *pick_node_create (node_type type, void *a, void *b);
-static void set_cflags (char *str);
+static void set_cflags (char const *str);
  
  
 static regex_t *
 static regex_t *
 regex_dup (regex_t *re)
 regex_dup (regex_t *re)
@@ -248,7 +248,7 @@ pick_add_token (mu_list_t *list, int tok, char const *val)
     }
     }
   tp = mu_alloc (sizeof (*tp));
   tp = mu_alloc (sizeof (*tp));
   tp->tok = tok;
   tp->tok = tok;
-  tp->val = val;
+  tp->val = (char*) val;
   mu_list_append (*list, tp);
   mu_list_append (*list, tp);
 }
 }
 
 
@@ -410,7 +410,7 @@ pick_eval (mu_message_t msg)
 }
 }
 
 
 void
 void
-set_cflags (char *str)
+set_cflags (char const *str)
 {
 {
   reg_flags = 0;
   reg_flags = 0;
   for (; *str; str++)
   for (; *str; str++)

@@ -60,7 +60,6 @@ AC_DEFUN([AM_GNU_MAILUTILS],
   do
   do
     case $x in
     case $x in
     mailer)   test $MAILUTILS_VERSION_NUMBER -ge 1200 && req="$req $x";;
     mailer)   test $MAILUTILS_VERSION_NUMBER -ge 1200 && req="$req $x";;
-    cfg|argp) test $MAILUTILS_VERSION_NUMBER -ge 1290 && req="$req $x";;
     *)        req="$req $x"
     *)        req="$req $x"
     esac
     esac
   done
   done

@@ -20,7 +20,6 @@
 #include <stdlib.h>
 #include <stdlib.h>
 #include <string.h>
 #include <string.h>
 #include <mailutils/mailutils.h>
 #include <mailutils/mailutils.h>
-#include "argp.h"
 #include "mu.h"
 #include "mu.h"
 
 
 char filter_docstring[] = N_("apply a chain of filters to the input");
 char filter_docstring[] = N_("apply a chain of filters to the input");

@@ -29,7 +29,6 @@
 #include <mailutils/imaputil.h>
 #include <mailutils/imaputil.h>
 #include <mailutils/msgset.h>
 #include <mailutils/msgset.h>
 #include "mu.h"
 #include "mu.h"
-#include "argp.h"
 
 
 char imap_docstring[] = N_("IMAP4 client shell");
 char imap_docstring[] = N_("IMAP4 client shell");
 
 

@@ -25,7 +25,6 @@
 #include <mailutils/cctype.h>
 #include <mailutils/cctype.h>
 #include <mailutils/mailutils.h>
 #include <mailutils/mailutils.h>
 #include <mailutils/smtp.h>
 #include <mailutils/smtp.h>
-#include <argp.h>
 #include "mu.h"
 #include "mu.h"
 
 
 char smtp_docstring[] = N_("run a SMTP session");
 char smtp_docstring[] = N_("run a SMTP session");

@@ -32,50 +32,22 @@
 # include <config.h>
 # include <config.h>
 #endif
 #endif
 #include <mailutils/mailutils.h>
 #include <mailutils/mailutils.h>
-#include "argp.h"
 #include "mu.h"
 #include "mu.h"
 
 
-#warning "Replace DESCRIPTION with a short description of this module."
-static char FOO_doc[] = N_("mu FOO - DESCRIPTION");
-
 #warning "Usually DESCRIPTION is the same text as the one used in FOO_doc."
 #warning "Usually DESCRIPTION is the same text as the one used in FOO_doc."
 char FOO_docstring[] = N_("DESCRIPTION");
 char FOO_docstring[] = N_("DESCRIPTION");
 
 
 #warning "Edit ARGDOC or remove this variable if module does not take arguments"
 #warning "Edit ARGDOC or remove this variable if module does not take arguments"
 static char FOO_args_doc[] = N_("ARGDOC");
 static char FOO_args_doc[] = N_("ARGDOC");
 
 
-static struct argp_option FOO_options[] = {
+static struct mu_option FOO_options[] = {
   { NULL }
   { NULL }
 };
 };
 
 
-static error_t
-FOO_parse_opt (int key, char *arg, struct argp_state *state)
-{
-  switch (key)
-    {
-    default:
-      return ARGP_ERR_UNKNOWN;
-    }
-  return 0;
-}
-
-static struct argp FOO_argp = {
-  FOO_options,
-  FOO_parse_opt,
-  FOO_args_doc,
-  FOO_doc,
-  NULL,
-  NULL,
-  NULL
-};
-
 int
 int
 mutool_FOO (int argc, char **argv)
 mutool_FOO (int argc, char **argv)
 {
 {
-  int index;
-  
-  if (argp_parse (&FOO_argp, argc, argv, ARGP_IN_ORDER, &index, NULL))
-    return 1;
+  mu_action_getopt (&argc, &argv, FOO_options, FOO_docstring, FOO_args_doc);
 #warning "Add the necessary functionality here"  
 #warning "Add the necessary functionality here"  
   return 0;
   return 0;
 }
 }

@@ -91,7 +91,7 @@ struct mu_cli_setup cli = {
   NULL
   NULL
 };
 };
 
 
-static char *readmsg_argp_capa[] = {
+static char *readmsg_capa[] = {
   "debug",
   "debug",
   "mailbox",
   "mailbox",
   "locking",
   "locking",
@@ -244,7 +244,7 @@ main (int argc, char **argv)
 
 
   mu_auth_register_module (&mu_auth_tls_module);
   mu_auth_register_module (&mu_auth_tls_module);
 
 
-  mu_cli (argc, argv, &cli, readmsg_argp_capa, NULL, &argc, &argv);
+  mu_cli (argc, argv, &cli, readmsg_capa, NULL, &argc, &argv);
 
 
   if (argc == 0)
   if (argc == 0)
     {
     {

@@ -233,7 +233,7 @@ static struct mu_cfg_param sieve_cfg_param[] = {
 };
 };
 
 
 
 
-static char *sieve_argp_capa[] = {
+static char *sieve_capa[] = {
   "debug",
   "debug",
   "mailbox",
   "mailbox",
   "locking",
   "locking",
@@ -400,7 +400,7 @@ main (int argc, char *argv[])
   
   
   mu_register_all_formats ();
   mu_register_all_formats ();
 
 
-  mu_cli (argc, argv, &cli, sieve_argp_capa, NULL, &argc, &argv);
+  mu_cli (argc, argv, &cli, sieve_capa, NULL, &argc, &argv);
 
 
   if (argc == 0)
   if (argc == 0)
     {
     {