4 files changed, 7 insertions, 8 deletions

diff --git a/mailutils/makemime.c b/mailutils/makemime.c
index 1dadd715f..8e1bc664c 100644
--- a/mailutils/makemime.c
+++ b/mailutils/makemime.c
@@ -184,9 +184,8 @@ int makemime_main(int argc UNUSED_PARAM, char **argv)
         INIT_G();
 
         // parse options
-        opt_complementary = "a::";
         opts = getopt32(argv,
-                "c:e:o:C:N:a:", // "m:j:",
+                "c:e:o:C:N:a:*", // "m:j:",
                 &content_type, NULL, &opt_output, &G.opt_charset, NULL, &opt_headers //, NULL, NULL
         );
         //argc -= optind;
diff --git a/mailutils/popmaildir.c b/mailutils/popmaildir.c
index 62030331e..69eca6164 100644
--- a/mailutils/popmaildir.c
+++ b/mailutils/popmaildir.c
@@ -107,9 +107,9 @@ int popmaildir_main(int argc UNUSED_PARAM, char **argv)
         INIT_G();
 
         // parse options
-        opt_complementary = "-1:dd:t+:R+:L+:H+";
+        opt_complementary = "-1:dd";
         opts = getopt32(argv,
-                "bdmVcasTkt:" "R:Z:L:H:" IF_FEATURE_POPMAILDIR_DELIVERY("M:F:"),
+                "bdmVcasTkt:+" "R:+Z:L:+H:+" IF_FEATURE_POPMAILDIR_DELIVERY("M:F:"),
                 &timeout, NULL, NULL, NULL, &opt_nlines
                 IF_FEATURE_POPMAILDIR_DELIVERY(, &delivery, &delivery) // we treat -M and -F the same
         );
diff --git a/mailutils/reformime.c b/mailutils/reformime.c
index 86b2cfed3..b967dfbc7 100644
--- a/mailutils/reformime.c
+++ b/mailutils/reformime.c
@@ -265,9 +265,9 @@ int reformime_main(int argc UNUSED_PARAM, char **argv)
 
         // parse options
         // N.B. only -x and -X are supported so far
-        opt_complementary = "x--X:X--x" IF_FEATURE_REFORMIME_COMPAT(":m::");
+        opt_complementary = "x--X:X--x";
         opts = getopt32(argv,
-                "x:X" IF_FEATURE_REFORMIME_COMPAT("deis:r:c:m:h:o:O:"),
+                "x:X" IF_FEATURE_REFORMIME_COMPAT("deis:r:c:m:*h:o:O:"),
                 &opt_prefix
                 IF_FEATURE_REFORMIME_COMPAT(, NULL, NULL, &G.opt_charset, NULL, NULL, NULL, NULL)
         );
diff --git a/mailutils/sendmail.c b/mailutils/sendmail.c
index 5143fac8f..fb4dbb3da 100644
--- a/mailutils/sendmail.c
+++ b/mailutils/sendmail.c
@@ -247,11 +247,11 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv)
 
         // parse options
         // -v is a counter, -H and -S are mutually exclusive, -a is a list
-        opt_complementary = "vv:w+:H--S:S--H:a::";
+        opt_complementary = "vv:H--S:S--H";
         // N.B. since -H and -S are mutually exclusive they do not interfere in opt_connect
         // -a is for ssmtp (http://downloads.openwrt.org/people/nico/man/man8/ssmtp.8.html) compatibility,
         // it is still under development.
-        opts = getopt32(argv, "tf:o:iw:H:S:a::v", &opt_from, NULL,
+        opts = getopt32(argv, "tf:o:iw:+H:S:a:*:v", &opt_from, NULL,
                         &timeout, &opt_connect, &opt_connect, &list, &verbose);
         //argc -= optind;
         argv += optind;