ipcrm,ipcs: make them NOEXEC

[oweals/busybox.git] / mailutils / reformime.c

diff --git a/mailutils/reformime.c b/mailutils/reformime.c
index 5e28ef7299ded186c5d9793c61e6881cee5e4ec1..321729e0a352a840a32c848eda79f0ec736529a8 100644 (file)
--- a/mailutils/reformime.c
+++ b/mailutils/reformime.c
@@ -1,12 +1,26 @@
 /* vi: set sw=4 ts=4: */
 /*
- * makemime: create MIME-encoded message
  * reformime: parse MIME-encoded message
  *
  * Copyright (C) 2008 by Vladimir Dronnikov <dronnikov@gmail.com>
  *
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
+//config:config REFORMIME
+//config:      bool "reformime (7.5 kb)"
+//config:      default y
+//config:      help
+//config:      Parse MIME-formatted messages.
+//config:
+//config:config FEATURE_REFORMIME_COMPAT
+//config:      bool "Accept and ignore options other than -x and -X"
+//config:      default y
+//config:      depends on REFORMIME
+//config:      help
+//config:      Accept (for compatibility only) and ignore options
+//config:      other than -x and -X.
+
+//applet:IF_REFORMIME(APPLET(reformime, BB_DIR_BIN, BB_SUID_DROP))
 
 //kbuild:lib-$(CONFIG_REFORMIME) += reformime.o mail.o
 
@@ -135,7 +149,6 @@ static int parse(const char *boundary, char **argv)
                        if (strcasecmp(type + 10, "mixed") != 0)
                                bb_error_msg_and_die("no support of content type '%s'", type);
                        parse(xfind_token(tokens, "boundary"), argv);
-
                } else {
                        /* No, process one non-multipart section */
                        char *end;
@@ -267,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" IF_FEATURE_REFORMIME_COMPAT(":m::");
-       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)
        );