Merge branch 'busybox' into merge

8 files changed, 110 insertions, 36 deletions

diff --git a/util-linux/cal.c b/util-linux/cal.c
index 10df0ae8b..a4a20d5f0 100644
--- a/util-linux/cal.c
+++ b/util-linux/cal.c
@@ -16,7 +16,8 @@
 //config:       help
 //config:       cal is used to display a monthly calendar.
 
-//applet:IF_CAL(APPLET(cal, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_CAL(APPLET_NOEXEC(cal, cal, BB_DIR_USR_BIN, BB_SUID_DROP, cal))
+/* NOEXEC despite rare cases when it can be a "runner" (e.g. cal -n12000 takes you into years 30xx) */
 
 //kbuild:lib-$(CONFIG_CAL) += cal.o
 
diff --git a/util-linux/chrt.c b/util-linux/chrt.c
index 2712ea3e3..45459d940 100644
--- a/util-linux/chrt.c
+++ b/util-linux/chrt.c
@@ -9,7 +9,7 @@
 //config:       bool "chrt (4.4 kb)"
 //config:       default y
 //config:       help
-//config:       manipulate real-time attributes of a process.
+//config:       Manipulate real-time attributes of a process.
 //config:       This requires sched_{g,s}etparam support in your libc.
 
 //applet:IF_CHRT(APPLET_NOEXEC(chrt, chrt, BB_DIR_USR_BIN, BB_SUID_DROP, chrt))
@@ -17,13 +17,15 @@
 //kbuild:lib-$(CONFIG_CHRT) += chrt.o
 
 //usage:#define chrt_trivial_usage
-//usage:       "[-prfom] [PRIO] [PID | PROG ARGS]"
+//usage:       "[-prfombi] [PRIO] [PID | PROG ARGS]"
 //usage:#define chrt_full_usage "\n\n"
 //usage:       "Change scheduling priority and class for a process\n"
 //usage:     "\n        -p      Operate on PID"
 //usage:     "\n        -r      Set SCHED_RR class"
 //usage:     "\n        -f      Set SCHED_FIFO class"
 //usage:     "\n        -o      Set SCHED_OTHER class"
+//usage:     "\n        -b      Set SCHED_BATCH class"
+//usage:     "\n        -i      Set SCHED_IDLE class"
 //usage:     "\n        -m      Show min/max priorities"
 //usage:
 //usage:#define chrt_example_usage
@@ -33,20 +35,22 @@
 
 #include <sched.h>
 #include "libbb.h"
+#ifndef SCHED_IDLE
+# define SCHED_IDLE 5
+#endif
 
 static const struct {
-        int policy;
         char name[sizeof("SCHED_OTHER")];
 } policies[] = {
-        {SCHED_OTHER, "SCHED_OTHER"},
-        {SCHED_FIFO, "SCHED_FIFO"},
-        {SCHED_RR, "SCHED_RR"}
+        { "SCHED_OTHER" }, /* 0:SCHED_OTHER */
+        { "SCHED_FIFO" },  /* 1:SCHED_FIFO */
+        { "SCHED_RR" },    /* 2:SCHED_RR */
+        { "SCHED_BATCH" }, /* 3:SCHED_BATCH */
+        { "" },            /* 4:SCHED_ISO */
+        { "SCHED_IDLE" },  /* 5:SCHED_IDLE */
+        /* 6:SCHED_DEADLINE */
 };
 
-//TODO: add
-// -b, SCHED_BATCH
-// -i, SCHED_IDLE
-
 static void show_min_max(int pol)
 {
         const char *fmt = "%s min/max priority\t: %u/%u\n";
@@ -64,6 +68,8 @@ static void show_min_max(int pol)
 #define OPT_r (1<<2)
 #define OPT_f (1<<3)
 #define OPT_o (1<<4)
+#define OPT_b (1<<5)
+#define OPT_i (1<<6)
 
 int chrt_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int chrt_main(int argc UNUSED_PARAM, char **argv)
@@ -76,20 +82,30 @@ int chrt_main(int argc UNUSED_PARAM, char **argv)
         const char *current_new;
         int policy = SCHED_RR;
 
-        /* only one policy accepted */
-        opt = getopt32(argv, "^+" "mprfo" "\0" "r--fo:f--ro:o--rf");
+        opt = getopt32(argv, "^"
+                        "+" "mprfobi"
+                        "\0"
+                        /* only one policy accepted: */
+                        "r--fobi:f--robi:o--rfbi:b--rfoi:i--rfob"
+        );
         if (opt & OPT_m) { /* print min/max and exit */
+                show_min_max(SCHED_OTHER);
                 show_min_max(SCHED_FIFO);
                 show_min_max(SCHED_RR);
-                show_min_max(SCHED_OTHER);
+                show_min_max(SCHED_BATCH);
+                show_min_max(SCHED_IDLE);
                 fflush_stdout_and_exit(EXIT_SUCCESS);
         }
-        if (opt & OPT_r)
-                policy = SCHED_RR;
+        //if (opt & OPT_r)
+        //      policy = SCHED_RR; - default, already set
         if (opt & OPT_f)
                 policy = SCHED_FIFO;
         if (opt & OPT_o)
                 policy = SCHED_OTHER;
+        if (opt & OPT_b)
+                policy = SCHED_BATCH;
+        if (opt & OPT_i)
+                policy = SCHED_IDLE;
 
         argv += optind;
         if (!argv[0])
@@ -131,12 +147,9 @@ int chrt_main(int argc UNUSED_PARAM, char **argv)
                 current_new += 8;
         }
 
