diff options
author | Ron Yorston <rmy@pobox.com> | 2016-07-07 14:28:08 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2016-07-07 14:58:55 +0100 |
commit | 613f46218c53c8cabdbf0435653e74e0e0e91e1c (patch) | |
tree | ca06a7e7a3e4c861441acb4ea20648d7827fa6ae /mailutils/sendmail.c | |
parent | a0c61c9492723dd31681f878f9c68c92817a476d (diff) | |
parent | 237bedd499c58034a1355484d6d4d906f0180308 (diff) | |
download | busybox-w32-613f46218c53c8cabdbf0435653e74e0e0e91e1c.tar.gz busybox-w32-613f46218c53c8cabdbf0435653e74e0e0e91e1c.tar.bz2 busybox-w32-613f46218c53c8cabdbf0435653e74e0e0e91e1c.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'mailutils/sendmail.c')
-rw-r--r-- | mailutils/sendmail.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) | |||
247 | 247 | ||
248 | // parse options | 248 | // parse options |
249 | // -v is a counter, -H and -S are mutually exclusive, -a is a list | 249 | // -v is a counter, -H and -S are mutually exclusive, -a is a list |
250 | opt_complementary = "vv:w+:H--S:S--H:a::"; | 250 | opt_complementary = "vv:H--S:S--H"; |
251 | // N.B. since -H and -S are mutually exclusive they do not interfere in opt_connect | 251 | // N.B. since -H and -S are mutually exclusive they do not interfere in opt_connect |
252 | // -a is for ssmtp (http://downloads.openwrt.org/people/nico/man/man8/ssmtp.8.html) compatibility, | 252 | // -a is for ssmtp (http://downloads.openwrt.org/people/nico/man/man8/ssmtp.8.html) compatibility, |
253 | // it is still under development. | 253 | // it is still under development. |
254 | opts = getopt32(argv, "tf:o:iw:H:S:a::v", &opt_from, NULL, | 254 | opts = getopt32(argv, "tf:o:iw:+H:S:a:*:v", &opt_from, NULL, |
255 | &timeout, &opt_connect, &opt_connect, &list, &verbose); | 255 | &timeout, &opt_connect, &opt_connect, &list, &verbose); |
256 | //argc -= optind; | 256 | //argc -= optind; |
257 | argv += optind; | 257 | argv += optind; |