Merge branch 'busybox' into merge

6 files changed, 38 insertions, 33 deletions

diff --git a/runit/chpst.c b/runit/chpst.c
index 3a2f9e616..3ecb85cba 100644
--- a/runit/chpst.c
+++ b/runit/chpst.c
@@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are met:
    3. The name of the author may not be used to endorse or promote products
       derived from this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
 EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
@@ -59,12 +59,12 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //config:       help
 //config:       Sets soft resource limits as specified by options
 
-//applet:IF_CHPST(APPLET(chpst, BB_DIR_USR_BIN, BB_SUID_DROP))
-//                    APPLET_ODDNAME:name       main   location        suid_type     help
-//applet:IF_ENVDIR(   APPLET_ODDNAME(envdir,    chpst, BB_DIR_USR_BIN, BB_SUID_DROP, envdir))
-//applet:IF_ENVUIDGID(APPLET_ODDNAME(envuidgid, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, envuidgid))
-//applet:IF_SETUIDGID(APPLET_ODDNAME(setuidgid, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, setuidgid))
-//applet:IF_SOFTLIMIT(APPLET_ODDNAME(softlimit, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, softlimit))
+//applet:IF_CHPST(    APPLET_NOEXEC(chpst,     chpst, BB_DIR_USR_BIN, BB_SUID_DROP, chpst))
+//                    APPLET_NOEXEC:name       main   location        suid_type     help
+//applet:IF_ENVDIR(   APPLET_NOEXEC(envdir,    chpst, BB_DIR_USR_BIN, BB_SUID_DROP, envdir))
+//applet:IF_ENVUIDGID(APPLET_NOEXEC(envuidgid, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, envuidgid))
+//applet:IF_SETUIDGID(APPLET_NOEXEC(setuidgid, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, setuidgid))
+//applet:IF_SOFTLIMIT(APPLET_NOEXEC(softlimit, chpst, BB_DIR_USR_BIN, BB_SUID_DROP, softlimit))
 
 //kbuild:lib-$(CONFIG_CHPST) += chpst.o
 //kbuild:lib-$(CONFIG_ENVDIR) += chpst.o
@@ -301,9 +301,10 @@ int chpst_main(int argc UNUSED_PARAM, char **argv)
                 // FIXME: can we live with int-sized limits?
                 // can we live with 40000 days?
                 // if yes -> getopt converts strings to numbers for us