-        /* from the manpage of sched_getscheduler:
-        [...] sched_priority can have a value in the range 0 to 99.
-        [...] SCHED_OTHER or SCHED_BATCH must be assigned static priority 0.
-        [...] SCHED_FIFO or SCHED_RR can have static priority in 1..99 range.
-        */
-        sp.sched_priority = xstrtou_range(priority, 0, policy != SCHED_OTHER ? 1 : 0, 99);
+        sp.sched_priority = xstrtou_range(priority, 0,
+                sched_get_priority_min(policy), sched_get_priority_max(policy)
+        );
 
         if (sched_setscheduler(pid, policy, &sp) < 0)
                 bb_perror_msg_and_die("can't %cet pid %d's policy", 's', (int)pid);
diff --git a/util-linux/fdisk_gpt.c b/util-linux/fdisk_gpt.c
index 45d2aa6e7..cdb90627d 100644
--- a/util-linux/fdisk_gpt.c
+++ b/util-linux/fdisk_gpt.c
@@ -177,7 +177,7 @@ check_gpt_label(void)
 
         init_unicode();
         if (!global_crc32_table) {
-                global_crc32_table = crc32_filltable(NULL, 0);
+                global_crc32_new_table_le();
         }
 
         crc = SWAP_LE32(gpt_hdr->hdr_crc32);
diff --git a/util-linux/renice.c b/util-linux/renice.c
index 70c494b3d..46704591f 100644
--- a/util-linux/renice.c
+++ b/util-linux/renice.c
@@ -6,7 +6,6 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
 /* Notes:
  *   Setting an absolute priority was obsoleted in SUSv2 and removed
  *   in SUSv3.  However, the common linux version of renice does
@@ -42,10 +41,6 @@
 #include "libbb.h"
 #include <sys/resource.h>
 
-void BUG_bad_PRIO_PROCESS(void);
-void BUG_bad_PRIO_PGRP(void);
-void BUG_bad_PRIO_USER(void);
-
 int renice_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int renice_main(int argc UNUSED_PARAM, char **argv)
 {
@@ -59,12 +54,9 @@ int renice_main(int argc UNUSED_PARAM, char **argv)
         char *arg;
 
         /* Yes, they are not #defines in glibc 2.4! #if won't work */
-        if (PRIO_PROCESS < CHAR_MIN || PRIO_PROCESS > CHAR_MAX)
-                BUG_bad_PRIO_PROCESS();
-        if (PRIO_PGRP < CHAR_MIN || PRIO_PGRP > CHAR_MAX)
-                BUG_bad_PRIO_PGRP();
-        if (PRIO_USER < CHAR_MIN || PRIO_USER > CHAR_MAX)
-                BUG_bad_PRIO_USER();
+        BUILD_BUG_ON(PRIO_PROCESS < CHAR_MIN || PRIO_PROCESS > CHAR_MAX);
+        BUILD_BUG_ON(PRIO_PGRP < CHAR_MIN || PRIO_PGRP > CHAR_MAX);
+        BUILD_BUG_ON(PRIO_USER < CHAR_MIN || PRIO_USER > CHAR_MAX);
 
         arg = *++argv;
 
