Merge branch 'busybox' into merge

5 files changed, 115 insertions, 96 deletions

diff --git a/archival/tar.c b/archival/tar.c
index 6332bb6ee..be688a81d 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -49,7 +49,7 @@
 //config:       tarballs. Currently it works only on files (not pipes etc).
 //config:
 //config:config FEATURE_TAR_FROM
-//config:       bool "Enable -X (exclude from) and -T (include from) options)"
+//config:       bool "Enable -X (exclude from) and -T (include from) options"
 //config:       default y
 //config:       depends on TAR
 //config:       help
@@ -156,7 +156,9 @@ typedef struct TarBallInfo {
         int tarFd;                      /* Open-for-write file descriptor
                                          * for the tarball */
         int verboseFlag;                /* Whether to print extra stuff or not */
+# if ENABLE_FEATURE_TAR_FROM
         const llist_t *excludeList;     /* List of files to not include */
+# endif
         HardLinkInfo *hlInfoHead;       /* Hard Link Tracking Information */
         HardLinkInfo *hlInfo;           /* Hard Link Info for the current file */
 //TODO: save only st_dev + st_ino
@@ -278,7 +280,7 @@ static void chksum_and_xwrite(int fd, struct tar_header_t* hp)
         xwrite(fd, hp, sizeof(*hp));
 }
 
