Merge branch 'busybox' into merge

11 files changed, 172 insertions, 106 deletions

diff --git a/util-linux/getopt.c b/util-linux/getopt.c
index db7db6ff8..1fa402429 100644
--- a/util-linux/getopt.c
+++ b/util-linux/getopt.c
@@ -289,12 +289,13 @@ static struct option *add_long_options(struct option *long_options, char *option
 {
         int long_nr = 0;
         int arg_opt, tlen;
-        char *tokptr = strtok(options, ", \t\n");
+        char *tokptr;
 
         if (long_options)
                 while (long_options[long_nr].name)
                         long_nr++;
 
+        tokptr = strtok_r(options, ", \t\n", &options);
         while (tokptr) {
                 arg_opt = no_argument;
                 tlen = strlen(tokptr);
@@ -318,7 +319,7 @@ static struct option *add_long_options(struct option *long_options, char *option
                         long_nr++;
                         /*memset(&long_options[long_nr], 0, sizeof(long_options[0])); - xrealloc_vector did it */
                 }
-                tokptr = strtok(NULL, ", \t\n");
+                tokptr = strtok_r(NULL, ", \t\n", &options);
         }
         return long_options;
 }
diff --git a/util-linux/hexdump.c b/util-linux/hexdump.c
index 065b83980..2174c3008 100644
--- a/util-linux/hexdump.c
+++ b/util-linux/hexdump.c
@@ -15,16 +15,6 @@
 //config:       The hexdump utility is used to display binary data in a readable
 //config:       way that is comparable to the output from most hex editors.
 //config:
-//config:config FEATURE_HEXDUMP_REVERSE
-//config:       bool "Support -R, reverse of 'hexdump -Cv'"
-//config:       default y
-//config:       depends on HEXDUMP
-//config:       help
-//config:       The hexdump utility is used to display binary data in an ascii
-//config:       readable way. This option creates binary data from an ascii input.
-//config:       NB: this option is non-standard. It's unwise to use it in scripts
-//config:       aimed to be portable.
-//config:
 //config:config HD
 //config:       bool "hd (7.8 kb)"
 //config:       default y
@@ -38,7 +28,7 @@
 //kbuild:lib-$(CONFIG_HD) += hexdump.o
 
 //usage:#define hexdump_trivial_usage
-//usage:       "[-bcCdefnosvx" IF_FEATURE_HEXDUMP_REVERSE("R") "] [FILE]..."
+//usage:       "[-bcCdefnosvx] [FILE]..."
 //usage:#define hexdump_full_usage "\n\n"
 //usage:       "Display FILEs (or stdin) in a user specified format\n"
 //usage:     "\n        -b              1-byte octal display"
@@ -53,9 +43,6 @@
 // exactly the same help text lines in hexdump and xxd:
 //usage:     "\n        -n LENGTH       Show only first LENGTH bytes"
 //usage:     "\n        -s OFFSET       Skip OFFSET bytes"
-//usage:        IF_FEATURE_HEXDUMP_REVERSE(
-//usage:     "\n        -R              Reverse of 'hexdump -Cv'")
-// TODO: NONCOMPAT!!! move -R to xxd -r
 //usage:
 //usage:#define hd_trivial_usage
 //usage:       "FILE..."
@@ -94,7 +81,7 @@ static const char *const add_strings[] = {
 
 static const char add_first[] ALIGN1 = "\"%07.7_Ax\n\"";
 
-static const char hexdump_opts[] ALIGN1 = "bcdoxCe:f:n:s:v" IF_FEATURE_HEXDUMP_REVERSE("R");
+static const char hexdump_opts[] ALIGN1 = "bcdoxCe:f:n:s:v";
 
 int hexdump_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int hexdump_main(int argc, char **argv)
@@ -102,10 +89,6 @@ int hexdump_main(int argc, char **argv)
         dumper_t *dumper = alloc_dumper();
         const char *p;
         int ch;
-#if ENABLE_FEATURE_HEXDUMP_REVERSE
-        FILE *fp;
-        smallint rdump = 0;
-#endif
 
         if (ENABLE_HD
          && (!ENABLE_HEXDUMP || !applet_name[2])
@@ -153,11 +136,6 @@ int hexdump_main(int argc, char **argv)
                 if (ch == 'v') {
                         dumper->dump_vflag = ALL;
                 }
-#if ENABLE_FEATURE_HEXDUMP_REVERSE
-                if (ch == 'R') {
-                        rdump = 1;
-                }
-#endif
         }
 
         if (!dumper->fshead) {
@@ -167,40 +145,5 @@ int hexdump_main(int argc, char **argv)
 
         argv += optind;
 
-#if !ENABLE_FEATURE_HEXDUMP_REVERSE
         return bb_dump_dump(dumper, argv);
-#else
-        if (!rdump) {
-                return bb_dump_dump(dumper, argv);
-        }
-
-        /* -R: reverse of 'hexdump -Cv' */
-        fp = stdin;
-        if (!*argv) {
-                argv--;
-                goto jump_in;
-        }
-
-        do {
-                char *buf;
-                fp = xfopen_for_read(*argv);
- jump_in:
-                while ((buf = xmalloc_fgetline(fp)) != NULL) {
-                        p = buf;
-                        while (1) {
-                                /* skip address or previous byte */
-                                while (isxdigit(*p)) p++;
-                                while (*p == ' ') p++;
-                                /* '|' char will break the line */
-                                if (!isxdigit(*p) || sscanf(p, "%x ", &ch) != 1)
-                                        break;
-                                putchar(ch);
-                        }
-                        free(buf);
-                }
-                fclose(fp);
-        } while (*++argv);
-
-        fflush_stdout_and_exit(EXIT_SUCCESS);
-#endif
 }
diff --git a/util-linux/hexdump_xxd.c b/util-linux/hexdump_xxd.c
index 6cf6d0297..d2f4b6ed8 100644
--- a/util-linux/hexdump_xxd.c
+++ b/util-linux/hexdump_xxd.c
@@ -50,6 +50,7 @@
 // exactly the same help text lines in hexdump and xxd:
 //usage:     "\n        -l LENGTH       Show only first LENGTH bytes"
 //usage:     "\n        -s OFFSET       Skip OFFSET bytes"
+//usage:     "\n        -r              Reverse (with -p, assumes no offsets in input)"
 // TODO: implement -r (see hexdump -R)
 
 #include "libbb.h"
@@ -57,6 +58,71 @@
 
 /* This is a NOEXEC applet. Be very careful! */
 
+#define OPT_l (1 << 0)
+#define OPT_s (1 << 1)
+#define OPT_a (1 << 2)
+#define OPT_p (1 << 3)
+#define OPT_r (1 << 4)
+
+static void reverse(unsigned opt, unsigned cols, const char *filename)
+{
+        FILE *fp;
+        char *buf;
+
+        fp = filename ? xfopen_for_read(filename) : stdin;
+
+        while ((buf = xmalloc_fgetline(fp)) != NULL) {
+                char *p = buf;
+                unsigned cnt = cols;
+
+                if (!(opt & OPT_p)) {
+                        /* skip address */
+                        while (isxdigit(*p)) p++;
+                        /* NB: for xxd -r, first hex portion is address even without colon */
+                        /* If it's there, skip it: */
+                        if (*p == ':') p++;
+
+//TODO: seek (or zero-pad if unseekable) to the address position
+//NOTE: -s SEEK value should be added to the address before seeking
+                }
+
+                /* Process hex bytes optionally separated by whitespace */
+                do {
+                        uint8_t val, c;
+
+                        p = skip_whitespace(p);
+
+                        c = *p++;
+                        if (isdigit(c))
+                                val = c - '0';
+                        else if ((c|0x20) >= 'a' && (c|0x20) <= 'f')
+                                val = (c|0x20) - ('a' - 10);
+                        else
+                                break;
+                        val <<= 4;
+
+                        /* Works the same with xxd V1.10:
+                         *  echo "31 09 32 0a" | xxd -r -p
+                         *  echo "31 0 9 32 0a" | xxd -r -p
+                         * thus allow whitespace even within the byte:
+                         */
+                        p = skip_whitespace(p);
+
+                        c = *p++;
+                        if (isdigit(c))
+                                val |= c - '0';
+                        else if ((c|0x20) >= 'a' && (c|0x20) <= 'f')
+                                val |= (c|0x20) - ('a' - 10);
+                        else
+                                break;
+                        putchar(val);
+                } while (!(opt & OPT_p) || --cnt != 0);
+                free(buf);
+        }
+        //fclose(fp);
+        fflush_stdout_and_exit(EXIT_SUCCESS);
+}
+
 int xxd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int xxd_main(int argc UNUSED_PARAM, char **argv)
 {
@@ -69,11 +135,7 @@ int xxd_main(int argc UNUSED_PARAM, char **argv)
 
         dumper = alloc_dumper();
 
-#define OPT_l (1 << 0)
-#define OPT_s (1 << 1)
-#define OPT_a (1 << 2)
-#define OPT_p (1 << 3)
-        opt = getopt32(argv, "^" "l:s:apg:+c:+" "\0" "?1" /* 1 argument max */,
+        opt = getopt32(argv, "^" "l:s:aprg:+c:+" "\0" "?1" /* 1 argument max */,
                         &opt_l, &opt_s, &bytes, &cols
         );
         argv += optind;
@@ -107,6 +169,10 @@ int xxd_main(int argc UNUSED_PARAM, char **argv)
                 bb_dump_add(dumper, "\"%08.8_ax: \""); // "address: "
         }
 
+        if (opt & OPT_r) {
+                reverse(opt, cols, argv[0]);
+        }
+
         if (bytes < 1 || bytes >= cols) {
                 sprintf(buf, "%u/1 \"%%02x\"", cols); // cols * "xx"
                 bb_dump_add(dumper, buf);
@@ -141,6 +207,7 @@ int xxd_main(int argc UNUSED_PARAM, char **argv)
                 bb_dump_add(dumper, buf);
         } else {
                 bb_dump_add(dumper, "\"\n\"");
+                dumper->eofstring = "\n";
         }
 
         return bb_dump_dump(dumper, argv);
diff --git a/util-linux/losetup.c b/util-linux/losetup.c
index ac8b79502..24f7a2349 100644
--- a/util-linux/losetup.c
+++ b/util-linux/losetup.c
@@ -150,7 +150,7 @@ int losetup_main(int argc UNUSED_PARAM, char **argv)
                         if (opt & OPT_P) {
                                 flags |= BB_LO_FLAGS_PARTSCAN;
                         }
-                        if (set_loop(&d, argv[0], offset, flags) < 0)
+                        if (set_loop(&d, argv[0], offset, 0, flags) < 0)
                                 bb_simple_perror_msg_and_die(argv[0]);
                         return EXIT_SUCCESS;
                 }
diff --git a/util-linux/lspci.c b/util-linux/lspci.c
index 2f0b5fab9..c22cbcc1e 100644
--- a/util-linux/lspci.c
+++ b/util-linux/lspci.c
@@ -37,11 +37,9 @@ enum {
 /*
  * PCI_SLOT_NAME PCI_CLASS: PCI_VID:PCI_DID [PCI_SUBSYS_VID:PCI_SUBSYS_DID] [DRIVER]
  */
-static int FAST_FUNC fileAction(
+static int FAST_FUNC fileAction(struct recursive_state *state UNUSED_PARAM,
                 const char *fileName,
-                struct stat *statbuf UNUSED_PARAM,
-                void *userData UNUSED_PARAM,
-                int depth UNUSED_PARAM)
+                struct stat *statbuf UNUSED_PARAM)
 {
         parser_t *parser;
         char *tokens[3];
@@ -117,8 +115,7 @@ int lspci_main(int argc UNUSED_PARAM, char **argv)
                         ACTION_RECURSE,
                         fileAction,
                         NULL, /* dirAction */
-                        NULL, /* userData */
-                        0 /* depth */);
-
+                        NULL /* userData */
+        );
         return EXIT_SUCCESS;
 }
diff --git a/util-linux/lsusb.c b/util-linux/lsusb.c
index 64a00eee2..9abb748ce 100644
--- a/util-linux/lsusb.c
+++ b/util-linux/lsusb.c
@@ -24,11 +24,9 @@
 
 #include "libbb.h"
 
-static int FAST_FUNC fileAction(
+static int FAST_FUNC fileAction(struct recursive_state *state UNUSED_PARAM,
                 const char *fileName,
-                struct stat *statbuf UNUSED_PARAM,
-                void *userData UNUSED_PARAM,
-                int depth UNUSED_PARAM)
+                struct stat *statbuf UNUSED_PARAM)
 {
         parser_t *parser;
         char *tokens[4];
@@ -80,8 +78,8 @@ int lsusb_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                         ACTION_RECURSE,
                         fileAction,
                         NULL, /* dirAction */
-                        NULL, /* userData */
-                        0 /* depth */);
+                        NULL /* userData */
+        );
 
         return EXIT_SUCCESS;
 }
