libmailutils/tests tools: use mu_cli_simple for option handling

23 files changed, 858 insertions, 742 deletions

diff --git a/libmailutils/tests/cidr.c b/libmailutils/tests/cidr.c
index 20e18b0fc..febf92f08 100644
--- a/libmailutils/tests/cidr.c
+++ b/libmailutils/tests/cidr.c
@@ -30,36 +30,40 @@ print_bytes (unsigned char *b, size_t l)
   printf ("\n");
 }
 
+static int ipv6_simplify;
+
+struct mu_option options[] = {
+  { "simplify", 's', NULL, MU_OPTION_DEFAULT,
+    "simplify IPv6 addresses", mu_c_bool, &ipv6_simplify },
+  MU_OPTION_END
+};  
+
 int
 main (int argc, char **argv)
 {
-  int flags = 0;
-  
   mu_set_program_name (argv[0]);
-  if (argc < 2)
+  mu_cli_simple (argc, argv,
+                 MU_CLI_OPTION_OPTIONS, options,
+                 MU_CLI_OPTION_PROG_DOC, "cidr test tool",      
+                 MU_CLI_OPTION_PROG_ARGS, "CIDR [CIDR...]",
+                 MU_CLI_OPTION_RETURN_ARGC, &argc,
+                 MU_CLI_OPTION_RETURN_ARGV, &argv,
+                 MU_CLI_OPTION_END);
+         
+  if (argc == 0)
     {
-      mu_error ("usage: %s [-sS] CIDR [CIDR...]", argv[0]);
+      mu_error ("required argument missing; try %s --help for more info",
+                mu_program_name);
       return 1;
     }
 
-  while (--argc)
+  while (argc--)
     {
-      char *arg = *++argv;
+      char *arg = *argv++;
       struct mu_cidr cidr;
       int rc;
       char *str;
 
-      if (strcmp (arg, "-s") == 0)
-        {
-          flags |= MU_CIDR_FMT_SIMPLIFY;
-          continue;
-        }
-      else if (strcmp (arg, "-S") == 0)
-        {
-          flags &= ~MU_CIDR_FMT_SIMPLIFY;
-          continue;
-        }
-               
       rc = mu_cidr_from_string (&cidr, arg);
       if (rc)
         {
@@ -74,10 +78,11 @@ main (int argc, char **argv)
       print_bytes (cidr.address, cidr.len);
       printf ("netmask =");
       print_bytes (cidr.netmask, cidr.len);
-      rc = mu_cidr_format (&cidr, flags, &str);
+      rc = mu_cidr_format (&cidr, ipv6_simplify ? MU_CIDR_FMT_SIMPLIFY : 0,
+                           &str);
       if (rc)
         {
-          mu_error ("cannot covert to string: %s", mu_strerror (rc));
+          mu_error ("cannot convert to string: %s", mu_strerror (rc));
           return 2;
         }
 
diff --git a/libmailutils/tests/debugspec.c b/libmailutils/tests/debugspec.c
index 9c6feaabc..f99b720dd 100644
--- a/libmailutils/tests/debugspec.c
+++ b/libmailutils/tests/debugspec.c
@@ -29,47 +29,35 @@ main (int argc, char **argv)
 {
   char *names = NULL;
   int showunset = 0;
-  char *arg;
+  struct mu_option options[] = {
+    { "names", 0, "NAME[;NAME...]", MU_OPTION_DEFAULT,
+      "show only selected categories", mu_c_string, &names },
+    { "showunset", 0, NULL, MU_OPTION_DEFAULT,
+      "show unset debug categories as well", mu_c_incr, &showunset },
+    MU_OPTION_END
+  };  
   
   mu_set_program_name (argv[0]);
   mu_stdstream_setup (MU_STDSTREAM_RESET_NONE);
 
-  if (argc == 1)
+  mu_cli_simple (argc, argv,
+                 MU_CLI_OPTION_SINGLE_DASH,
+                 MU_CLI_OPTION_OPTIONS, options,
+                 MU_CLI_OPTION_PROG_DOC, "Mailutils debug specification test tool",
+                 MU_CLI_OPTION_PROG_ARGS, "SPEC",
+                 MU_CLI_OPTION_RETURN_ARGC, &argc,
+                 MU_CLI_OPTION_RETURN_ARGV, &argv,
+                 MU_CLI_OPTION_END);
+  
+  
+  if (argc != 1)
     {
-      mu_printf ("usage: %s spec\n", argv[0]);
+      mu_error ("exactly one argument expected; try %s -help for more info",
+                mu_program_name);
       return 0;
     }
 
-  while (argc--)
-    {
-      arg = *++argv;
-
-      if (strncmp (arg, "-names=", 7) == 0)
-        names = arg + 7;
-      else if (strcmp (arg, "-showunset") == 0)
-        showunset = 1;
-      else if (arg[0] == '-')
-        {
-          if (arg[1] == '-' && arg[2] == 0)
-            {
-              argc--;
-              argv++;
-              break;
-            }
-          mu_error ("unrecognised argument: %s", arg);
-          return 1;
-        }
-      else
-        break;
-    }
-
-  if (argc != 1)
-    {
-      mu_error ("usage: %s spec", mu_program_name);
-      return 1;
-    }
-  
-  mu_debug_parse_spec (arg);
+  mu_debug_parse_spec (argv[0]);
   
   mu_debug_format_spec (mu_strout, names, showunset);
   mu_printf ("\n");
diff --git a/libmailutils/tests/decode2047.c b/libmailutils/tests/decode2047.c
index 2e3c13325..d2cf185aa 100644
--- a/libmailutils/tests/decode2047.c
+++ b/libmailutils/tests/decode2047.c
@@ -20,19 +20,14 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <errno.h>
-#include <string.h>
-
 #include <mailutils/mailutils.h>
 
-#define ISPRINT(c) ((c)=='\t'||(c)==' '||(c)=='\n'||\
-                    ((unsigned char)(c)>' '&&(unsigned char)(c)<128)) 
-
 void
 print (char *p, int printable)
 {
   for (; *p; p++)
     {
-      if (printable && *p != '\n' && !ISPRINT (*p))
+      if (printable && *p != '\n' && !mu_isprint (*p))
         printf ("\\%03o", *(unsigned char *) p);
       else
         putchar (*p);
@@ -43,23 +38,22 @@ int
 main (int argc, char *argv[])