@@ -102,6 +94,7 @@ int renice_main(int argc UNUSED_PARAM, char **argv)
                 /* Process an ID arg. */
                 if (which == PRIO_USER) {
                         struct passwd *p;
+                        /* NB: use of getpwnam makes it risky to be NOFORK, switch to getpwnam_r? */
                         p = getpwnam(arg);
                         if (!p) {
                                 bb_error_msg("unknown user %s", arg);
diff --git a/util-linux/umount.c b/util-linux/umount.c
index a6405dfcc..b45cd8a6b 100644
--- a/util-linux/umount.c
+++ b/util-linux/umount.c
@@ -81,8 +81,8 @@ static struct mntent *getmntent_r(FILE* stream, struct mntent* result,
 }
 #endif
 
-/* ignored: -v -t -i */
-#define OPTION_STRING           "fldnra" "vt:i"
+/* ignored: -c -v -t -i */
+#define OPTION_STRING           "fldnra" "cvt:i"
 #define OPT_FORCE               (1 << 0) // Same as MNT_FORCE
 #define OPT_LAZY                (1 << 1) // Same as MNT_DETACH
 #define OPT_FREELOOP            (1 << 2)
diff --git a/util-linux/volume_id/lfs.c b/util-linux/volume_id/lfs.c
new file mode 100644
index 000000000..1a2a2987f
--- /dev/null
+++ b/util-linux/volume_id/lfs.c
@@ -0,0 +1,62 @@
+/*
+ * volume_id - reads filesystem label and uuid
+ *
+ * Copyright (C) 2018 Sven-Göran Bergh <sgb@systemaxion.se>
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+//config:config FEATURE_VOLUMEID_LFS
+//config:       bool "LittleFS filesystem"
+//config:       default y
+//config:       depends on VOLUMEID && FEATURE_BLKID_TYPE
+//config:       help
+//config:       LittleFS is a small fail-safe filesystem designed for embedded
+//config:       systems. It has strong copy-on-write guarantees and storage on disk
+//config:       is always kept in a valid state. It also provides a form of dynamic
+//config:       wear levelling for systems that can not fit a full flash translation
+//config:       layer.
+
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_LFS) += lfs.o
+
+#include "volume_id_internal.h"
+
+#define LFS_SB1_OFFSET          0x10
+#define LFS_MAGIC_NAME          "littlefs"
+#define LFS_MAGIC_LEN           8
+
+// The superblock is stored in the first metadata pair, i.e the first two blocks.
+struct lfs_super_block {        // A block in a metadata pair
+// /* 0x00 */   uint32_t        rev_count;              // Revision count
+// /* 0x04 */   uint32_t        dir_size;               // Directory size
+// /* 0x08 */   uint64_t        tail_ptr;               // Tail pointer
+/* 0x10 */      uint8_t         entry_type;             // Entry type
+/* 0x11 */      uint8_t         entry_len;              // Entry length
+/* 0x12 */      uint8_t         att_len;                // Attribute length
+/* 0x13 */      uint8_t         name_len;               // Name length
+/* 0x14 */      uint64_t        root_dir;               // Root directory
+/* 0x1C */      uint32_t        block_size;             // Block size
+/* 0x20 */      uint32_t        block_count;            // Block count
+/* 0x24 */      uint16_t        ver_major;              // Version major
+/* 0x26 */      uint16_t        ver_minor;              // Version minor
+/* 0x28 */      uint8_t         magic[LFS_MAGIC_LEN];   // Magic string "littlefs"
+// /* 0x30 */   uint32_t        crc;                    // CRC-32 checksum
+} PACKED;
+
+int FAST_FUNC volume_id_probe_lfs(struct volume_id *id /*,uint64_t off*/)
+{
+        struct lfs_super_block *sb;
+
+        // Go for primary super block (ignore second sb)
+        dbg("lfs: probing at offset 0x%x", LFS_SB1_OFFSET);
+        sb = volume_id_get_buffer(id, LFS_SB1_OFFSET, sizeof(*sb));
+
+        if (!sb)
+                return -1;
+
+        if (memcmp(sb->magic, LFS_MAGIC_NAME, LFS_MAGIC_LEN) != 0)
+                return -1;
+
+        IF_FEATURE_BLKID_TYPE(id->type = LFS_MAGIC_NAME);
+
+        return 0;
+}
diff --git a/util-linux/volume_id/volume_id.c b/util-linux/volume_id/volume_id.c
index 85315ced6..c3f07a741 100644
--- a/util-linux/volume_id/volume_id.c
+++ b/util-linux/volume_id/volume_id.c
@@ -97,6 +97,9 @@ static const probe_fptr fs1[] = {
 #if ENABLE_FEATURE_VOLUMEID_EXFAT
         volume_id_probe_exfat,
 #endif
+#if ENABLE_FEATURE_VOLUMEID_LFS
+        volume_id_probe_lfs,
+#endif
 #if ENABLE_FEATURE_VOLUMEID_MAC
         volume_id_probe_mac_partition_map,
 #endif
diff --git a/util-linux/volume_id/volume_id_internal.h b/util-linux/volume_id/volume_id_internal.h
index 0eaea9b34..ada18339d 100644
--- a/util-linux/volume_id/volume_id_internal.h
+++ b/util-linux/volume_id/volume_id_internal.h
@@ -187,6 +187,8 @@ int FAST_FUNC volume_id_probe_iso9660(struct volume_id *id /*,uint64_t off*/);
 
 int FAST_FUNC volume_id_probe_jfs(struct volume_id *id /*,uint64_t off*/);
 
+int FAST_FUNC volume_id_probe_lfs(struct volume_id *id /*,uint64_t off*/);
+
 int FAST_FUNC volume_id_probe_linux_swap(struct volume_id *id /*,uint64_t off*/);
 
 int FAST_FUNC volume_id_probe_luks(struct volume_id *id /*,uint64_t off*/);