diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2016-11-23 09:58:03 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2016-11-23 09:58:03 +0100 |
| commit | c19f7584e14522043da141189711c8db72dfbc90 (patch) | |
| tree | 5338df22283363d2ed79bf53605a325659482ab9 /mailutils | |
| parent | 29e2c45a5b317556a890a86ca7780e589072151c (diff) | |
| download | busybox-w32-c19f7584e14522043da141189711c8db72dfbc90.tar.gz busybox-w32-c19f7584e14522043da141189711c8db72dfbc90.tar.bz2 busybox-w32-c19f7584e14522043da141189711c8db72dfbc90.zip | |
Convert all mailutils/* applets to "new style" applet definitions
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'mailutils')
| -rw-r--r-- | mailutils/Config.src | 43 | ||||
| -rw-r--r-- | mailutils/makemime.c | 7 | ||||
| -rw-r--r-- | mailutils/popmaildir.c | 18 | ||||
| -rw-r--r-- | mailutils/reformime.c | 15 | ||||
| -rw-r--r-- | mailutils/sendmail.c | 7 |
5 files changed, 47 insertions, 43 deletions
diff --git a/mailutils/Config.src b/mailutils/Config.src index 2a9c5c074..e45a0f8fb 100644 --- a/mailutils/Config.src +++ b/mailutils/Config.src | |||
| @@ -2,12 +2,6 @@ menu "Mail Utilities" | |||
| 2 | 2 | ||
| 3 | INSERT | 3 | INSERT |
| 4 | 4 | ||
| 5 | config MAKEMIME | ||
| 6 | bool "makemime" | ||
| 7 | default y | ||
| 8 | help | ||
| 9 | Create MIME-formatted messages. | ||
| 10 | |||
| 11 | config FEATURE_MIME_CHARSET | 5 | config FEATURE_MIME_CHARSET |
| 12 | string "Default charset" | 6 | string "Default charset" |
| 13 | default "us-ascii" | 7 | default "us-ascii" |
| @@ -15,41 +9,4 @@ config FEATURE_MIME_CHARSET | |||
| 15 | help | 9 | help |
| 16 | Default charset of the message. | 10 | Default charset of the message. |
| 17 | 11 | ||
| 18 | config POPMAILDIR | ||
| 19 | bool "popmaildir" | ||
| 20 | default y | ||
| 21 | help | ||
| 22 | Simple yet powerful POP3 mail popper. Delivers content | ||
| 23 | of remote mailboxes to local Maildir. | ||
| 24 | |||
| 25 | config FEATURE_POPMAILDIR_DELIVERY | ||
| 26 | bool "Allow message filters and custom delivery program" | ||
| 27 | default y | ||
| 28 | depends on POPMAILDIR | ||
| 29 | help | ||
| 30 | Allow to use a custom program to filter the content | ||
| 31 | of the message before actual delivery (-F "prog [args...]"). | ||
| 32 | Allow to use a custom program for message actual delivery | ||
| 33 | (-M "prog [args...]"). | ||
| 34 | |||
| 35 | config REFORMIME | ||
| 36 | bool "reformime" | ||
| 37 | default y | ||
| 38 | help | ||
| 39 | Parse MIME-formatted messages. | ||
| 40 | |||
| 41 | config FEATURE_REFORMIME_COMPAT | ||
| 42 | bool "Accept and ignore options other than -x and -X" | ||
| 43 | default y | ||
| 44 | depends on REFORMIME | ||
| 45 | help | ||
| 46 | Accept (for compatibility only) and ignore options | ||
| 47 | other than -x and -X. | ||
| 48 | |||
| 49 | config SENDMAIL | ||
| 50 | bool "sendmail" | ||
| 51 | default y | ||
| 52 | help | ||
| 53 | Barebones sendmail. | ||
| 54 | |||
| 55 | endmenu | 12 | endmenu |
diff --git a/mailutils/makemime.c b/mailutils/makemime.c index 8e1bc664c..78f78bbcc 100644 --- a/mailutils/makemime.c +++ b/mailutils/makemime.c | |||
| @@ -6,6 +6,13 @@ | |||
| 6 | * | 6 | * |
| 7 | * Licensed under GPLv2, see file LICENSE in this source tree. | 7 | * Licensed under GPLv2, see file LICENSE in this source tree. |
| 8 | */ | 8 | */ |
| 9 | //config:config MAKEMIME | ||
| 10 | //config: bool "makemime" | ||
| 11 | //config: default y | ||
| 12 | //config: help | ||
| 13 | //config: Create MIME-formatted messages. | ||
| 14 | |||
| 15 | //applet:IF_MAKEMIME(APPLET(makemime, BB_DIR_BIN, BB_SUID_DROP)) | ||
| 9 | 16 | ||
| 10 | //kbuild:lib-$(CONFIG_MAKEMIME) += makemime.o mail.o | 17 | //kbuild:lib-$(CONFIG_MAKEMIME) += makemime.o mail.o |
| 11 | 18 | ||
diff --git a/mailutils/popmaildir.c b/mailutils/popmaildir.c index 69eca6164..ffe373865 100644 --- a/mailutils/popmaildir.c +++ b/mailutils/popmaildir.c | |||
| @@ -9,6 +9,24 @@ | |||
| 9 | * | 9 | * |
| 10 | * Licensed under GPLv2, see file LICENSE in this source tree. | 10 | * Licensed under GPLv2, see file LICENSE in this source tree. |
| 11 | */ | 11 | */ |
| 12 | //config:config POPMAILDIR | ||
| 13 | //config: bool "popmaildir" | ||
| 14 | //config: default y | ||
| 15 | //config: help | ||
| 16 | //config: Simple yet powerful POP3 mail popper. Delivers content | ||
| 17 | //config: of remote mailboxes to local Maildir. | ||
| 18 | //config: | ||
| 19 | //config:config FEATURE_POPMAILDIR_DELIVERY | ||
| 20 | //config: bool "Allow message filters and custom delivery program" | ||
| 21 | //config: default y | ||
| 22 | //config: depends on POPMAILDIR | ||
| 23 | //config: help | ||
| 24 | //config: Allow to use a custom program to filter the content | ||
| 25 | //config: of the message before actual delivery (-F "prog [args...]"). | ||
| 26 | //config: Allow to use a custom program for message actual delivery | ||
| 27 | //config: (-M "prog [args...]"). | ||
| 28 | |||
| 29 | //applet:IF_POPMAILDIR(APPLET(popmaildir, BB_DIR_USR_SBIN, BB_SUID_DROP)) | ||
| 12 | 30 | ||
| 13 | //kbuild:lib-$(CONFIG_POPMAILDIR) += popmaildir.o mail.o | 31 | //kbuild:lib-$(CONFIG_POPMAILDIR) += popmaildir.o mail.o |
| 14 | 32 | ||
diff --git a/mailutils/reformime.c b/mailutils/reformime.c index b967dfbc7..e97bc0130 100644 --- a/mailutils/reformime.c +++ b/mailutils/reformime.c | |||
| @@ -6,6 +6,21 @@ | |||
| 6 | * | 6 | * |
| 7 | * Licensed under GPLv2, see file LICENSE in this source tree. | 7 | * Licensed under GPLv2, see file LICENSE in this source tree. |
| 8 | */ | 8 | */ |
| 9 | //config:config REFORMIME | ||
| 10 | //config: bool "reformime" | ||
| 11 | //config: default y | ||
| 12 | //config: help | ||
| 13 | //config: Parse MIME-formatted messages. | ||
| 14 | //config: | ||
| 15 | //config:config FEATURE_REFORMIME_COMPAT | ||
| 16 | //config: bool "Accept and ignore options other than -x and -X" | ||
| 17 | //config: default y | ||
| 18 | //config: depends on REFORMIME | ||
| 19 | //config: help | ||
| 20 | //config: Accept (for compatibility only) and ignore options | ||
| 21 | //config: other than -x and -X. | ||
| 22 | |||
| 23 | //applet:IF_REFORMIME(APPLET(reformime, BB_DIR_BIN, BB_SUID_DROP)) | ||
| 9 | 24 | ||
| 10 | //kbuild:lib-$(CONFIG_REFORMIME) += reformime.o mail.o | 25 | //kbuild:lib-$(CONFIG_REFORMIME) += reformime.o mail.o |
| 11 | 26 | ||
diff --git a/mailutils/sendmail.c b/mailutils/sendmail.c index 1242795b8..8ddb7826b 100644 --- a/mailutils/sendmail.c +++ b/mailutils/sendmail.c | |||
| @@ -6,6 +6,13 @@ | |||
| 6 | * | 6 | * |
| 7 | * Licensed under GPLv2, see file LICENSE in this source tree. | 7 | * Licensed under GPLv2, see file LICENSE in this source tree. |
| 8 | */ | 8 | */ |
| 9 | //config:config SENDMAIL | ||
| 10 | //config: bool "sendmail" | ||
| 11 | //config: default y | ||
| 12 | //config: help | ||
| 13 | //config: Barebones sendmail. | ||
| 14 | |||
| 15 | //applet:IF_SENDMAIL(APPLET(sendmail, BB_DIR_USR_SBIN, BB_SUID_DROP)) | ||
| 9 | 16 | ||
| 10 | //kbuild:lib-$(CONFIG_SENDMAIL) += sendmail.o mail.o | 17 | //kbuild:lib-$(CONFIG_SENDMAIL) += sendmail.o mail.o |
| 11 | 18 | ||