Merge branch 'busybox' into merge

8 files changed, 152 insertions, 44 deletions

diff --git a/miscutils/beep.c b/miscutils/beep.c
index 910e03e1b..18b160cc4 100644
--- a/miscutils/beep.c
+++ b/miscutils/beep.c
@@ -88,7 +88,7 @@ int beep_main(int argc, char **argv)
                         bb_show_usage();
                 }
                 while (rep) {
-//bb_info_msg("rep[%d] freq=%d, length=%d, delay=%d", rep, freq, length, delay);
+//bb_error_msg("rep[%d] freq=%d, length=%d, delay=%d", rep, freq, length, delay);
                         xioctl(speaker, KIOCSOUND, (void*)(uintptr_t)tickrate_div_freq);
                         usleep(1000 * length);
                         ioctl(speaker, KIOCSOUND, (void*)0);
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c
index 9256567cc..6217918da 100644
--- a/miscutils/devfsd.c
+++ b/miscutils/devfsd.c
@@ -284,7 +284,7 @@ static const char bb_msg_variable_not_found[] ALIGN1 = "variable: %s not found";
 
 /* Busybox stuff */
 #if ENABLE_DEVFSD_VERBOSE || ENABLE_DEBUG
-#define info_logger(p, fmt, args...)                 bb_info_msg(fmt, ## args)
+#define info_logger(p, fmt, args...)                 bb_error_msg(fmt, ## args)
 #define msg_logger(p, fmt, args...)                  bb_error_msg(fmt, ## args)
 #define msg_logger_and_die(p, fmt, args...)          bb_error_msg_and_die(fmt, ## args)
 #define error_logger(p, fmt, args...)                bb_perror_msg(fmt, ## args)
diff --git a/miscutils/eject.c b/miscutils/eject.c
index a20e04b7f..e33d79127 100644
--- a/miscutils/eject.c
+++ b/miscutils/eject.c
@@ -25,23 +25,19 @@
 
 #include <sys/mount.h>
 #include "libbb.h"
+#if ENABLE_FEATURE_EJECT_SCSI
 /* Must be after libbb.h: they need size_t */
-#include "fix_u32.h"
-#include <scsi/sg.h>
-#include <scsi/scsi.h>
-
-/* various defines swiped from linux/cdrom.h */
-#define CDROMCLOSETRAY            0x5319  /* pendant of CDROMEJECT  */
-#define CDROMEJECT                0x5309  /* Ejects the cdrom media */
-#define CDROM_DRIVE_STATUS        0x5326  /* Get tray position, etc. */
-/* drive status possibilities returned by CDROM_DRIVE_STATUS ioctl */
-#define CDS_TRAY_OPEN        2
+# include "fix_u32.h"
+# include <scsi/sg.h>
+# include <scsi/scsi.h>
+#endif
 
 #define dev_fd 3
 
 /* Code taken from the original eject (http://eject.sourceforge.net/),
  * refactored it a bit for busybox (ne-bb@nicoerfurth.de) */
 
+#if ENABLE_FEATURE_EJECT_SCSI
 static void eject_scsi(const char *dev)
 {
         static const char sg_commands[3][6] = {
@@ -76,6 +72,16 @@ static void eject_scsi(const char *dev)
         /* force kernel to reread partition table when new disc is inserted */
         ioctl(dev_fd, BLKRRPART);
 }
+#else
+# define eject_scsi(dev) ((void)0)
+#endif
+
+/* various defines swiped from linux/cdrom.h */
+#define CDROMCLOSETRAY            0x5319  /* pendant of CDROMEJECT  */
+#define CDROMEJECT                0x5309  /* Ejects the cdrom media */
+#define CDROM_DRIVE_STATUS        0x5326  /* Get tray position, etc. */
+/* drive status possibilities returned by CDROM_DRIVE_STATUS ioctl */
+#define CDS_TRAY_OPEN        2
 
 #define FLAG_CLOSE  1
 #define FLAG_SMART  2
diff --git a/miscutils/flash_eraseall.c b/miscutils/flash_eraseall.c
index bf9b739a1..d95d214d9 100644
--- a/miscutils/flash_eraseall.c
+++ b/miscutils/flash_eraseall.c
@@ -147,7 +147,7 @@ int flash_eraseall_main(int argc UNUSED_PARAM, char **argv)
                         ret = ioctl(fd, MEMGETBADBLOCK, &offset);
                         if (ret > 0) {
                                 if (!(flags & OPTION_Q))
-                                        bb_info_msg("\nSkipping bad block at 0x%08x", erase.start);
+                                        printf("\nSkipping bad block at 0x%08x\n", erase.start);
                                 continue;
                         }
                         if (ret < 0) {
diff --git a/miscutils/inotifyd.c b/miscutils/inotifyd.c
index 7a1a6a2e5..908d657fd 100644
--- a/miscutils/inotifyd.c
+++ b/miscutils/inotifyd.c
@@ -47,8 +47,8 @@
 //usage:     "\n        o       Event queue overflowed"
 //usage:     "\n        x       File can't be watched anymore"
 //usage:     "\nIf watching a directory:"
-//usage:     "\n        m       Subfile is moved into dir"
-//usage:     "\n        y       Subfile is moved out of dir"
+//usage:     "\n        y       Subfile is moved into dir"
+//usage:     "\n        m       Subfile is moved out of dir"
 //usage:     "\n        n       Subfile is created"
 //usage:     "\n        d       Subfile is deleted"
 //usage:     "\n"
diff --git a/miscutils/taskset.c b/miscutils/taskset.c
index 100b1d926..fb352ab8d 100644
--- a/miscutils/taskset.c
+++ b/miscutils/taskset.c
@@ -75,27 +75,26 @@ static char *from_cpuset(cpu_set_t *mask)
 #define TASKSET_PRINTF_MASK "%llx"
 static unsigned long long from_cpuset(cpu_set_t *mask)
 {
-        char *p = (void*)mask;
+        BUILD_BUG_ON(CPU_SETSIZE < 8*sizeof(int));
 
-        BUILD_BUG_ON(CPU_SETSIZE < sizeof(int));
-
-        /* Take the least significant bits. Careful!
-         * Consider both CPU_SETSIZE=4 and CPU_SETSIZE=1024 cases
+        /* Take the least significant bits. Assume cpu_set_t is
+         * implemented as an array of unsigned long or unsigned
+         * int.
          */
-#if BB_BIG_ENDIAN
-        /* For big endian, it means LAST bits */
-        if (CPU_SETSIZE < sizeof(long))
-                p += CPU_SETSIZE - sizeof(int);
-        else if (CPU_SETSIZE < sizeof(long long))
-                p += CPU_SETSIZE - sizeof(long);
-        else
-                p += CPU_SETSIZE - sizeof(long long);
-#endif
-        if (CPU_SETSIZE < sizeof(long))
-                return *(unsigned*)p;
-        if (CPU_SETSIZE < sizeof(long long))
-                return *(unsigned long*)p;
-        return *(unsigned long long*)p;
+        if (CPU_SETSIZE < 8*sizeof(long))
+                return *(unsigned*)mask;
+        if (CPU_SETSIZE < 8*sizeof(long long))
+                return *(unsigned long*)mask;
+# if BB_BIG_ENDIAN
+        if (sizeof(long long) > sizeof(long)) {
+                /* We can put two long in the long long, but they have to
+                 * be swapped: the least significant word comes first in the
+                 * array */
+                unsigned long *p = (void*)mask;
+                return p[0] + ((unsigned long long)p[1] << (8*sizeof(long)));
+        }
+# endif
+        return *(unsigned long long*)mask;
 }
 #endif
 
diff --git a/miscutils/ubi_tools.c b/miscutils/ubi_tools.c
index dd1bda300..4364bc807 100644
--- a/miscutils/ubi_tools.c
+++ b/miscutils/ubi_tools.c
@@ -195,7 +195,7 @@ int ubi_tools_main(int argc UNUSED_PARAM, char **argv)
         } else
 
 //usage:#define ubimkvol_trivial_usage
-//usage:       "UBI_DEVICE -N NAME [-s SIZE | -m]"
+//usage:       "-N NAME [-s SIZE | -m] UBI_DEVICE"
 //usage:#define ubimkvol_full_usage "\n\n"
 //usage:       "Create UBI volume\n"
 //usage:     "\n        -a ALIGNMENT    Volume alignment (default 1)"
@@ -212,9 +212,7 @@ int ubi_tools_main(int argc UNUSED_PARAM, char **argv)
                         unsigned num;
                         char *p;
 
-                        if (sscanf(ubi_ctrl, "/dev/ubi%u", &num) != 1)
-                                bb_error_msg_and_die("wrong format of UBI device name");
-
+                        num = ubi_devnum_from_devname(ubi_ctrl);
                         p = path_sys_class_ubi_ubi + sprintf(path_sys_class_ubi_ubi, "%u/", num);
 
                         strcpy(p, "avail_eraseblocks");
@@ -248,20 +246,31 @@ int ubi_tools_main(int argc UNUSED_PARAM, char **argv)
         } else
 
 //usage:#define ubirmvol_trivial_usage
-//usage:       "UBI_DEVICE -n VOLID"
+//usage:       "-n VOLID / -N VOLNAME UBI_DEVICE"
 //usage:#define ubirmvol_full_usage "\n\n"
 //usage:       "Remove UBI volume\n"
 //usage:     "\n        -n VOLID        Volume ID"
+//usage:     "\n        -N VOLNAME      Volume name"
         if (do_rmvol) {
-                if (!(opts & OPTION_n))
+                if (!(opts & (OPTION_n|OPTION_N)))
                         bb_error_msg_and_die("volume id not specified");
 
-                /* FIXME? kernel expects int32_t* here: */
-                xioctl(fd, UBI_IOCRMVOL, &vol_id);
+                if (opts & OPTION_N) {
+                        unsigned num = ubi_devnum_from_devname(ubi_ctrl);
+                        vol_id = ubi_get_volid_by_name(num, vol_name);
+                }
+
+                if (sizeof(vol_id) != 4) {
+                        /* kernel expects int32_t* in this ioctl */
+                        int32_t t = vol_id;
+                        xioctl(fd, UBI_IOCRMVOL, &t);
+                } else {
+                        xioctl(fd, UBI_IOCRMVOL, &vol_id);
+                }
         } else
 
 //usage:#define ubirsvol_trivial_usage
-//usage:       "UBI_DEVICE -n VOLID -s SIZE"
+//usage:       "-n VOLID -s SIZE UBI_DEVICE"
 //usage:#define ubirsvol_full_usage "\n\n"
 //usage:       "Resize UBI volume\n"
 //usage:     "\n        -n VOLID        Volume ID"
@@ -279,7 +288,7 @@ int ubi_tools_main(int argc UNUSED_PARAM, char **argv)
         } else
 
 //usage:#define ubiupdatevol_trivial_usage
