Bump version to 1.32.0

[oweals/busybox.git] / runit / chpst.c

diff --git a/runit/chpst.c b/runit/chpst.c
index 89d8ce4435df29d9124e52d75d67cc7267095b5d..af777568fc5cd180882ac913e53542cb78f0c42c 100644 (file)
--- 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.
 
    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,
 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,


@@ -26,82 +26,179 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 /* Busyboxed by Denys Vlasenko <vda.linux@googlemail.com> */
 */
 
 /* Busyboxed by Denys Vlasenko <vda.linux@googlemail.com> */

-/* Dependencies on runit_lib.c removed */
+
+//config:config CHPST
+//config:      bool "chpst (9 kb)"
+//config:      default y
+//config:      help
+//config:      chpst changes the process state according to the given options, and
+//config:      execs specified program.
+//config:
+//config:config SETUIDGID
+//config:      bool "setuidgid (4 kb)"
+//config:      default y
+//config:      help
+//config:      Sets soft resource limits as specified by options
+//config:
+//config:config ENVUIDGID
+//config:      bool "envuidgid (3.9 kb)"
+//config:      default y
+//config:      help
+//config:      Sets $UID to account's uid and $GID to account's gid
+//config:
+//config:config ENVDIR
+//config:      bool "envdir (2.5 kb)"
+//config:      default y
+//config:      help
+//config:      Sets various environment variables as specified by files
+//config:      in the given directory
+//config:
+//config:config SOFTLIMIT
+//config:      bool "softlimit (4.5 kb)"
+//config:      default y
+//config:      help
+//config:      Sets soft resource limits as specified by options
+
+//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
+//kbuild:lib-$(CONFIG_ENVUIDGID) += chpst.o
+//kbuild:lib-$(CONFIG_SETUIDGID) += chpst.o
+//kbuild:lib-$(CONFIG_SOFTLIMIT) += chpst.o
+
+//usage:#define chpst_trivial_usage
+//usage:       "[-vP012] [-u USER[:GRP]] [-U USER[:GRP]] [-e DIR]\n"
+//usage:       "       [-/ DIR] [-n NICE] [-m BYTES] [-d BYTES] [-o N]\n"
+//usage:       "       [-p N] [-f BYTES] [-c BYTES] PROG ARGS"
+//usage:#define chpst_full_usage "\n\n"
+//usage:       "Change the process state, run PROG\n"
+//usage:     "\n       -u USER[:GRP]   Set uid and gid"
+//usage:     "\n       -U USER[:GRP]   Set $UID and $GID in environment"
+//usage:     "\n       -e DIR          Set environment variables as specified by files"
+//usage:     "\n                       in DIR: file=1st_line_of_file"
+//usage:     "\n       -/ DIR          Chroot to DIR"
+//usage:     "\n       -n NICE         Add NICE to nice value"
+//usage:     "\n       -m BYTES        Same as -d BYTES -s BYTES -l BYTES"
+//usage:     "\n       -d BYTES        Limit data segment"
+//usage:     "\n       -o N            Limit number of open files per process"
+//usage:     "\n       -p N            Limit number of processes per uid"
+//usage:     "\n       -f BYTES        Limit output file sizes"
+//usage:     "\n       -c BYTES        Limit core file size"
+//usage:     "\n       -v              Verbose"
+//usage:     "\n       -P              Create new process group"
+//usage:     "\n       -0              Close stdin"
+//usage:     "\n       -1              Close stdout"
+//usage:     "\n       -2              Close stderr"
+//usage:
+//usage:#define envdir_trivial_usage
+//usage:       "DIR PROG ARGS"
+//usage:#define envdir_full_usage "\n\n"
+//usage:       "Set various environment variables as specified by files\n"
+//usage:       "in the directory DIR, run PROG"
+//usage:
+//usage:#define envuidgid_trivial_usage
+//usage:       "USER PROG ARGS"
+//usage:#define envuidgid_full_usage "\n\n"
+//usage:       "Set $UID to USER's uid and $GID to USER's gid, run PROG"
+//usage:
+//usage:#define setuidgid_trivial_usage
+//usage:       "USER PROG ARGS"
+//usage:#define setuidgid_full_usage "\n\n"
+//usage:       "Set uid and gid to USER's uid and gid, drop supplementary group ids,\n"
+//usage:       "run PROG"
+//usage:
+//usage:#define softlimit_trivial_usage
+//usage:       "[-a BYTES] [-m BYTES] [-d BYTES] [-s BYTES] [-l BYTES]\n"
+//usage:       "       [-f BYTES] [-c BYTES] [-r BYTES] [-o N] [-p N] [-t N]\n"
+//usage:       "       PROG ARGS"
+//usage:#define softlimit_full_usage "\n\n"
+//usage:       "Set soft resource limits, then run PROG\n"
+//usage:     "\n       -a BYTES        Limit total size of all segments"
+//usage:     "\n       -m BYTES        Same as -d BYTES -s BYTES -l BYTES -a BYTES"
+//usage:     "\n       -d BYTES        Limit data segment"
+//usage:     "\n       -s BYTES        Limit stack segment"
+//usage:     "\n       -l BYTES        Limit locked memory size"
+//usage:     "\n       -o N            Limit number of open files per process"
+//usage:     "\n       -p N            Limit number of processes per uid"
+//usage:     "\nOptions controlling file sizes:"
+//usage:     "\n       -f BYTES        Limit output file sizes"
+//usage:     "\n       -c BYTES        Limit core file size"
+//usage:     "\nEfficiency opts:"
+//usage:     "\n       -r BYTES        Limit resident set size"
+//usage:     "\n       -t N            Limit CPU time, process receives"
+//usage:     "\n                       a SIGXCPU after N seconds"

 
 #include "libbb.h"
 
 
 #include "libbb.h"
 

