diff options
Diffstat (limited to 'mailutils')
| -rw-r--r-- | mailutils/popmaildir.c | 6 | ||||
| -rw-r--r-- | mailutils/reformime.c | 6 | ||||
| -rw-r--r-- | mailutils/sendmail.c | 12 |
3 files changed, 14 insertions, 10 deletions
diff --git a/mailutils/popmaildir.c b/mailutils/popmaildir.c index 1695a9bb8..5756eaa76 100644 --- a/mailutils/popmaildir.c +++ b/mailutils/popmaildir.c @@ -125,9 +125,9 @@ int popmaildir_main(int argc UNUSED_PARAM, char **argv) INIT_G(); // parse options - opt_complementary = "-1:dd"; - opts = getopt32(argv, - "bdmVcasTkt:+" "R:+Z:L:+H:+" IF_FEATURE_POPMAILDIR_DELIVERY("M:F:"), + opts = getopt32(argv, "^" + "bdmVcasTkt:+" "R:+Z:L:+H:+" IF_FEATURE_POPMAILDIR_DELIVERY("M:F:") + "\0" "-1:dd", &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 6a0254803..321729e0a 100644 --- a/mailutils/reformime.c +++ b/mailutils/reformime.c @@ -280,9 +280,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"; - opts = getopt32(argv, - "x:X" IF_FEATURE_REFORMIME_COMPAT("deis:r:c:m:*h:o:O:"), + opts = getopt32(argv, "^" + "x:X" IF_FEATURE_REFORMIME_COMPAT("deis:r:c:m:*h:o:O:") + "\0" "x--X:X--x", &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 65895f0ec..f440e6319 100644 --- a/mailutils/sendmail.c +++ b/mailutils/sendmail.c @@ -256,13 +256,17 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv) G.fp0 = xfdopen_for_read(3); // parse options - // -v is a counter, -H and -S are mutually exclusive, -a is a list - 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, - &timeout, &opt_connect, &opt_connect, &list, &verbose); + opts = getopt32(argv, "^" + "tf:o:iw:+H:S:a:*:v" + "\0" + // -v is a counter, -H and -S are mutually exclusive, -a is a list + "vv:H--S:S--H", + &opt_from, NULL, + &timeout, &opt_connect, &opt_connect, &list, &verbose + ); //argc -= optind; argv += optind; |