-                opt_complementary = "-1";
-                opt = getopt32(argv, "+a:+c:+d:+f:+l:+m:+o:+p:+r:+s:+t:+u:U:e:"
-                        IF_CHPST("/:n:vP012"),
+                opt = getopt32(argv, "^+"
+                        "a:+c:+d:+f:+l:+m:+o:+p:+r:+s:+t:+u:U:e:"
+                        IF_CHPST("/:n:vP012")
+                        "\0" "-1",
                         &limita, &limitc, &limitd, &limitf, &limitl,
                         &limitm, &limito, &limitp, &limitr, &limits, &limitt,
                         &set_user, &set_user, &env_dir
diff --git a/runit/runit_lib.h b/runit/runit_lib.h
index c36ea4ca5..c54561616 100644
--- a/runit/runit_lib.h
+++ b/runit/runit_lib.h
@@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are met:
    3. The name of the author may not be used to endorse or promote products
       derived from this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
 EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
diff --git a/runit/runsv.c b/runit/runsv.c
index ad7d82cb8..a67280b4b 100644
--- a/runit/runsv.c
+++ b/runit/runsv.c
@@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are met:
    3. The name of the author may not be used to endorse or promote products
       derived from this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
 EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
diff --git a/runit/runsvdir.c b/runit/runsvdir.c
index b4f5c303b..11ab40abf 100644
--- a/runit/runsvdir.c
+++ b/runit/runsvdir.c
@@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are met:
    3. The name of the author may not be used to endorse or promote products
       derived from this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
 EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
@@ -248,10 +248,9 @@ int runsvdir_main(int argc UNUSED_PARAM, char **argv)
 
         INIT_G();
 
-        opt_complementary = "-1";
         opt_s_argv[0] = NULL;
         opt_s_argv[2] = NULL;
-        getopt32(argv, "Ps:", &opt_s_argv[0]);
+        getopt32(argv, "^" "Ps:" "\0" "-1", &opt_s_argv[0]);
         argv += optind;
 
         i_am_init = (getpid() == 1);
diff --git a/runit/sv.c b/runit/sv.c
index 2d5b466bf..1d0809be8 100644
--- a/runit/sv.c
+++ b/runit/sv.c
@@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are met:
    3. The name of the author may not be used to endorse or promote products
       derived from this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
 EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
@@ -175,8 +175,8 @@ Exit Codes
 //config:       svc controls the state of services monitored by the runsv supervisor.
 //config:       It is comaptible with daemontools command with the same name.
 
-//applet:IF_SV(APPLET(sv, BB_DIR_USR_BIN, BB_SUID_DROP))
-//applet:IF_SVC(APPLET(svc, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_SV( APPLET_NOEXEC(sv,  sv,  BB_DIR_USR_BIN, BB_SUID_DROP, sv ))
+//applet:IF_SVC(APPLET_NOEXEC(svc, svc, BB_DIR_USR_BIN, BB_SUID_DROP, svc))
 
 //kbuild:lib-$(CONFIG_SV) += sv.o
 //kbuild:lib-$(CONFIG_SVC) += sv.o
@@ -193,7 +193,7 @@ struct globals {
 /* "Bernstein" time format: unix + 0x400000000000000aULL */
         uint64_t tstart, tnow;
         svstatus_t svstatus;
-        unsigned islog;
+        smallint islog;
 } FIX_ALIASING;
 #define G (*(struct globals*)bb_common_bufsiz1)
 #define acts         (G.acts        )
@@ -203,7 +203,11 @@ struct globals {
 #define tnow         (G.tnow        )
 #define svstatus     (G.svstatus    )
 #define islog        (G.islog       )
-#define INIT_G() do { setup_common_bufsiz(); } while (0)
+#define INIT_G() do { \
+        setup_common_bufsiz(); \
+        /* need to zero out, svc calls sv() repeatedly */ \
+        memset(&G, 0, sizeof(G)); \
+} while (0)
 
 
 #define str_equal(s,t) (strcmp((s), (t)) == 0)
@@ -502,8 +506,9 @@ static int sv(char **argv)
         x = getenv("SVWAIT");
         if (x) waitsec = xatou(x);
 
-        opt_complementary = "vv"; /* -w N, -v is a counter */
-        getopt32(argv, "w:+v", &waitsec, &verbose);
+        getopt32(argv, "^" "w:+v" "\0" "vv" /* -w N, -v is a counter */,
+                        &waitsec, &verbose
+        );
         argv += optind;
         action = *argv++;
         if (!action || !*argv) bb_show_usage();
@@ -701,8 +706,6 @@ int svc_main(int argc UNUSED_PARAM, char **argv)
         const char *optstring;
         unsigned opts;
 
-        INIT_G();
-
         optstring = "udopchaitkx";
         opts = getopt32(argv, optstring);
         argv += optind;
@@ -718,15 +721,16 @@ int svc_main(int argc UNUSED_PARAM, char **argv)
         argv[1] = command;
         command[1] = '\0';
 
-        /* getopt32() was already called:
-         * reset the libc getopt() function, which keeps internal state.
-         */
-        GETOPT_RESET();
-
         do {
                 if (opts & 1) {
                         int r;
+
                         command[0] = *optstring;
+
+                        /* getopt() was already called by getopt32():
+                         * reset the libc getopt() function's internal state.
+                         */
+                        GETOPT_RESET();
                         r = sv(argv);
                         if (r)
                                 return 1;
diff --git a/runit/svlogd.c b/runit/svlogd.c
index 8dbf67106..739483356 100644
--- a/runit/svlogd.c
+++ b/runit/svlogd.c
@@ -13,7 +13,7 @@ modification, are permitted provided that the following conditions are met:
    3. The name of the author may not be used to endorse or promote products
       derived from this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
 WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
 MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
 EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
@@ -1037,9 +1037,10 @@ int svlogd_main(int argc, char **argv)
 
         INIT_G();
 
-        opt_complementary = "tt:vv";
-        opt = getopt32(argv, "r:R:l:b:tv",
-                        &r, &replace, &l, &b, &timestamp, &verbose);
+        opt = getopt32(argv, "^"
+                        "r:R:l:b:tv" "\0" "tt:vv",
+                        &r, &replace, &l, &b, &timestamp, &verbose
+        );
         if (opt & 1) { // -r
                 repl = r[0];
                 if (!repl || r[1])