Merge branch 'busybox' into merge

12 files changed, 57 insertions, 46 deletions

diff --git a/util-linux/blkid.c b/util-linux/blkid.c
index f353cf248..0bd701aae 100644
--- a/util-linux/blkid.c
+++ b/util-linux/blkid.c
@@ -13,8 +13,6 @@
 //config:       select VOLUMEID
 //config:       help
 //config:       Lists labels and UUIDs of all filesystems.
-//config:       WARNING:
-//config:       With all submodules selected, it will add ~8k to busybox.
 //config:
 //config:config FEATURE_BLKID_TYPE
 //config:       bool "Print filesystem type"
diff --git a/util-linux/findfs.c b/util-linux/findfs.c
index 359da581f..1102eeff5 100644
--- a/util-linux/findfs.c
+++ b/util-linux/findfs.c
@@ -14,8 +14,6 @@
 //config:       select VOLUMEID
 //config:       help
 //config:       Prints the name of a filesystem with given label or UUID.
-//config:       WARNING:
-//config:       With all submodules selected, it will add ~8k to busybox.
 
 /* Benefits from suid root: better access to /dev/BLOCKDEVs: */
 //applet:IF_FINDFS(APPLET(findfs, BB_DIR_SBIN, BB_SUID_MAYBE))
diff --git a/util-linux/getopt.c b/util-linux/getopt.c
index cd5679cff..cf1bc592f 100644
--- a/util-linux/getopt.c
+++ b/util-linux/getopt.c
@@ -41,7 +41,7 @@
 //config:       wisely leave this disabled.
 //config:
 //config:config FEATURE_GETOPT_LONG
-//config:       bool "Support option -l"
+//config:       bool "Support -l LONGOPTs"
 //config:       default y if LONG_OPTS
 //config:       depends on GETOPT
 //config:       help
diff --git a/util-linux/mdev.c b/util-linux/mdev.c
index 23b6f8285..8acc4d21d 100644
--- a/util-linux/mdev.c
+++ b/util-linux/mdev.c
@@ -56,7 +56,7 @@
 //config:       For more information, please see docs/mdev.txt
 //config:
 //config:config FEATURE_MDEV_LOAD_FIRMWARE
-//config:       bool "Support loading of firmwares"
+//config:       bool "Support loading of firmware"
 //config:       default y
 //config:       depends on MDEV
 //config:       help
diff --git a/util-linux/mount.c b/util-linux/mount.c
index 1a39da2db..4d5c2243a 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -26,18 +26,17 @@
 //config:       tree. The 'mount' utility is used to graft a filesystem onto a
 //config:       particular part of the tree. A filesystem can either live on a block
 //config:       device, or it can be accessible over the network, as is the case with
-//config:       NFS filesystems. Most people using BusyBox will also want to enable
-//config:       the 'mount' utility.
+//config:       NFS filesystems.
 //config:
 //config:config FEATURE_MOUNT_FAKE
-//config:       bool "Support option -f"
+//config:       bool "Support -f (fake mount)"
 //config:       default y
 //config:       depends on MOUNT
 //config:       help
 //config:       Enable support for faking a file system mount.
 //config:
 //config:config FEATURE_MOUNT_VERBOSE
-//config:       bool "Support option -v"
+//config:       bool "Support -v (verbose)"
 //config:       default y
 //config:       depends on MOUNT
 //config:       help
@@ -65,7 +64,6 @@
 //config:       help
 //config:       This allows for specifying a device by label or uuid, rather than by
 //config:       name. This feature utilizes the same functionality as blkid/findfs.
-//config:       This also enables label or uuid support for swapon.
 //config:
 //config:config FEATURE_MOUNT_NFS
 //config:       bool "Support mounting NFS file systems on Linux < 2.6.23"
@@ -100,7 +98,7 @@
 //config:
 //config:config FEATURE_MOUNT_FSTAB
 //config:       depends on MOUNT
-//config:       bool "Support /etc/fstab and -a"
+//config:       bool "Support /etc/fstab and -a (mount all)"
 //config:       default y
 //config:       help
 //config:       Support mount all and looking for files in /etc/fstab.
diff --git a/util-linux/rdate.c b/util-linux/rdate.c
index 66b877e24..14ce591e9 100644
--- a/util-linux/rdate.c
+++ b/util-linux/rdate.c
@@ -41,7 +41,7 @@ static time_t askremotedate(const char *host)
         uint32_t nett;
         int fd;
 
-        /* Add a timeout for dead or inaccessible servers */
+        /* Timeout for dead or inaccessible servers */
         alarm(10);
         signal(SIGALRM, socket_timeout);
 