-//usage:       "UBI_DEVICE [-t | [-s SIZE] IMG_FILE]"
+//usage:       "[-t | [-s SIZE] IMG_FILE] UBI_DEVICE"
 //usage:#define ubiupdatevol_full_usage "\n\n"
 //usage:       "Update UBI volume\n"
 //usage:     "\n        -t      Truncate to zero size"
diff --git a/miscutils/ubirename.c b/miscutils/ubirename.c
new file mode 100644
index 000000000..8b1c3785a
--- /dev/null
+++ b/miscutils/ubirename.c
@@ -0,0 +1,94 @@
+/* ubirename - port of the ubirename from the mtd-utils package
+ *
+ * A utility to rename one UBI volume.
+ *
+ * 2016-03-01 Sven Eisenberg <sven.eisenberg@novero.com>
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+//config:config UBIRENAME
+//config:       bool "ubirename"
+//config:       default y
+//config:       select PLATFORM_LINUX
+//config:       help
+//config:         Utility to rename UBI volumes
+
+//applet:IF_UBIRENAME(APPLET(ubirename, BB_DIR_USR_SBIN, BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_UBIRENAME) += ubirename.o
+
+//usage:#define ubirename_trivial_usage
+//usage:        "UBI_DEVICE OLD_VOLNAME NEW_VOLNAME [OLD2 NEW2]..."
+//usage:#define ubirename_full_usage "\n\n"
+//usage:        "Rename UBI volumes on UBI_DEVICE"
+
+#include "libbb.h"
+#include <mtd/mtd-user.h>
+
+#ifndef __packed
+# define __packed __attribute__((packed))
+#endif
+
+// from ubi-media.h
+#define UBI_MAX_VOLUME_NAME 127
+#define UBI_MAX_VOLUMES     128
+// end ubi-media.h
+
+// from ubi-user.h
+/* ioctl commands of UBI character devices */
+#define UBI_IOC_MAGIC 'o'
+
+/* Re-name volumes */
+#define UBI_IOCRNVOL _IOW(UBI_IOC_MAGIC, 3, struct ubi_rnvol_req)
+
+/* Maximum amount of UBI volumes that can be re-named at one go */
+#define UBI_MAX_RNVOL 32
+
+struct ubi_rnvol_req {
+        int32_t count;
+        int8_t  padding1[12];
+        struct {
+                int32_t vol_id;
+                int16_t name_len;
+                int8_t  padding2[2];
+                char    name[UBI_MAX_VOLUME_NAME + 1];
+        } ents[UBI_MAX_RNVOL];
+} __packed;
+// end ubi-user.h
+
+int ubirename_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int ubirename_main(int argc, char **argv)
+{
+        struct ubi_rnvol_req *rnvol;
+        const char *ubi_devname;
+        unsigned ubi_devnum;
+        unsigned n;
+
+        /* argc can be 4, 6, 8, ... */
+        if ((argc & 1) || (argc >>= 1) < 2)
+                bb_show_usage();
+
+        rnvol = xzalloc(sizeof(*rnvol));
+        rnvol->count = --argc;
+        if (argc > ARRAY_SIZE(rnvol->ents))
+                bb_error_msg_and_die("too many renames requested");
+
+        ubi_devname = argv[1];
+        ubi_devnum = ubi_devnum_from_devname(ubi_devname);
+
+        n = 0;
+        argv += 2;
+        while (argv[0]) {
+                rnvol->ents[n].vol_id = ubi_get_volid_by_name(ubi_devnum, argv[0]);
+                rnvol->ents[n].name_len = strlen(argv[1]);
+                if (rnvol->ents[n].name_len >= sizeof(rnvol->ents[n].name))
+                        bb_error_msg_and_die("new name '%s' is too long", argv[1]);
+                strcpy(rnvol->ents[n].name, argv[1]);
+                n++;
+                argv += 2;
+        }
+
+        xioctl(xopen(ubi_devname, O_RDONLY), UBI_IOCRNVOL, rnvol);
+
+        return 0;
+}