-#if ENABLE_FEATURE_TAR_GNU_EXTENSIONS
+# if ENABLE_FEATURE_TAR_GNU_EXTENSIONS
 static void writeLongname(int fd, int type, const char *name, int dir)
 {
         static const struct {
@@ -318,7 +320,7 @@ static void writeLongname(int fd, int type, const char *name, int dir)
         memset(&header, 0, size);
         xwrite(fd, &header, size);
 }
-#endif
+# endif
 
 /* Write out a tar header for the specified file/directory/whatever */
 static int writeTarHeader(struct TarBallInfo *tbInfo,
@@ -347,30 +349,30 @@ static int writeTarHeader(struct TarBallInfo *tbInfo,
                 header.typeflag = LNKTYPE;
                 strncpy(header.linkname, tbInfo->hlInfo->name,
                                 sizeof(header.linkname));
-#if ENABLE_FEATURE_TAR_GNU_EXTENSIONS
+# if ENABLE_FEATURE_TAR_GNU_EXTENSIONS
                 /* Write out long linkname if needed */
                 if (header.linkname[sizeof(header.linkname)-1])
                         writeLongname(tbInfo->tarFd, GNULONGLINK,
                                         tbInfo->hlInfo->name, 0);
-#endif
+# endif
         } else if (S_ISLNK(statbuf->st_mode)) {
                 char *lpath = xmalloc_readlink_or_warn(fileName);
                 if (!lpath)
                         return FALSE;
                 header.typeflag = SYMTYPE;
                 strncpy(header.linkname, lpath, sizeof(header.linkname));
-#if ENABLE_FEATURE_TAR_GNU_EXTENSIONS
+# if ENABLE_FEATURE_TAR_GNU_EXTENSIONS
                 /* Write out long linkname if needed */
                 if (header.linkname[sizeof(header.linkname)-1])
                         writeLongname(tbInfo->tarFd, GNULONGLINK, lpath, 0);
-#else
+# else
                 /* If it is larger than 100 bytes, bail out */
                 if (header.linkname[sizeof(header.linkname)-1]) {
                         free(lpath);
                         bb_error_msg("names longer than "NAME_SIZE_STR" chars not supported");
                         return FALSE;
                 }
-#endif
+# endif
                 free(lpath);
         } else if (S_ISDIR(statbuf->st_mode)) {
                 header.typeflag = DIRTYPE;
@@ -400,9 +402,9 @@ static int writeTarHeader(struct TarBallInfo *tbInfo,
                  * It always does unless off_t is wider than 64 bits.
                  */
                 else if (ENABLE_FEATURE_TAR_GNU_EXTENSIONS
-#if ULLONG_MAX > 0xffffffffffffffffLL /* 2^64-1 */
+# if ULLONG_MAX > 0xffffffffffffffffLL /* 2^64-1 */
                  && (filesize <= 0x3fffffffffffffffffffffffLL)
-#endif
+# endif
                 ) {
                         /* GNU tar uses "base-256 encoding" for very large numbers.
                          * Encoding is binary, with highest bit always set as a marker
@@ -429,13 +431,13 @@ static int writeTarHeader(struct TarBallInfo *tbInfo,
                 return FALSE;
         }
 
-#if ENABLE_FEATURE_TAR_GNU_EXTENSIONS
+# if ENABLE_FEATURE_TAR_GNU_EXTENSIONS
         /* Write out long name if needed */
         /* (we, like GNU tar, output long linkname *before* long name) */
         if (header.name[sizeof(header.name)-1])
                 writeLongname(tbInfo->tarFd, GNULONGNAME,
                                 header_name, S_ISDIR(statbuf->st_mode));
-#endif
+# endif
 
         /* Now write the header out to disk */
         chksum_and_xwrite(tbInfo->tarFd, &header);
@@ -457,7 +459,7 @@ static int writeTarHeader(struct TarBallInfo *tbInfo,
         return TRUE;
 }
 
-#if ENABLE_FEATURE_TAR_FROM
+# if ENABLE_FEATURE_TAR_FROM
 static int exclude_file(const llist_t *excluded_files, const char *file)
 {
         while (excluded_files) {
@@ -483,9 +485,9 @@ static int exclude_file(const llist_t *excluded_files, const char *file)
 
         return 0;
 }
-#else
-# define exclude_file(excluded_files, file) 0
-#endif
+# else
+#  define exclude_file(excluded_files, file) 0
+# endif
 
 static int FAST_FUNC writeFileToTarball(const char *fileName, struct stat *statbuf,
                         void *userData, int depth UNUSED_PARAM)
@@ -540,12 +542,12 @@ static int FAST_FUNC writeFileToTarball(const char *fileName, struct stat *statb
         if (exclude_file(tbInfo->excludeList, header_name))
                 return SKIP;
 
-#if !ENABLE_FEATURE_TAR_GNU_EXTENSIONS
+# if !ENABLE_FEATURE_TAR_GNU_EXTENSIONS
         if (strlen(header_name) >= NAME_SIZE) {
                 bb_error_msg("names longer than "NAME_SIZE_STR" chars not supported");
                 return TRUE;
         }
-#endif
+# endif
 
         /* Is this a regular file? */
         if (tbInfo->hlInfo == NULL && S_ISREG(statbuf->st_mode)) {
@@ -601,13 +603,13 @@ static void NOINLINE vfork_compressor(int tar_fd, const char *gzip)
 
         // On Linux, vfork never unpauses parent early, although standard
         // allows for that. Do we want to waste bytes checking for it?
-# define WAIT_FOR_CHILD 0
+#  define WAIT_FOR_CHILD 0
         volatile int vfork_exec_errno = 0;
         struct fd_pair gzipDataPipe;
-# if WAIT_FOR_CHILD
+#  if WAIT_FOR_CHILD
         struct fd_pair gzipStatusPipe;
         xpiped_pair(gzipStatusPipe);
-# endif
+#  endif
         xpiped_pair(gzipDataPipe);
 
         signal(SIGPIPE, SIG_IGN); /* we only want EPIPE on errors */
@@ -618,12 +620,12 @@ static void NOINLINE vfork_compressor(int tar_fd, const char *gzip)
                 /* child */
                 /* NB: close _first_, then move fds! */
                 close(gzipDataPipe.wr);
-# if WAIT_FOR_CHILD
+#  if WAIT_FOR_CHILD
                 close(gzipStatusPipe.rd);
                 /* gzipStatusPipe.wr will close only on exec -
                  * parent waits for this close to happen */
                 fcntl(gzipStatusPipe.wr, F_SETFD, FD_CLOEXEC);
-# endif
+#  endif
                 xmove_fd(gzipDataPipe.rd, 0);
                 xmove_fd(tar_fd, 1);
                 /* exec gzip/bzip2 program/applet */
@@ -635,7 +637,7 @@ static void NOINLINE vfork_compressor(int tar_fd, const char *gzip)
         /* parent */
         xmove_fd(gzipDataPipe.wr, tar_fd);
         close(gzipDataPipe.rd);
-# if WAIT_FOR_CHILD
+#  if WAIT_FOR_CHILD
         close(gzipStatusPipe.wr);
         while (1) {
                 char buf;
@@ -647,7 +649,7 @@ static void NOINLINE vfork_compressor(int tar_fd, const char *gzip)
                         continue;       /* try it again */
         }
         close(gzipStatusPipe.rd);
-# endif
+#  endif
         if (vfork_exec_errno) {
                 errno = vfork_exec_errno;
                 bb_perror_msg_and_die("can't execute '%s'", gzip);
@@ -677,47 +679,44 @@ static pid_t vfork_compressor(int tar_fd, const char *gzip)
 #endif /* SEAMLESS_COMPRESSION */
 
 
-#if !SEAMLESS_COMPRESSION
+# if !SEAMLESS_COMPRESSION
 /* Do not pass gzip flag to writeTarFile() */
-#define writeTarFile(tar_fd, verboseFlag, recurseFlags, include, exclude, gzip) \
-        writeTarFile(tar_fd, verboseFlag, recurseFlags, include, exclude)
-#endif
+#define writeTarFile(tbInfo, recurseFlags, filelist, gzip) \
+        writeTarFile(tbInfo, recurseFlags, filelist)
+# endif
 /* gcc 4.2.1 inlines it, making code bigger */
-static NOINLINE int writeTarFile(int tar_fd, int verboseFlag,
-        int recurseFlags, const llist_t *include,
-        const llist_t *exclude, const char *gzip)
+static NOINLINE int writeTarFile(
+        struct TarBallInfo *tbInfo,
+        int recurseFlags,
+        const llist_t *filelist,
+        const char *gzip)
 {
         int errorFlag = FALSE;
-        struct TarBallInfo tbInfo;
         IF_PLATFORM_MINGW32(pid_t pid = 0;)
 
-        tbInfo.hlInfoHead = NULL;
-        tbInfo.tarFd = tar_fd;
-        tbInfo.verboseFlag = verboseFlag;
+        /*tbInfo->hlInfoHead = NULL; - already is */
 
         /* Store the stat info for the tarball's file, so
          * can avoid including the tarball into itself....  */
-        xfstat(tbInfo.tarFd, &tbInfo.tarFileStatBuf, "can't stat tar file");
+        xfstat(tbInfo->tarFd, &tbInfo->tarFileStatBuf, "can't stat tar file");
 
-#if SEAMLESS_COMPRESSION
+# if SEAMLESS_COMPRESSION
         if (gzip)
-                IF_PLATFORM_MINGW32(pid = )vfork_compressor(tbInfo.tarFd, gzip);
+                IF_PLATFORM_MINGW32(pid = )vfork_compressor(tbInfo->tarFd, gzip);
 #endif
 
-        tbInfo.excludeList = exclude;
-
         /* Read the directory/files and iterate over them one at a time */
-        while (include) {
-                if (!recursive_action(include->data, recurseFlags,
-                                writeFileToTarball, writeFileToTarball, &tbInfo, 0)
+        while (filelist) {
+                if (!recursive_action(filelist->data, recurseFlags,
+                                writeFileToTarball, writeFileToTarball, tbInfo, 0)
                 ) {
                         errorFlag = TRUE;
                 }
-                include = include->link;
+                filelist = filelist->link;
         }
         /* Write two empty blocks to the end of the archive */
         memset(block_buf, 0, 2*TAR_BLOCK_SIZE);
-        xwrite(tbInfo.tarFd, block_buf, 2*TAR_BLOCK_SIZE);
+        xwrite(tbInfo->tarFd, block_buf, 2*TAR_BLOCK_SIZE);
 
         /* To be pedantically correct, we would check if the tarball
          * is smaller than 20 tar blocks, and pad it if it was smaller,
@@ -725,16 +724,16 @@ static NOINLINE int writeTarFile(int tar_fd, int verboseFlag,
          * so is considered a waste of space */
 
         /* Close so the child process (if any) will exit */
-        close(tbInfo.tarFd);
+        close(tbInfo->tarFd);
 
         /* Hang up the tools, close up shop, head home */
         if (ENABLE_FEATURE_CLEAN_UP)
-                freeHardLinkInfo(&tbInfo.hlInfoHead);
+                freeHardLinkInfo(&tbInfo->hlInfoHead);
 
         if (errorFlag)
                 bb_error_msg("error exit delayed from previous errors");
 
-#if SEAMLESS_COMPRESSION
+# if SEAMLESS_COMPRESSION
         if (gzip) {
                 int status;
 #if !ENABLE_PLATFORM_MINGW32
@@ -747,21 +746,25 @@ static NOINLINE int writeTarFile(int tar_fd, int verboseFlag,
                         /* gzip was killed or has exited with nonzero! */
                         errorFlag = TRUE;
         }
-#endif
+# endif
         return errorFlag;
 }
+
 #else /* !FEATURE_TAR_CREATE */
+
 # define writeTarFile(...) 0
+
 #endif
 
 #if ENABLE_FEATURE_TAR_FROM
 static llist_t *append_file_list_to_list(llist_t *list)
 {
-        FILE *src_stream;
-        char *line;
         llist_t *newlist = NULL;
 
         while (list) {
+                FILE *src_stream;
+                char *line;
+
                 src_stream = xfopen_stdin(llist_pop(&list));
                 while ((line = xmalloc_fgetline(src_stream)) != NULL) {
                         /* kill trailing '/' unless the string is just "/" */
@@ -777,7 +780,7 @@ static llist_t *append_file_list_to_list(llist_t *list)
 #endif
 
 //usage:#define tar_trivial_usage
-//usage:        "-[" IF_FEATURE_TAR_CREATE("c") "xt"
+//usage:        IF_FEATURE_TAR_CREATE("c|") "x|t [-"
 //usage:        IF_FEATURE_SEAMLESS_Z("Z")
 //usage:        IF_FEATURE_SEAMLESS_GZ("z")
 //usage:        IF_FEATURE_SEAMLESS_XZ("J")
@@ -786,8 +789,9 @@ static llist_t *append_file_list_to_list(llist_t *list)
 //usage:        IF_FEATURE_TAR_CREATE("h")
 //usage:        IF_FEATURE_TAR_NOPRESERVE_TIME("m")
 //usage:        "vO] "
-//usage:        IF_FEATURE_TAR_FROM("[-X FILE] [-T FILE] ")
-//usage:        "[-f TARFILE] [-C DIR] [FILE]..."
+//usage:        "[-f TARFILE] [-C DIR] "
+//usage:        IF_FEATURE_TAR_FROM("[-T FILE] [-X FILE] "IF_FEATURE_TAR_LONG_OPTIONS("[--exclude PATTERN]... "))
+//usage:        "[FILE]..."
 //usage:#define tar_full_usage "\n\n"
 //usage:        IF_FEATURE_TAR_CREATE("Create, extract, ")
 //usage:        IF_NOT_FEATURE_TAR_CREATE("Extract ")
@@ -798,37 +802,37 @@ static llist_t *append_file_list_to_list(llist_t *list)
 //usage:        )
 //usage:     "\n        x       Extract"
 //usage:     "\n        t       List"
-//usage:     "\n        f       Name of TARFILE ('-' for stdin/out)"
-//usage:     "\n        C       Change to DIR before operation"
-//usage:     "\n        v       Verbose"
+//usage:     "\n        -f FILE Name of TARFILE ('-' for stdin/out)"
+//usage:     "\n        -C DIR  Change to DIR before operation"
+//usage:     "\n        -v      Verbose"
 //usage:        IF_FEATURE_SEAMLESS_Z(
-//usage:     "\n        Z       (De)compress using compress"
+//usage:     "\n        -Z      (De)compress using compress"
 //usage:        )
 //usage:        IF_FEATURE_SEAMLESS_GZ(
-//usage:     "\n        z       (De)compress using gzip"
+//usage:     "\n        -z      (De)compress using gzip"
 //usage:        )
 //usage:        IF_FEATURE_SEAMLESS_XZ(
-//usage:     "\n        J       (De)compress using xz"
+//usage:     "\n        -J      (De)compress using xz"
 //usage:        )
 //usage:        IF_FEATURE_SEAMLESS_BZ2(
-//usage:     "\n        j       (De)compress using bzip2"
+//usage:     "\n        -j      (De)compress using bzip2"
 //usage:        )
 //usage:        IF_FEATURE_SEAMLESS_LZMA(
-//usage:     "\n        a       (De)compress using lzma"
+//usage:     "\n        -a      (De)compress using lzma"
 //usage:        )
-//usage:     "\n        O       Extract to stdout"
+//usage:     "\n        -O      Extract to stdout"
 //usage:        IF_FEATURE_TAR_CREATE(
-//usage:     "\n        h       Follow symlinks"
+//usage:     "\n        -h      Follow symlinks"
 //usage:        )
 //usage:        IF_FEATURE_TAR_NOPRESERVE_TIME(
-//usage:     "\n        m       Don't restore mtime"
+//usage:     "\n        -m      Don't restore mtime"
 //usage:        )
 //usage:        IF_FEATURE_TAR_FROM(
+//usage:     "\n        -T FILE File with names to include"
+//usage:     "\n        -X FILE File with glob patterns to exclude"
 //usage:        IF_FEATURE_TAR_LONG_OPTIONS(
-//usage:     "\n        exclude File to exclude"
+//usage:     "\n        --exclude PATTERN       Glob pattern to exclude"
 //usage:        )
-//usage:     "\n        X       File with names to exclude"
-//usage:     "\n        T       File with names to include"
 //usage:        )
 //usage:
 //usage:#define tar_example_usage
@@ -992,11 +996,12 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
                 puts("tar (busybox) " BB_VER);
                 return 0;
         }
-        if (argv[1] && argv[1][0] != '-') {
+#endif
+        if (argv[1] && argv[1][0] != '-' && argv[1][0] != '\0') {
                 /* Compat:
                  * 1st argument without dash handles options with parameters
                  * differently from dashed one: it takes *next argv[i]*
-                 * as paramenter even if there are more chars in 1st argument:
+                 * as parameter even if there are more chars in 1st argument:
                  *  "tar fx TARFILE" - "x" is not taken as f's param
                  *  but is interpreted as -x option
                  *  "tar -xf TARFILE" - dashed equivalent of the above
@@ -1016,11 +1021,9 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
                         }
                         *f = 'f';
                 }
-        }
-#endif
-        /* Prepend '-' to the first argument if required */
-        if (argv[1] && argv[1][0] != '-' && argv[1][0] != '\0')
+                /* Prepend '-' to the first argument  */
                 argv[1] = xasprintf("-%s", argv[1]);
+        }
         opt = GETOPT32(argv, "^"
                 "txC:f:Oopvk"
                 IF_FEATURE_TAR_CREATE(   "ch"    )
@@ -1198,13 +1201,10 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
         if (base_dir)
                 xchdir(base_dir);
 
-        //if (SEAMLESS_COMPRESSION)
-        //      /* We need to know whether child (gzip/bzip/etc) exits abnormally */
-        //      signal(SIGCHLD, check_errors_in_children);
-
 #if ENABLE_FEATURE_TAR_CREATE
         /* Create an archive */
         if (opt & OPT_CREATE) {
+                struct TarBallInfo *tbInfo;
 # if SEAMLESS_COMPRESSION
                 const char *zipMode = NULL;
                 if (opt & OPT_COMPRESS)
@@ -1218,12 +1218,18 @@ int tar_main(int argc UNUSED_PARAM, char **argv)
                 if (opt & OPT_XZ)
                         zipMode = "xz";
 # endif
+                tbInfo = xzalloc(sizeof(*tbInfo));
+                tbInfo->tarFd = tar_handle->src_fd;
+                tbInfo->verboseFlag = verboseFlag;
+# if ENABLE_FEATURE_TAR_FROM
+                tbInfo->excludeList = tar_handle->reject;
+# endif
                 /* NB: writeTarFile() closes tar_handle->src_fd */
-                return writeTarFile(tar_handle->src_fd, verboseFlag,
+                return writeTarFile(tbInfo,
                                 (opt & OPT_DEREFERENCE ? ACTION_FOLLOWLINKS : 0)
                                 | (opt & OPT_NORECURSION ? 0 : ACTION_RECURSE),
                                 tar_handle->accept,
-                                tar_handle->reject, zipMode);
+                                zipMode);
         }
 #endif
 
diff --git a/archival/unzip.c b/archival/unzip.c
index 233487697..c5fb6a3ed 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -56,7 +56,7 @@
 //kbuild:lib-$(CONFIG_UNZIP) += unzip.o
 
 //usage:#define unzip_trivial_usage
-//usage:       "[-lnopq] FILE[.zip] [FILE]... [-x FILE...] [-d DIR]"
+//usage:       "[-lnojpq] FILE[.zip] [FILE]... [-x FILE...] [-d DIR]"
 //usage:#define unzip_full_usage "\n\n"
 //usage:       "Extract FILEs from ZIP archive\n"
 //usage:     "\n        -l      List contents (with -q for short form)"
@@ -808,13 +808,6 @@ int unzip_main(int argc, char **argv)
                 /* Guard against "/abspath", "/../" and similar attacks */
                 overlapping_strcpy(dst_fn, strip_unsafe_prefix(dst_fn));
 
-                if (opts & OPT_j) /* Strip paths? */
-                        overlapping_strcpy(dst_fn, bb_basename(dst_fn));
-
-                /* Did this strip everything ("DIR/" case)? Then skip */
-                if (!dst_fn[0])
-                        goto skip_cmpsize;
-
                 /* Filter zip entries */
                 if (find_list_entry(zreject, dst_fn)
                  || (zaccept && !find_list_entry(zaccept, dst_fn))
@@ -879,6 +872,14 @@ int unzip_main(int argc, char **argv)
                         /* Extracting to STDOUT */
                         goto do_extract;
                 }
+
+                /* Strip paths (after -l: unzip -lj a.zip lists full names) */
+                if (opts & OPT_j)
+                        overlapping_strcpy(dst_fn, bb_basename(dst_fn));
+                /* Did this strip everything ("DIR/" case)? Then skip */
+                if (!dst_fn[0])
+                        goto skip_cmpsize;
+
                 if (last_char_is(dst_fn, '/')) {
                         int mode;
 
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index c0edb7399..3df67abb1 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -687,6 +687,18 @@ static void free_tab_completion_data(void)
 
 static void add_match(char *matched)
 {
+        unsigned char *p = (unsigned char*)matched;
+        while (*p) {
+                /* ESC attack fix: drop any string with control chars */
+                if (*p < ' '
+                 || (!ENABLE_UNICODE_SUPPORT && *p >= 0x7f)
+                 || (ENABLE_UNICODE_SUPPORT && *p == 0x7f)
+                ) {
+                        free(matched);
+                        return;
+                }
+                p++;
+        }
         matches = xrealloc_vector(matches, 4, num_matches);
         matches[num_matches] = matched;
         num_matches++;
@@ -2457,6 +2469,8 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
         bb_error_msg("cur_history:%d cnt_history:%d", state->cur_history, state->cnt_history);
 #endif
 
+        /* Get width (before printing prompt) */
+        cmdedit_termw = get_terminal_width(STDIN_FILENO);
         /* Print out the command prompt, optionally ask where cursor is */
         parse_and_put_prompt(prompt);
         ask_terminal();
@@ -2466,8 +2480,6 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
         S.SIGWINCH_handler.sa_flags = SA_RESTART;
         sigaction(SIGWINCH, &S.SIGWINCH_handler, &S.SIGWINCH_handler);
 
-        cmdedit_termw = get_terminal_width(STDIN_FILENO);
-
         read_key_buffer[0] = 0;
         while (1) {
                 /*
diff --git a/networking/inetd.c b/networking/inetd.c
index 67984accb..4dfa0089a 100644
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -1488,7 +1488,7 @@ int inetd_main(int argc UNUSED_PARAM, char **argv)
                                 bb_error_msg("non-root must run services as himself");
                                 goto do_exit1;
                         }
-                        if (pwd->pw_uid != 0) {
+                        if (pwd->pw_uid != real_uid) {
                                 if (sep->se_group)
                                         pwd->pw_gid = grp->gr_gid;
                                 /* initgroups, setgid, setuid: */
diff --git a/util-linux/unshare.c b/util-linux/unshare.c
index 6a3da9f91..7c295da1f 100644
--- a/util-linux/unshare.c
+++ b/util-linux/unshare.c
@@ -217,7 +217,7 @@ int unshare_main(int argc UNUSED_PARAM, char **argv)
                 ":\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 */
                 , unshare_longopts,
                 &proc_mnt_target, &prop_str, &setgrp_str,
@@ -339,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
@@ -348,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) {