@@ -53,9 +53,8 @@ static time_t askremotedate(const char *host)
                 close(fd);
 
         /* Convert from network byte order to local byte order.
-         * RFC 868 time is the number of seconds
-         * since 00:00 (midnight) 1 January 1900 GMT
-         * the RFC 868 time 2,208,988,800 corresponds to 00:00  1 Jan 1970 GMT
+         * RFC 868 time is seconds since 1900-01-01 00:00 GMT.
+         * RFC 868 time 2,208,988,800 corresponds to 1970-01-01 00:00 GMT.
          * Subtract the RFC 868 time to get Linux epoch.
          */
         nett = ntohl(nett) - RFC_868_BIAS;
@@ -66,7 +65,7 @@ static time_t askremotedate(const char *host)
                  * current time  cur = 0x123ffffffff.
                  * Assuming our time is not some 40 years off,
                  * remote time must be 0x12400000001.
-                 * Need to adjust out time by (int32_t)(nett - cur).
+                 * Need to adjust our time by (int32_t)(nett - cur).
                  */
                 time_t cur = time(NULL);
                 int32_t adjust = (int32_t)(nett - (uint32_t)cur);
diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
index bda0687d6..f432ce180 100644
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -37,6 +37,15 @@
 //config:       bool "swapoff (4.3 kb)"
 //config:       default y
 //config:       select PLATFORM_LINUX
+//config:
+//config:config FEATURE_SWAPONOFF_LABEL
+//config:       bool "Support specifying devices by label or UUID"
+//config:       default y
+//config:       depends on SWAPON || SWAPOFF
+//config:       select VOLUMEID
+//config:       help
+//config:       This allows for specifying a device by label or uuid, rather than by
+//config:       name. This feature utilizes the same functionality as blkid/findfs.
 
 //                  APPLET_ODDNAME:name     main         location     suid_type     help
 //applet:IF_SWAPON( APPLET_ODDNAME(swapon,  swap_on_off, BB_DIR_SBIN, BB_SUID_DROP, swapon))
@@ -72,7 +81,7 @@
 # include <sys/swap.h>
 #endif
 
-#if ENABLE_FEATURE_MOUNT_LABEL
+#if ENABLE_FEATURE_SWAPONOFF_LABEL
 # include "volume_id.h"
 #else
 # define resolve_mount_spec(fsname) ((void)0)
diff --git a/util-linux/umount.c b/util-linux/umount.c
index 31bf671c1..122c0f579 100644
--- a/util-linux/umount.c
+++ b/util-linux/umount.c
@@ -18,7 +18,7 @@
 //config:       utility, you almost certainly also want to enable 'umount'.
 //config:
 //config:config FEATURE_UMOUNT_ALL
-//config:       bool "Support option -a"
+//config:       bool "Support -a (unmount all)"
 //config:       default y
 //config:       depends on UMOUNT
 //config:       help
diff --git a/util-linux/volume_id/get_devname.c b/util-linux/volume_id/get_devname.c
index b64d28ceb..34f5d119f 100644
--- a/util-linux/volume_id/get_devname.c
+++ b/util-linux/volume_id/get_devname.c
@@ -11,6 +11,7 @@
 //kbuild:lib-$(CONFIG_BLKID) += get_devname.o
 //kbuild:lib-$(CONFIG_FINDFS) += get_devname.o
 //kbuild:lib-$(CONFIG_FEATURE_MOUNT_LABEL) += get_devname.o
+//kbuild:lib-$(CONFIG_FEATURE_SWAPONOFF_LABEL) += get_devname.o
 
 #include <sys/mount.h> /* BLKGETSIZE64 */
 #if !defined(BLKGETSIZE64)
diff --git a/util-linux/volume_id/unused_minix.c b/util-linux/volume_id/minix.c
index 443dbc272..c934f9ead 100644
--- a/util-linux/volume_id/unused_minix.c
+++ b/util-linux/volume_id/minix.c
@@ -17,13 +17,12 @@
  *      License along with this library; if not, write to the Free Software
  *      Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
+//config:config FEATURE_VOLUMEID_MINIX
+//config:       bool "minix filesystem"
+//config:       default y
+//config:       depends on VOLUMEID
 
-//kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_MINIX) += minix.o
-
-//config:### config FEATURE_VOLUMEID_MINIX
-//config:###    bool "minix filesystem"
-//config:###    default y
-//config:###    depends on VOLUMEID
+//kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_MINIX) += minix.o
 
 #include "volume_id_internal.h"
 