diff --git a/util-linux/mdev.c b/util-linux/mdev.c
index f42bebc20..59dbcf0cd 100644
--- a/util-linux/mdev.c
+++ b/util-linux/mdev.c
@@ -845,13 +845,12 @@ static ssize_t readlink2(char *buf, size_t bufsize)
 /* File callback for /sys/ traversal.
  * We act only on "/sys/.../dev" (pseudo)file
  */
-static int FAST_FUNC fileAction(const char *fileName,
-                struct stat *statbuf UNUSED_PARAM,
-                void *userData,
-                int depth UNUSED_PARAM)
+static int FAST_FUNC fileAction(struct recursive_state *state,
+                const char *fileName,
+                struct stat *statbuf UNUSED_PARAM)
 {
         size_t len = strlen(fileName) - 4; /* can't underflow */
-        char *path = userData;  /* char array[PATH_MAX + SCRATCH_SIZE] */
+        char *path = state->userData;   /* char array[PATH_MAX + SCRATCH_SIZE] */
         char subsys[PATH_MAX];
         int res;
 
@@ -888,12 +887,11 @@ static int FAST_FUNC fileAction(const char *fileName,
 }
 
 /* Directory callback for /sys/ traversal */
-static int FAST_FUNC dirAction(const char *fileName UNUSED_PARAM,
-                struct stat *statbuf UNUSED_PARAM,
-                void *userData UNUSED_PARAM,
-                int depth)
+static int FAST_FUNC dirAction(struct recursive_state *state,
+                const char *fileName UNUSED_PARAM,
+                struct stat *statbuf UNUSED_PARAM)
 {
-        return (depth >= MAX_SYSFS_DEPTH ? SKIP : TRUE);
+        return (state->depth >= MAX_SYSFS_DEPTH ? SKIP : TRUE);
 }
 
 /* For the full gory details, see linux/Documentation/firmware_class/README
@@ -1149,7 +1147,7 @@ static void initial_scan(char *temp)
         /* Create all devices from /sys/dev hierarchy */
         recursive_action("/sys/dev",
                          ACTION_RECURSE | ACTION_FOLLOWLINKS,
-                         fileAction, dirAction, temp, 0);
+                         fileAction, dirAction, temp);
 }
 
 #if ENABLE_FEATURE_MDEV_DAEMON
