diff options
| author | Vladimir Dronnikov <dronnikov@gmail.com> | 2009-10-04 01:34:54 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2009-10-04 01:34:54 +0200 |
| commit | b618dba10345db75b6dc6ba2c9a7218e97044934 (patch) | |
| tree | b74abb345840e6c6fc9f3eec08ee934780b8e5d4 | |
| parent | 76622dbd1666ca3e0e45e97d880836296ecb0dad (diff) | |
| download | busybox-w32-b618dba10345db75b6dc6ba2c9a7218e97044934.tar.gz busybox-w32-b618dba10345db75b6dc6ba2c9a7218e97044934.tar.bz2 busybox-w32-b618dba10345db75b6dc6ba2c9a7218e97044934.zip | |
sendmail: accept -i too, not only -oi
Signed-off-by: Vladimir Dronnikov <dronnikov@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | include/usage.h | 1 | ||||
| -rw-r--r-- | mailutils/sendmail.c | 11 | ||||
| -rw-r--r-- | miscutils/crond.c | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/include/usage.h b/include/usage.h index 42d8b9bcd..9b9a56f95 100644 --- a/include/usage.h +++ b/include/usage.h | |||
| @@ -3814,6 +3814,7 @@ | |||
| 3814 | "\n -t Read additional recipients from message body" \ | 3814 | "\n -t Read additional recipients from message body" \ |
| 3815 | "\n -f sender Sender (required)" \ | 3815 | "\n -f sender Sender (required)" \ |
| 3816 | "\n -o options Various options. -oi implied, others are ignored" \ | 3816 | "\n -o options Various options. -oi implied, others are ignored" \ |
| 3817 | "\n -i -oi synonym. implied and ignored" \ | ||
| 3817 | "\n" \ | 3818 | "\n" \ |
| 3818 | "\nBusybox specific options:" \ | 3819 | "\nBusybox specific options:" \ |
| 3819 | "\n -w seconds Network timeout" \ | 3820 | "\n -w seconds Network timeout" \ |
diff --git a/mailutils/sendmail.c b/mailutils/sendmail.c index 7e57a94cf..014b20dc8 100644 --- a/mailutils/sendmail.c +++ b/mailutils/sendmail.c | |||
| @@ -73,11 +73,12 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv) | |||
| 73 | OPT_t = 1 << 0, // read message for recipients, append them to those on cmdline | 73 | OPT_t = 1 << 0, // read message for recipients, append them to those on cmdline |
| 74 | OPT_f = 1 << 1, // sender address | 74 | OPT_f = 1 << 1, // sender address |
| 75 | OPT_o = 1 << 2, // various options. -oi IMPLIED! others are IGNORED! | 75 | OPT_o = 1 << 2, // various options. -oi IMPLIED! others are IGNORED! |
| 76 | OPT_i = 1 << 3, // IMPLIED! | ||
| 76 | //--- BB specific options | 77 | //--- BB specific options |
| 77 | OPT_w = 1 << 3, // network timeout | 78 | OPT_w = 1 << 4, // network timeout |
| 78 | OPT_H = 1 << 4, // use external connection helper | 79 | OPT_H = 1 << 5, // use external connection helper |
| 79 | OPT_S = 1 << 5, // specify connection string | 80 | OPT_S = 1 << 6, // specify connection string |
| 80 | OPT_a = 1 << 6, // authentication tokens | 81 | OPT_a = 1 << 7, // authentication tokens |
| 81 | }; | 82 | }; |
| 82 | 83 | ||
| 83 | // init global variables | 84 | // init global variables |
| @@ -93,7 +94,7 @@ int sendmail_main(int argc UNUSED_PARAM, char **argv) | |||
| 93 | // N.B. since -H and -S are mutually exclusive they do not interfere in opt_connect | 94 | // N.B. since -H and -S are mutually exclusive they do not interfere in opt_connect |
| 94 | // -a is for ssmtp (http://downloads.openwrt.org/people/nico/man/man8/ssmtp.8.html) compatibility, | 95 | // -a is for ssmtp (http://downloads.openwrt.org/people/nico/man/man8/ssmtp.8.html) compatibility, |
| 95 | // it is still under development. | 96 | // it is still under development. |
| 96 | opts = getopt32(argv, "tf:o:w:H:S:a::", &opt_from, NULL, &timeout, &opt_connect, &opt_connect, &list); | 97 | opts = getopt32(argv, "tf:o:iw:H:S:a::", &opt_from, NULL, &timeout, &opt_connect, &opt_connect, &list); |
| 97 | //argc -= optind; | 98 | //argc -= optind; |
| 98 | argv += optind; | 99 | argv += optind; |
| 99 | 100 | ||
diff --git a/miscutils/crond.c b/miscutils/crond.c index d2104c36f..74bf9168b 100644 --- a/miscutils/crond.c +++ b/miscutils/crond.c | |||
| @@ -29,7 +29,7 @@ | |||
| 29 | #define SENDMAIL "sendmail" | 29 | #define SENDMAIL "sendmail" |
| 30 | #endif | 30 | #endif |
| 31 | #ifndef SENDMAIL_ARGS | 31 | #ifndef SENDMAIL_ARGS |
| 32 | #define SENDMAIL_ARGS "-ti", "oem" | 32 | #define SENDMAIL_ARGS "-ti", NULL |
| 33 | #endif | 33 | #endif |
| 34 | #ifndef CRONUPDATE | 34 | #ifndef CRONUPDATE |
| 35 | #define CRONUPDATE "cron.update" | 35 | #define CRONUPDATE "cron.update" |
