bc: convert to "G trick" - this returns bc to zero bss increase

[oweals/busybox.git] / util-linux / unshare.c

diff --git a/util-linux/unshare.c b/util-linux/unshare.c
index bbabeef55c14f4a81c52c024d715373c3a202b08..fffee28a0972b7913bbcee4a9c1e00abe3580af8 100644 (file)
--- a/util-linux/unshare.c
+++ b/util-linux/unshare.c
@@ -7,14 +7,15 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config UNSHARE
-//config:      bool "unshare"
+//config:      bool "unshare (9.2 kb)"
 //config:      default y
-//config:      depends on LONG_OPTS && !NOMMU
+//config:      depends on !NOMMU
 //config:      select PLATFORM_LINUX
+//config:      select LONG_OPTS
 //config:      help
-//config:        Run program with some namespaces unshared from parent.
+//config:      Run program with some namespaces unshared from parent.
 
-// depends on LONG_OPTS: it is awkward to exclude code which handles --propagation
+// needs LONG_OPTS: it is awkward to exclude code which handles --propagation
 // and --setgroups based on LONG_OPTS, so instead applet requires LONG_OPTS.
 // depends on !NOMMU: we need fork()
 
@@ -25,14 +26,14 @@
 //usage:#define unshare_trivial_usage
 //usage:       "[OPTIONS] [PROG [ARGS]]"
 //usage:#define unshare_full_usage "\n"
-//usage:     "\n       -m, --mount[=FILE]      Unshare mount namespace"
-//usage:     "\n       -u, --uts[=FILE]        Unshare UTS namespace (hostname etc.)"
-//usage:     "\n       -i, --ipc[=FILE]        Unshare System V IPC namespace"
-//usage:     "\n       -n, --net[=FILE]        Unshare network namespace"
-//usage:     "\n       -p, --pid[=FILE]        Unshare PID namespace"
-//usage:     "\n       -U, --user[=FILE}       Unshare user namespace"
-//usage:     "\n       -f, --fork              Fork before execing PROG"
-//usage:     "\n       -r, --map-root-user     Map current user to root (implies -u)"
+//usage:     "\n       -m,--mount[=FILE]       Unshare mount namespace"
+//usage:     "\n       -u,--uts[=FILE]         Unshare UTS namespace (hostname etc.)"
+//usage:     "\n       -i,--ipc[=FILE]         Unshare System V IPC namespace"
+//usage:     "\n       -n,--net[=FILE]         Unshare network namespace"
+//usage:     "\n       -p,--pid[=FILE]         Unshare PID namespace"
+//usage:     "\n       -U,--user[=FILE]        Unshare user namespace"
+//usage:     "\n       -f,--fork               Fork before execing PROG"
+//usage:     "\n       -r,--map-root-user      Map current user to root (implies -U)"
 //usage:     "\n       --mount-proc[=DIR]      Mount /proc filesystem first (implies -m)"
 //usage:     "\n       --propagation slave|shared|private|unchanged"
 //usage:     "\n                               Modify mount propagation in mount namespace"
@@ -72,7 +73,7 @@
 #include "libbb.h"
 
 static void mount_or_die(const char *source, const char *target,
-                 const char *fstype, unsigned long mountflags)
+               const char *fstype, unsigned long mountflags)
 {
        if (mount(source, target, fstype, mountflags, NULL)) {
                bb_perror_msg_and_die("can't mount %s on %s (flags:0x%lx)",
@@ -136,7 +137,7 @@ static const struct namespace_descr ns_list[] = {
  * we are forced to use "fake" letters for them.
  * '+': stop at first non-option.
  */
-static const char opt_str[] ALIGN1 = "+muinpU""fr""\xfd::""\xfe:""\xff:";
+#define OPT_STR "+muinpU""fr""\xfd::""\xfe:""\xff:"
 static const char unshare_longopts[] ALIGN1 =
        "mount\0"               Optional_argument       "\xf0"
        "uts\0"                 Optional_argument       "\xf1"
@@ -209,25 +210,23 @@ int unshare_main(int argc UNUSED_PARAM, char **argv)
        prop_str = PRIVATE_STR;
        setgrp_str = NULL;
 
-       opt_complementary =
+       opts = getopt32long(argv, "^" OPT_STR "\0"
                "\xf0""m" /* long opts (via their "fake chars") imply short opts */
                ":\xf1""u"
                ":\xf2""i"
                ":\xf3""n"
                ":\xf4""p"
                ":\xf5""U"
-               ":ru"      /* --map-root-user or -r implies -u */
+               ":rU"      /* --map-root-user or -r implies -U */
                ":\xfd""m" /* --mount-proc implies -m */
-       ;
-       applet_long_options = unshare_longopts;
-       opts = getopt32(argv, opt_str,
-                       &proc_mnt_target, &prop_str, &setgrp_str,
-                       &ns_ctx_list[NS_MNT_POS].path,
-                       &ns_ctx_list[NS_UTS_POS].path,
-                       &ns_ctx_list[NS_IPC_POS].path,
-                       &ns_ctx_list[NS_NET_POS].path,
-                       &ns_ctx_list[NS_PID_POS].path,
-                       &ns_ctx_list[NS_USR_POS].path
+               , unshare_longopts,
+               &proc_mnt_target, &prop_str, &setgrp_str,
+               &ns_ctx_list[NS_MNT_POS].path,
+               &ns_ctx_list[NS_UTS_POS].path,
+               &ns_ctx_list[NS_IPC_POS].path,
+               &ns_ctx_list[NS_NET_POS].path,
+               &ns_ctx_list[NS_PID_POS].path,
+               &ns_ctx_list[NS_USR_POS].path
        );
        argv += optind;
        //bb_error_msg("opts:0x%x", opts);
@@ -340,7 +339,7 @@ int unshare_main(int argc UNUSED_PARAM, char **argv)
        }
 
        if (opts & OPT_map_root) {
-               char uidmap_buf[sizeof("%u 0 1") + sizeof(int)*3];
+               char uidmap_buf[sizeof("0 %u 1") + sizeof(int)*3];
 
                /*
                 * Since Linux 3.19 unprivileged writing of /proc/self/gid_map
@@ -349,9 +348,9 @@ int unshare_main(int argc UNUSED_PARAM, char **argv)
                 * in that user namespace.
                 */
                xopen_xwrite_close(PATH_PROC_SETGROUPS, "deny");
-               sprintf(uidmap_buf, "%u 0 1", (unsigned)reuid);
+               sprintf(uidmap_buf, "0 %u 1", (unsigned)reuid);
                xopen_xwrite_close(PATH_PROC_UIDMAP, uidmap_buf);
-               sprintf(uidmap_buf, "%u 0 1", (unsigned)regid);
+               sprintf(uidmap_buf, "0 %u 1", (unsigned)regid);
                xopen_xwrite_close(PATH_PROC_GIDMAP, uidmap_buf);
        } else
        if (setgrp_str) {