-#include <dirent.h>
-
-// Must match constants in chpst_main!
-#define OPT_verbose  (option_mask32 & 0x2000)
-#define OPT_pgrp     (option_mask32 & 0x4000)
-#define OPT_nostdin  (option_mask32 & 0x8000)
-#define OPT_nostdout (option_mask32 & 0x10000)
-#define OPT_nostderr (option_mask32 & 0x20000)
-
-struct globals {
-       char *set_user;
-       char *env_user;
-       const char *env_dir;
-       const char *root;
-       long limitd; /* limitX are initialized to -2 */
-       long limits;
-       long limitl;
-       long limita;
-       long limito;
-       long limitp;
-       long limitf;
-       long limitc;
-       long limitr;
-       long limitt;
-       int nicelvl;
-};
-#define G (*(struct globals*)&bb_common_bufsiz1)
-#define set_user (G.set_user)
-#define env_user (G.env_user)
-#define env_dir  (G.env_dir )
-#define root     (G.root    )
-#define limitd   (G.limitd  )
-#define limits   (G.limits  )
-#define limitl   (G.limitl  )
-#define limita   (G.limita  )
-#define limito   (G.limito  )
-#define limitp   (G.limitp  )
-#define limitf   (G.limitf  )
-#define limitc   (G.limitc  )
-#define limitr   (G.limitr  )
-#define limitt   (G.limitt  )
-#define nicelvl  (G.nicelvl )
-#define INIT_G() do { \
-       long *p = &limitd; \
-       do *p++ = -2; while (p <= &limitt); \
-} while (0)
-
-static void suidgid(char *user)
-{
-       struct bb_uidgid_t ugid;
+/*
+Five applets here: chpst, envdir, envuidgid, setuidgid, softlimit.

 
 

-       if (!get_uidgid(&ugid, user, 1)) {
-               bb_error_msg_and_die("unknown user/group: %s", user);
-       }
-       if (setgroups(1, &ugid.gid) == -1)
-               bb_perror_msg_and_die("setgroups");
-       xsetgid(ugid.gid);
-       xsetuid(ugid.uid);
-}
+Only softlimit and chpst are taking options:

 
 

-static void euidgid(char *user)
-{
-       struct bb_uidgid_t ugid;
+# common
+-o N            Limit number of open files per process
+-p N            Limit number of processes per uid
+-m BYTES        Same as -d BYTES -s BYTES -l BYTES [-a BYTES]
+-d BYTES        Limit data segment
+-f BYTES        Limit output file sizes
+-c BYTES        Limit core file size
+# softlimit
+-a BYTES        Limit total size of all segments
+-s BYTES        Limit stack segment
+-l BYTES        Limit locked memory size
+-r BYTES        Limit resident set size
+-t N            Limit CPU time
+# chpst
+-u USER[:GRP]   Set uid and gid
+-U USER[:GRP]   Set $UID and $GID in environment
+-e DIR          Set environment variables as specified by files in DIR
+-/ DIR          Chroot to DIR
+-n NICE         Add NICE to nice value
+-v              Verbose
+-P              Create new process group
+-0 -1 -2        Close fd 0,1,2

 
 

-       if (!get_uidgid(&ugid, user, 1)) {
-               bb_error_msg_and_die("unknown user/group: %s", user);
-       }
-       xsetenv("GID", utoa(ugid.gid));
-       xsetenv("UID", utoa(ugid.uid));
-}
+Even though we accept all these options for both softlimit and chpst,
+they are not to be advertised on their help texts.
+We have enough problems with feature creep in other people's
+software, don't want to add our own.

 
 

-static void edir(const char *directory_name)
+envdir, envuidgid, setuidgid take no options, but they reuse code which
+handles -e, -U and -u.
+*/
+
+enum {
+       OPT_a = (1 << 0) * ENABLE_SOFTLIMIT,
+       OPT_c = (1 << 1) * (ENABLE_SOFTLIMIT || ENABLE_CHPST),
+       OPT_d = (1 << 2) * (ENABLE_SOFTLIMIT || ENABLE_CHPST),
+       OPT_f = (1 << 3) * (ENABLE_SOFTLIMIT || ENABLE_CHPST),
+       OPT_l = (1 << 4) * ENABLE_SOFTLIMIT,
+       OPT_m = (1 << 5) * (ENABLE_SOFTLIMIT || ENABLE_CHPST),
+       OPT_o = (1 << 6) * (ENABLE_SOFTLIMIT || ENABLE_CHPST),
+       OPT_p = (1 << 7) * (ENABLE_SOFTLIMIT || ENABLE_CHPST),
+       OPT_r = (1 << 8) * ENABLE_SOFTLIMIT,
+       OPT_s = (1 << 9) * ENABLE_SOFTLIMIT,
+       OPT_t = (1 << 10) * ENABLE_SOFTLIMIT,
+       OPT_u = (1 << 11) * (ENABLE_CHPST || ENABLE_SETUIDGID),
+       OPT_U = (1 << 12) * (ENABLE_CHPST || ENABLE_ENVUIDGID),
+       OPT_e = (1 << 13) * (ENABLE_CHPST || ENABLE_ENVDIR),
+       OPT_root = (1 << 14) * ENABLE_CHPST,
+       OPT_n = (1 << 15) * ENABLE_CHPST,
+       OPT_v = (1 << 16) * ENABLE_CHPST,
+       OPT_P = (1 << 17) * ENABLE_CHPST,
+       OPT_0 = (1 << 18) * ENABLE_CHPST,
+       OPT_1 = (1 << 19) * ENABLE_CHPST,
+       OPT_2 = (1 << 20) * ENABLE_CHPST,
+};
+
+/* TODO: use recursive_action? */
+static NOINLINE void edir(const char *directory_name)

 {
        int wdir;
        DIR *dir;
 {
        int wdir;
        DIR *dir;


@@ -110,10 +207,12 @@ static void edir(const char *directory_name)
 
        wdir = xopen(".", O_RDONLY | O_NDELAY);
        xchdir(directory_name);
 
        wdir = xopen(".", O_RDONLY | O_NDELAY);
        xchdir(directory_name);

-       dir = opendir(".");
-       if (!dir)
-               bb_perror_msg_and_die("opendir %s", directory_name);
+       dir = xopendir(".");

        for (;;) {
        for (;;) {

+               char buf[256];
+               char *tail;
+               int size;
+

                errno = 0;
                d = readdir(dir);
                if (!d) {
                errno = 0;
                d = readdir(dir);
                if (!d) {


@@ -126,44 +225,37 @@ static void edir(const char *directory_name)
                        continue;
                fd = open(d->d_name, O_RDONLY | O_NDELAY);
                if (fd < 0) {
                        continue;
                fd = open(d->d_name, O_RDONLY | O_NDELAY);
                if (fd < 0) {

-                       if ((errno == EISDIR) && env_dir) {
-                               if (OPT_verbose)
+                       if ((errno == EISDIR) && directory_name) {
+                               if (option_mask32 & OPT_v)

                                        bb_perror_msg("warning: %s/%s is a directory",
                                        bb_perror_msg("warning: %s/%s is a directory",

-                                               directory_name, d->d_name);
-                               continue;
-                       } else
-                               bb_perror_msg_and_die("open %s/%s",
-                                               directory_name, d->d_name);
-               }
-               if (fd >= 0) {
-                       char buf[256];
-                       char *tail;
-                       int size;
-
-                       size = safe_read(fd, buf, sizeof(buf)-1);
-                       if (size < 0)
-                               bb_perror_msg_and_die("read %s/%s",

                                                directory_name, d->d_name);
                                                directory_name, d->d_name);

-                       if (size == 0) {
-                               unsetenv(d->d_name);

                                continue;
                        }
                                continue;
                        }

-                       buf[size] = '\n';
-                       tail = memchr(buf, '\n', sizeof(buf));
-                       /* skip trailing whitespace */;
-                       while (1) {
-                               if (tail[0] == ' ') tail[0] = '\0';
-                               if (tail[0] == '\t') tail[0] = '\0';
-                               if (tail[0] == '\n') tail[0] = '\0';
-                               if (tail == buf) break;
-                               tail--;
-                       }
-                       xsetenv(d->d_name, buf);
+                       bb_perror_msg_and_die("open %s/%s",
+                                               directory_name, d->d_name);
+               }
+               size = full_read(fd, buf, sizeof(buf)-1);
+               close(fd);
+               if (size < 0)
+                       bb_perror_msg_and_die("read %s/%s",
+                                       directory_name, d->d_name);
+               if (size == 0) {
+                       unsetenv(d->d_name);
+                       continue;

                }
                }

+               buf[size] = '\n';
+               tail = strchr(buf, '\n');
+               /* skip trailing whitespace */
+               while (1) {
+                       *tail = '\0';
+                       tail--;
+                       if (tail < buf || !isspace(*tail))
+                               break;
+               }
+               xsetenv(d->d_name, buf);

        }
        closedir(dir);
        }
        closedir(dir);

-       if (fchdir(wdir) == -1)
-               bb_perror_msg_and_die("fchdir");
+       xfchdir(wdir);

        close(wdir);
 }
 
        close(wdir);
 }
 


@@ -171,239 +263,226 @@ static void limit(int what, long l)
 {
        struct rlimit r;
 
 {
        struct rlimit r;
 

-       if (getrlimit(what, &r) == -1)
-               bb_perror_msg_and_die("getrlimit");
+       /* Never fails under Linux (except if you pass it bad arguments) */
+       getrlimit(what, &r);

        if ((l < 0) || (l > r.rlim_max))
                r.rlim_cur = r.rlim_max;
        else
                r.rlim_cur = l;
        if (setrlimit(what, &r) == -1)
        if ((l < 0) || (l > r.rlim_max))
                r.rlim_cur = r.rlim_max;
        else
                r.rlim_cur = l;
        if (setrlimit(what, &r) == -1)

-               bb_perror_msg_and_die("setrlimit");
+               bb_simple_perror_msg_and_die("setrlimit");

 }
 
 }
 

-static void slimit(void)
+int chpst_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int chpst_main(int argc UNUSED_PARAM, char **argv)

 {
 {

-       if (limitd >= -1) {
+       struct bb_uidgid_t ugid;
+       char *set_user = set_user; /* for compiler */
+       char *env_dir = env_dir;
+       char *root;
+       char *nicestr;
+       unsigned limita;
+       unsigned limitc;
+       unsigned limitd;
+       unsigned limitf;
+       unsigned limitl;
+       unsigned limitm;
+       unsigned limito;
+       unsigned limitp;
+       unsigned limitr;
+       unsigned limits;
+       unsigned limitt;
+       unsigned opt;
+
+       if ((ENABLE_CHPST && applet_name[0] == 'c')
+        || (ENABLE_SOFTLIMIT && applet_name[1] == 'o')
+       ) {
+               // FIXME: can we live with int-sized limits?
+               // can we live with 40000 days?
+               // if yes -> getopt converts strings to numbers for us
+               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
+                       IF_CHPST(, &root, &nicestr));
+               argv += optind;
+               if (opt & OPT_m) { // -m means -asld
+                       limita = limits = limitl = limitd = limitm;
+                       opt |= (OPT_s | OPT_l | OPT_a | OPT_d);
+               }
+       } else {
+               option_mask32 = opt = 0;
+               argv++;
+               if (!*argv)
+                       bb_show_usage();
+       }
+
+       // envdir?
+       if (ENABLE_ENVDIR && applet_name[3] == 'd') {
+               env_dir = *argv++;
+               opt |= OPT_e;
+       }
+
+       // setuidgid?
+       if (ENABLE_SETUIDGID && applet_name[1] == 'e') {
+               set_user = *argv++;
+               opt |= OPT_u;
+       }
+
+       // envuidgid?
+       if (ENABLE_ENVUIDGID && applet_name[0] == 'e' && applet_name[3] == 'u') {
+               set_user = *argv++;
+               opt |= OPT_U;
+       }
+
+       // we must have PROG [ARGS]
+       if (!*argv)
+               bb_show_usage();
+
+       // set limits
+       if (opt & OPT_d) {

 #ifdef RLIMIT_DATA
                limit(RLIMIT_DATA, limitd);
 #else
 #ifdef RLIMIT_DATA
                limit(RLIMIT_DATA, limitd);
 #else

-               if (OPT_verbose)
+               if (opt & OPT_v)

                        bb_error_msg("system does not support RLIMIT_%s",
                                "DATA");
 #endif
        }
                        bb_error_msg("system does not support RLIMIT_%s",
                                "DATA");
 #endif
        }

-       if (limits >= -1) {
+       if (opt & OPT_s) {

 #ifdef RLIMIT_STACK
                limit(RLIMIT_STACK, limits);
 #else
 #ifdef RLIMIT_STACK
                limit(RLIMIT_STACK, limits);
 #else

-               if (OPT_verbose)
+               if (opt & OPT_v)

                        bb_error_msg("system does not support RLIMIT_%s",
                                "STACK");
 #endif
        }
                        bb_error_msg("system does not support RLIMIT_%s",
                                "STACK");
 #endif
        }

-       if (limitl >= -1) {
+       if (opt & OPT_l) {

 #ifdef RLIMIT_MEMLOCK
                limit(RLIMIT_MEMLOCK, limitl);
 #else
 #ifdef RLIMIT_MEMLOCK
                limit(RLIMIT_MEMLOCK, limitl);
 #else

-               if (OPT_verbose)
+               if (opt & OPT_v)

                        bb_error_msg("system does not support RLIMIT_%s",
                                "MEMLOCK");
 #endif
        }
                        bb_error_msg("system does not support RLIMIT_%s",
                                "MEMLOCK");
 #endif
        }

-       if (limita >= -1) {
+       if (opt & OPT_a) {

 #ifdef RLIMIT_VMEM
                limit(RLIMIT_VMEM, limita);
 #else
 #ifdef RLIMIT_AS
                limit(RLIMIT_AS, limita);
 #else
 #ifdef RLIMIT_VMEM
                limit(RLIMIT_VMEM, limita);
 #else
 #ifdef RLIMIT_AS
                limit(RLIMIT_AS, limita);
 #else

-               if (OPT_verbose)
+               if (opt & OPT_v)

                        bb_error_msg("system does not support RLIMIT_%s",
                                "VMEM");
 #endif
 #endif
        }
                        bb_error_msg("system does not support RLIMIT_%s",
                                "VMEM");
 #endif
 #endif
        }

-       if (limito >= -1) {
+       if (opt & OPT_o) {

 #ifdef RLIMIT_NOFILE
                limit(RLIMIT_NOFILE, limito);
 #else
 #ifdef RLIMIT_OFILE
                limit(RLIMIT_OFILE, limito);
 #else
 #ifdef RLIMIT_NOFILE
                limit(RLIMIT_NOFILE, limito);
 #else
 #ifdef RLIMIT_OFILE
                limit(RLIMIT_OFILE, limito);
 #else

-               if (OPT_verbose)
+               if (opt & OPT_v)

                        bb_error_msg("system does not support RLIMIT_%s",
                                "NOFILE");
 #endif
 #endif
        }
                        bb_error_msg("system does not support RLIMIT_%s",
                                "NOFILE");
 #endif
 #endif
        }

-       if (limitp >= -1) {
+       if (opt & OPT_p) {

 #ifdef RLIMIT_NPROC
                limit(RLIMIT_NPROC, limitp);
 #else
 #ifdef RLIMIT_NPROC
                limit(RLIMIT_NPROC, limitp);
 #else

-               if (OPT_verbose)
+               if (opt & OPT_v)

                        bb_error_msg("system does not support RLIMIT_%s",
                                "NPROC");
 #endif
        }
                        bb_error_msg("system does not support RLIMIT_%s",
                                "NPROC");
 #endif
        }

-       if (limitf >= -1) {
+       if (opt & OPT_f) {

 #ifdef RLIMIT_FSIZE
                limit(RLIMIT_FSIZE, limitf);
 #else
 #ifdef RLIMIT_FSIZE
                limit(RLIMIT_FSIZE, limitf);
 #else

-               if (OPT_verbose)
+               if (opt & OPT_v)

                        bb_error_msg("system does not support RLIMIT_%s",
                                "FSIZE");
 #endif
        }
                        bb_error_msg("system does not support RLIMIT_%s",
                                "FSIZE");
 #endif
        }

-       if (limitc >= -1) {
+       if (opt & OPT_c) {

 #ifdef RLIMIT_CORE
                limit(RLIMIT_CORE, limitc);
 #else
 #ifdef RLIMIT_CORE
                limit(RLIMIT_CORE, limitc);
 #else

-               if (OPT_verbose)
+               if (opt & OPT_v)

                        bb_error_msg("system does not support RLIMIT_%s",
                                "CORE");
 #endif
        }
                        bb_error_msg("system does not support RLIMIT_%s",
                                "CORE");
 #endif
        }

-       if (limitr >= -1) {
+       if (opt & OPT_r) {

 #ifdef RLIMIT_RSS
                limit(RLIMIT_RSS, limitr);
 #else
 #ifdef RLIMIT_RSS
                limit(RLIMIT_RSS, limitr);
 #else

-               if (OPT_verbose)
+               if (opt & OPT_v)

                        bb_error_msg("system does not support RLIMIT_%s",
                                "RSS");
 #endif
        }
                        bb_error_msg("system does not support RLIMIT_%s",
                                "RSS");
 #endif
        }

-       if (limitt >= -1) {
+       if (opt & OPT_t) {

 #ifdef RLIMIT_CPU
                limit(RLIMIT_CPU, limitt);
 #else
 #ifdef RLIMIT_CPU
                limit(RLIMIT_CPU, limitt);
 #else

-               if (OPT_verbose)
+               if (opt & OPT_v)

                        bb_error_msg("system does not support RLIMIT_%s",
                                "CPU");
 #endif
        }
                        bb_error_msg("system does not support RLIMIT_%s",
                                "CPU");
 #endif
        }

-}

 
 

-/* argv[0] */
-static void setuidgid(int, char **) ATTRIBUTE_NORETURN;
-static void envuidgid(int, char **) ATTRIBUTE_NORETURN;
-static void envdir(int, char **) ATTRIBUTE_NORETURN;
-static void softlimit(int, char **) ATTRIBUTE_NORETURN;
+       if (opt & OPT_P)
+               setsid();

 
 

-int chpst_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
-int chpst_main(int argc, char **argv)
-{
-       INIT_G();
-
-       if (applet_name[3] == 'd') envdir(argc, argv);
-       if (applet_name[1] == 'o') softlimit(argc, argv);
-       if (applet_name[0] == 's') setuidgid(argc, argv);
-       if (applet_name[0] == 'e') envuidgid(argc, argv);
-       // otherwise we are chpst
-
-       {
-               char *m,*d,*o,*p,*f,*c,*r,*t,*n;
-               getopt32(argv, "+u:U:e:m:d:o:p:f:c:r:t:/:n:vP012",
-                               &set_user,&env_user,&env_dir,
-                               &m,&d,&o,&p,&f,&c,&r,&t,&root,&n);
-               // if (option_mask32 & 0x1) // -u
-               // if (option_mask32 & 0x2) // -U
-               // if (option_mask32 & 0x4) // -e
-               if (option_mask32 & 0x8) limits = limitl = limita = limitd = xatoul(m); // -m
-               if (option_mask32 & 0x10) limitd = xatoul(d); // -d
-               if (option_mask32 & 0x20) limito = xatoul(o); // -o
-               if (option_mask32 & 0x40) limitp = xatoul(p); // -p
-               if (option_mask32 & 0x80) limitf = xatoul(f); // -f
-               if (option_mask32 & 0x100) limitc = xatoul(c); // -c
-               if (option_mask32 & 0x200) limitr = xatoul(r); // -r
-               if (option_mask32 & 0x400) limitt = xatoul(t); // -t
-               // if (option_mask32 & 0x800) // -/
-               if (option_mask32 & 0x1000) nicelvl = xatoi(n); // -n
-               // The below consts should match #defines at top!
-               //if (option_mask32 & 0x2000) OPT_verbose = 1; // -v
-               //if (option_mask32 & 0x4000) OPT_pgrp = 1; // -P
-               //if (option_mask32 & 0x8000) OPT_nostdin = 1; // -0
-               //if (option_mask32 & 0x10000) OPT_nostdout = 1; // -1
-               //if (option_mask32 & 0x20000) OPT_nostderr = 1; // -2
+       if (opt & OPT_e)
+               edir(env_dir);
+
+       if (opt & (OPT_u|OPT_U))
+               xget_uidgid(&ugid, set_user);
+
+       // chrooted jail must have /etc/passwd if we move this after chroot.
+       // OTOH chroot fails for non-roots.
+       // Solution: cache uid/gid before chroot, apply uid/gid after.
+       if (opt & OPT_U) {
+               xsetenv("GID", utoa(ugid.gid));
+               xsetenv("UID", utoa(ugid.uid));

        }
        }

-       argv += optind;
-       if (!argv || !*argv) bb_show_usage();
-
-       if (OPT_pgrp) setsid();
-       if (env_dir) edir(env_dir);
-       if (root) {
-               xchdir(root);
-               xchroot(".");
+
+       if (opt & OPT_root) {
+               xchroot(root);

        }
        }

-       slimit();
-       if (nicelvl) {
+
+       /* nice should be done before xsetuid */
+       if (opt & OPT_n) {

                errno = 0;
                errno = 0;

-               if (nice(nicelvl) == -1)
-                       bb_perror_msg_and_die("nice");
+               if (nice(xatoi(nicestr)) == -1)
+                       bb_simple_perror_msg_and_die("nice");

        }
        }

-       if (env_user) euidgid(env_user);
-       if (set_user) suidgid(set_user);
-       if (OPT_nostdin) close(0);
-       if (OPT_nostdout) close(1);
-       if (OPT_nostderr) close(2);
-       BB_EXECVP(argv[0], argv);
-       bb_perror_msg_and_die("exec %s", argv[0]);
-}
-
-static void setuidgid(int argc, char **argv)
-{
-       const char *account;
-
-       account = *++argv;
-       if (!account) bb_show_usage();
-       if (!*++argv) bb_show_usage();
-       suidgid((char*)account);
-       BB_EXECVP(argv[0], argv);
-       bb_perror_msg_and_die("exec %s", argv[0]);
-}

 
 

-static void envuidgid(int argc, char **argv)
-{
-       const char *account;
-
-       account = *++argv;
-       if (!account) bb_show_usage();
-       if (!*++argv) bb_show_usage();
-       euidgid((char*)account);
-       BB_EXECVP(argv[0], argv);
-       bb_perror_msg_and_die("exec %s", argv[0]);
-}
+       if (opt & OPT_u) {
+               if (setgroups(1, &ugid.gid) == -1)
+                       bb_simple_perror_msg_and_die("setgroups");
+               xsetgid(ugid.gid);
+               xsetuid(ugid.uid);
+       }

 
 

-static void envdir(int argc, char **argv)
-{
-       const char *dir;
-
-       dir = *++argv;
-       if (!dir) bb_show_usage();
-       if (!*++argv) bb_show_usage();
-       edir(dir);
-       BB_EXECVP(argv[0], argv);
-       bb_perror_msg_and_die("exec %s", argv[0]);
-}
+       if (opt & OPT_0)
+               close(STDIN_FILENO);
+       if (opt & OPT_1)
+               close(STDOUT_FILENO);
+       if (opt & OPT_2)
+               close(STDERR_FILENO);

 
 

-static void softlimit(int argc, char **argv)
-{
-       char *a,*c,*d,*f,*l,*m,*o,*p,*r,*s,*t;
-       getopt32(argv, "+a:c:d:f:l:m:o:p:r:s:t:",
-                       &a,&c,&d,&f,&l,&m,&o,&p,&r,&s,&t);
-       if (option_mask32 & 0x001) limita = xatoul(a); // -a
-       if (option_mask32 & 0x002) limitc = xatoul(c); // -c
-       if (option_mask32 & 0x004) limitd = xatoul(d); // -d
-       if (option_mask32 & 0x008) limitf = xatoul(f); // -f
-       if (option_mask32 & 0x010) limitl = xatoul(l); // -l
-       if (option_mask32 & 0x020) limits = limitl = limita = limitd = xatoul(m); // -m
-       if (option_mask32 & 0x040) limito = xatoul(o); // -o
-       if (option_mask32 & 0x080) limitp = xatoul(p); // -p
-       if (option_mask32 & 0x100) limitr = xatoul(r); // -r
-       if (option_mask32 & 0x200) limits = xatoul(s); // -s
-       if (option_mask32 & 0x400) limitt = xatoul(t); // -t
-       argv += optind;
-       if (!argv[0]) bb_show_usage();
-       slimit();
-       BB_EXECVP(argv[0], argv);
-       bb_perror_msg_and_die("exec %s", argv[0]);
+       BB_EXECVP_or_die(argv);

 }
 }