4 files changed, 22 insertions, 28 deletions

diff --git a/mailutils/mail.c b/mailutils/mail.c
index a7e43c0d1..eceb89071 100644
--- a/mailutils/mail.c
+++ b/mailutils/mail.c
@@ -6,23 +6,15 @@
  *
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
+#include <sys/prctl.h>
 #include "libbb.h"
 #include "mail.h"
 
-static void kill_helper(void)
-{
-        if (G.helper_pid > 0) {
-                kill(G.helper_pid, SIGTERM);
-                G.helper_pid = 0;
-        }
-}
-
 // generic signal handler
 static void signal_handler(int signo)
 {
 #define err signo
         if (SIGALRM == signo) {
-                kill_helper();
                 bb_error_msg_and_die("timed out");
         }
 
@@ -66,16 +58,15 @@ void FAST_FUNC launch_helper(const char **argv)
         // child stdout [1] -> parent stdin [0]
 
         if (!G.helper_pid) {
-                // child: try to execute connection helper
+                // child
+                // if parent dies, get SIGTERM
+                prctl(PR_SET_PDEATHSIG, SIGTERM, 0, 0, 0);
+                // try to execute connection helper
                 // NB: SIGCHLD & SIGALRM revert to SIG_DFL on exec
                 BB_EXECVP_or_die((char**)argv);
         }
 
-        // parent
-        // check whether child is alive
-        //redundant:signal_handler(SIGCHLD);
-        // child seems OK -> parent goes on
-        atexit(kill_helper);
+        // parent goes on
 }
 
 char* FAST_FUNC send_mail_command(const char *fmt, const char *param)
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 346de2712..f440e6319 100644
--- a/mailutils/sendmail.c
+++ b/mailutils/sendmail.c
@@ -166,9 +166,8 @@ static char *angle_address(char *str)
 {
         char *s, *e;
 
-        trim(str);
-        e = last_char_is(str, '>');
-        if (e) {
+        e = trim(str);
+        if (e != str && e[-1] == '>') {
                 s = strrchr(str, '<');
                 if (s) {
                         *e = '\0';
@@ -257,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;