@@ -40,43 +39,53 @@ struct minix_super_block {
         uint32_t        s_zones;
 } PACKED;
 
-#define MINIX_SUPERBLOCK_OFFSET                 0x400
+/* V3 minix super-block data on disk */
+struct minix3_super_block {
+        uint32_t        s_ninodes;
+        uint16_t        s_pad0;
+        uint16_t        s_imap_blocks;
+        uint16_t        s_zmap_blocks;
+        uint16_t        s_firstdatazone;
+        uint16_t        s_log_zone_size;
+        uint16_t        s_pad1;
+        uint32_t        s_max_size;
+        uint32_t        s_zones;
+        uint16_t        s_magic;
+        uint16_t        s_pad2;
+        uint16_t        s_blocksize;
+        uint8_t         s_disk_version;
+} PACKED;
+
+#define MINIX_SUPERBLOCK_OFFSET 0x400
 
-int FAST_FUNC volume_id_probe_minix(struct volume_id *id, uint64_t off)
+int FAST_FUNC volume_id_probe_minix(struct volume_id *id /*, uint64_t off*/)
 {
+#define off ((uint64_t)0)
         struct minix_super_block *ms;
+        struct minix3_super_block *ms3;
 
         dbg("probing at offset 0x%llx", (unsigned long long) off);
 
         ms = volume_id_get_buffer(id, off + MINIX_SUPERBLOCK_OFFSET, 0x200);
         if (ms == NULL)
                 return -1;
-
-        if (ms->s_magic == cpu_to_le16(0x137f)) {
-//              id->type_version[0] = '1';
+        if (ms->s_magic == cpu_to_le16(0x137F)) /* minix V1 fs, 14 char names */
                 goto found;
-        }
-
-        if (ms->s_magic == cpu_to_le16(0x1387)) {
-//              id->type_version[0] = '1';
+        if (ms->s_magic == cpu_to_le16(0x138F)) /* minix V1 fs, 30 char names */
                 goto found;
-        }
-
-        if (ms->s_magic == cpu_to_le16(0x2468)) {
-//              id->type_version[0] = '2';
+        if (ms->s_magic == cpu_to_le16(0x2468)) /* minix V2 fs, 14 char names */
+                goto found;
+        if (ms->s_magic == cpu_to_le16(0x2478)) /* minix V2 fs, 30 char names */
                 goto found;
-        }
 
-        if (ms->s_magic == cpu_to_le16(0x2478)) {
-//              id->type_version[0] = '2';
+        ms3 = (void*)ms;
+        if (ms3->s_magic == cpu_to_le16(0x4d5a)) /* minix V3 fs, 60 char names */
                 goto found;
-        }
 
         return -1;
 
  found:
-//      id->type_version[1] = '\0';
 //      volume_id_set_usage(id, VOLUME_ID_FILESYSTEM);
-//      id->type = "minix";
+        IF_FEATURE_BLKID_TYPE(id->type = "minix";)
         return 0;
 }
diff --git a/util-linux/volume_id/volume_id.c b/util-linux/volume_id/volume_id.c
index 5bb95994b..85315ced6 100644
--- a/util-linux/volume_id/volume_id.c
+++ b/util-linux/volume_id/volume_id.c
@@ -42,7 +42,6 @@
 #define ENABLE_FEATURE_VOLUMEID_VIARAID       0
 
 /* These filesystems also have no label or uuid: */
-#define ENABLE_FEATURE_VOLUMEID_MINIX         0
 #define ENABLE_FEATURE_VOLUMEID_HPFS          0
 #define ENABLE_FEATURE_VOLUMEID_UFS           0
 
diff --git a/util-linux/volume_id/volume_id_internal.h b/util-linux/volume_id/volume_id_internal.h
index 759a832e6..0eaea9b34 100644
--- a/util-linux/volume_id/volume_id_internal.h
+++ b/util-linux/volume_id/volume_id_internal.h
@@ -193,7 +193,7 @@ int FAST_FUNC volume_id_probe_luks(struct volume_id *id /*,uint64_t off*/);
 
 //int FAST_FUNC volume_id_probe_mac_partition_map(struct volume_id *id /*,uint64_t off*/);
 
-//int FAST_FUNC volume_id_probe_minix(struct volume_id *id /*,uint64_t off*/);
+int FAST_FUNC volume_id_probe_minix(struct volume_id *id /*, uint64_t off*/);
 
 //int FAST_FUNC volume_id_probe_msdos_part_table(struct volume_id *id /*,uint64_t off*/);