diff --git a/util-linux/mount.c b/util-linux/mount.c
index b92e2c297..fc5161d7f 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -1230,6 +1230,7 @@ static NOINLINE int nfsmount(struct mntent *mp, unsigned long vfsflags, char *fi
          * then data pointer is interpreted as a string. */
         struct nfs_mount_data data;
         char *opt;
+        char *tokstate;
         struct hostent *hp;
         struct sockaddr_in server_addr;
         struct sockaddr_in mount_server_addr;
@@ -1348,7 +1349,7 @@ static NOINLINE int nfsmount(struct mntent *mp, unsigned long vfsflags, char *fi
         nfsvers = 0;
 
         /* parse options */
-        if (filteropts) for (opt = strtok(filteropts, ","); opt; opt = strtok(NULL, ",")) {
+        if (filteropts) for (opt = strtok_r(filteropts, ",", &tokstate); opt; opt = strtok_r(NULL, ",", &tokstate)) {
                 char *opteq = strchr(opt, '=');
                 if (opteq) {
                         int val, idx;
@@ -1886,6 +1887,58 @@ static int nfsmount(struct mntent *mp, unsigned long vfsflags, char *filteropts)
 
 #endif // !ENABLE_FEATURE_MOUNT_NFS
 
+// Find "...,NAME=NUM,..." in the option string, remove "NAME=NUM" option
+// and return NUM.
+// Return 0 if not found.
+// All instances must be parsed and removed (for example, since kernel 5.4
+//      squashfs: Unknown parameter 'sizelimit'
+// will result if loopback mount option "sizelimit=NNN" is not removed
+// and squashfs sees it in option string).
+static unsigned long long cut_out_ull_opt(char *opts, const char *name_eq)
+{
+        unsigned long long ret = 0;
+
+        if (!opts) // allow NULL opts (simplifies callers' work)
+                return ret;
+
+        for (;;) {
+                char *end;
+                char *opt;
+
+                // Find comma-delimited "NAME="
+                for (;;) {
+                        opt = strstr(opts, name_eq);
+                        if (!opt)
+                                return ret;
+                        if (opt == opts)
+                                break; // found it (it's first opt)
+                        if (opt[-1] == ',') {
+                                opts = opt - 1;
+                                break; // found it (it's not a first opt)
+                        }
+                        // False positive like "VNAME=", we are at "N".
+                        // - skip it, loop back to searching
+                        opts = opt + 1;
+                }
+
+                ret = bb_strtoull(opt + strlen(name_eq), &end, 0);
+                if (errno && errno != EINVAL) {
+ err:
+                        bb_error_msg_and_die("bad option '%s'", opt);
+                }
+                if (*end == '\0') {
+                        // It is "[,]NAME=NUM\0" - truncate it and return
+                        *opts = '\0';
+                        return ret;
+                }
+                if (*end != ',')
+                        goto err;
+                // We are at trailing comma
+                // Remove "NAME=NUM," and loop back to check for duplicate opts
+                overlapping_strcpy(opt, end + 1);
+        }
+}
+
 // Mount one directory.  Handles CIFS, NFS, loopback, autobind, and filesystem
 // type detection.  Returns 0 for success, nonzero for failure.
 // NB: mp->xxx fields may be trashed on exit
@@ -2029,9 +2082,16 @@ static int singlemount(struct mntent *mp, int ignore_busy)
         ) {
                 // Do we need to allocate a loopback device for it?
                 if (ENABLE_FEATURE_MOUNT_LOOP && S_ISREG(st.st_mode)) {
+                        unsigned long long offset;
+                        unsigned long long sizelimit;
+
                         loopFile = bb_simplify_path(mp->mnt_fsname);
                         mp->mnt_fsname = NULL; // will receive malloced loop dev name
 
+                        // Parse and remove loopback options
+                        offset = cut_out_ull_opt(filteropts, "offset=");
+                        sizelimit = cut_out_ull_opt(filteropts, "sizelimit=");
+
                         // mount always creates AUTOCLEARed loopdevs, so that umounting
                         // drops them without any code in the userspace.
                         // This happens since circa linux-2.6.25:
@@ -2040,7 +2100,8 @@ static int singlemount(struct mntent *mp, int ignore_busy)
                         // Subject: Allow auto-destruction of loop devices
                         loopfd = set_loop(&mp->mnt_fsname,
                                         loopFile,
-                                        0,
+                                        offset,
+                                        sizelimit,
                                         ((vfsflags & MS_RDONLY) ? BB_LO_FLAGS_READ_ONLY : 0)
                                                 | BB_LO_FLAGS_AUTOCLEAR
                         );
diff --git a/util-linux/setpriv.c b/util-linux/setpriv.c
index 37e8821a1..1e4b201ed 100644
--- a/util-linux/setpriv.c
+++ b/util-linux/setpriv.c
@@ -144,10 +144,11 @@ static unsigned parse_cap(const char *cap)
 static void set_inh_caps(char *capstring)
 {
         struct caps caps;
+        char *string;
 
         getcaps(&caps);
 
-        capstring = strtok(capstring, ",");
+        capstring = strtok_r(capstring, ",", &string);
         while (capstring) {
                 unsigned cap;
 
@@ -159,7 +160,7 @@ static void set_inh_caps(char *capstring)
                         caps.data[CAP_TO_INDEX(cap)].inheritable |= CAP_TO_MASK(cap);
                 else
                         caps.data[CAP_TO_INDEX(cap)].inheritable &= ~CAP_TO_MASK(cap);
-                capstring = strtok(NULL, ",");
+                capstring = strtok_r(NULL, ",", &string);
         }
 
         if (capset(&caps.header, caps.data) != 0)
@@ -170,7 +171,7 @@ static void set_ambient_caps(char *string)
 {
         char *cap;
 
-        cap = strtok(string, ",");
+        cap = strtok_r(string, ",", &string);
         while (cap) {
                 unsigned idx;
 
@@ -182,7 +183,7 @@ static void set_ambient_caps(char *string)
                         if (prctl(PR_CAP_AMBIENT, PR_CAP_AMBIENT_LOWER, idx, 0, 0) < 0)
                                 bb_simple_perror_msg("cap_ambient_lower");
                 }
-                cap = strtok(NULL, ",");
+                cap = strtok_r(NULL, ",", &string);
         }
 }
 #endif /* FEATURE_SETPRIV_CAPABILITIES */
diff --git a/util-linux/switch_root.c b/util-linux/switch_root.c
index c65096c27..f2674b5ac 100644
--- a/util-linux/switch_root.c
+++ b/util-linux/switch_root.c
@@ -164,7 +164,7 @@ static void drop_capabilities(char *string)
 {
         char *cap;
 
-        cap = strtok(string, ",");
+        cap = strtok_r(string, ",", &string);
         while (cap) {
                 unsigned cap_idx;
 
@@ -174,7 +174,7 @@ static void drop_capabilities(char *string)
                 drop_bounding_set(cap_idx);
                 drop_capset(cap_idx);
                 bb_error_msg("dropped capability: %s", cap);
-                cap = strtok(NULL, ",");
+                cap = strtok_r(NULL, ",", &string);
         }
 }
 #endif
diff --git a/util-linux/volume_id/get_devname.c b/util-linux/volume_id/get_devname.c
index 34f5d119f..00cfb2826 100644
--- a/util-linux/volume_id/get_devname.c
+++ b/util-linux/volume_id/get_devname.c
@@ -102,10 +102,9 @@ uuidcache_addentry(char *device, /*int major, int minor,*/ char *label, char *uu
  * add a cache entry for this device.
  * If device node does not exist, it will be temporarily created. */
 static int FAST_FUNC
-uuidcache_check_device(const char *device,
-                struct stat *statbuf,
-                void *userData UNUSED_PARAM,
-                int depth UNUSED_PARAM)
+uuidcache_check_device(struct recursive_state *state UNUSED_PARAM,
+                const char *device,
+                struct stat *statbuf)
 {
         /* note: this check rejects links to devices, among other nodes */
         if (!S_ISBLK(statbuf->st_mode)
@@ -145,12 +144,13 @@ uuidcache_init(int scan_devices)
          * This is unacceptably complex. Let's just scan /dev.
          * (Maybe add scanning of /sys/block/XXX/dev for devices
          * somehow not having their /dev/XXX entries created?) */
-        if (scan_devices)
+        if (scan_devices) {
                 recursive_action("/dev", ACTION_RECURSE,
                         uuidcache_check_device, /* file_action */
                         NULL, /* dir_action */
-                        NULL, /* userData */
-                        0 /* depth */);
+                        NULL /* userData */
+                );
+        }
 
         return uuidCache;
 }