Merge branch 'busybox' into merge

32 files changed, 47 insertions, 47 deletions

diff --git a/miscutils/adjtimex.c b/miscutils/adjtimex.c
index 209d1d560..fb478c0c9 100644
--- a/miscutils/adjtimex.c
+++ b/miscutils/adjtimex.c
@@ -11,7 +11,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config ADJTIMEX
-//config:       bool "adjtimex (4.7 kb)"
+//config:       bool "adjtimex (4.9 kb)"
 //config:       default y
 //config:       help
 //config:       Adjtimex reads and optionally sets adjustment parameters for
diff --git a/miscutils/ascii.c b/miscutils/ascii.c
index 98c11fa51..7bcb950fd 100644
--- a/miscutils/ascii.c
+++ b/miscutils/ascii.c
@@ -5,7 +5,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config ASCII
-//config:       bool "ascii"
+//config:       bool "ascii (784 bytes)"
 //config:       default y
 //config:       help
 //config:       Print ascii table.
diff --git a/miscutils/bc.c b/miscutils/bc.c
index 01402b311..a82646674 100644
--- a/miscutils/bc.c
+++ b/miscutils/bc.c
@@ -14,7 +14,7 @@
 #define SANITY_CHECKS 1
 
 //config:config BC
-//config:       bool "bc (45 kb)"
+//config:       bool "bc (38 kb)"
 //config:       default y
 //config:       select FEATURE_DC_BIG
 //config:       help
@@ -38,7 +38,7 @@
 //config:         5) "read()" accepts expressions, not only numeric literals.
 //config:
 //config:config DC
-//config:       bool "dc (36 kb)"
+//config:       bool "dc (29 kb)"
 //config:       default y
 //config:       help
 //config:       dc is a reverse-polish notation command-line calculator which
diff --git a/miscutils/beep.c b/miscutils/beep.c
index 7c60aed08..724a666c8 100644
--- a/miscutils/beep.c
+++ b/miscutils/beep.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config BEEP
-//config:       bool "beep (2.4 kb)"
+//config:       bool "beep (2.7 kb)"
 //config:       default y
 //config:       help
 //config:       The beep applets beeps in a given freq/Hz.
diff --git a/miscutils/chat.c b/miscutils/chat.c
index 83aac37de..7daf7a6f6 100644
--- a/miscutils/chat.c
+++ b/miscutils/chat.c
@@ -8,7 +8,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config CHAT
-//config:       bool "chat (6.3 kb)"
+//config:       bool "chat (6.7 kb)"
 //config:       default y
 //config:       help
 //config:       Simple chat utility.
diff --git a/miscutils/crond.c b/miscutils/crond.c
index bd43c6b68..3bbb5ac83 100644
--- a/miscutils/crond.c
+++ b/miscutils/crond.c
@@ -9,7 +9,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config CROND
-//config:       bool "crond (14 kb)"
+//config:       bool "crond (15 kb)"
 //config:       default y
 //config:       select FEATURE_SYSLOG
 //config:       help
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c
index 297693f8c..36b491595 100644
--- a/miscutils/devfsd.c
+++ b/miscutils/devfsd.c
@@ -354,10 +354,10 @@ static const char bb_msg_variable_not_found[] ALIGN1 = "variable: %s not found";
 #define simple_info_logger(p, msg)
 #define msg_logger(p, fmt, args...)
 #define simple_msg_logger(p, msg)
-#define msg_logger_and_die(p, fmt, args...)           exit(EXIT_FAILURE)
-#define simple_msg_logger_and_die(p, msg)             exit(EXIT_FAILURE)
+#define msg_logger_and_die(p, fmt, args...)           exit_FAILURE()
+#define simple_msg_logger_and_die(p, msg)             exit_FAILURE()
 #define error_logger(p, fmt, args...)
-#define error_logger_and_die(p, fmt, args...)         exit(EXIT_FAILURE)
+#define error_logger_and_die(p, fmt, args...)         exit_FAILURE()
 #endif
 
 static void safe_memcpy(char *dest, const char *src, int len)
diff --git a/miscutils/devmem.c b/miscutils/devmem.c
index f21621bd6..015b18f71 100644
--- a/miscutils/devmem.c
+++ b/miscutils/devmem.c
@@ -4,7 +4,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config DEVMEM
-//config:       bool "devmem (2.5 kb)"
+//config:       bool "devmem (2.7 kb)"
 //config:       default y
 //config:       help
 //config:       devmem is a small program that reads and writes from physical
diff --git a/miscutils/hexedit.c b/miscutils/hexedit.c
index 15ad78377..41f26b938 100644
--- a/miscutils/hexedit.c
+++ b/miscutils/hexedit.c
@@ -4,7 +4,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config HEXEDIT
-//config:       bool "hexedit (21 kb)"
+//config:       bool "hexedit (15 kb)"
 //config:       default y
 //config:       help
 //config:       Edit file in hexadecimal.
diff --git a/miscutils/i2c_tools.c b/miscutils/i2c_tools.c
index da26f5e19..5f41a72ec 100644
--- a/miscutils/i2c_tools.c
+++ b/miscutils/i2c_tools.c
@@ -9,31 +9,31 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config I2CGET
-//config:       bool "i2cget (5.5 kb)"
+//config:       bool "i2cget (5.7 kb)"
 //config:       default y
 //config:       help
 //config:       Read from I2C/SMBus chip registers.
 //config:
 //config:config I2CSET
-//config:       bool "i2cset (6.7 kb)"
+//config:       bool "i2cset (6.9 kb)"
 //config:       default y
 //config:       help
 //config:       Set I2C registers.
 //config:
 //config:config I2CDUMP
-//config:       bool "i2cdump (7.1 kb)"
+//config:       bool "i2cdump (7.2 kb)"
 //config:       default y
 //config:       help
 //config:       Examine I2C registers.
 //config:
 //config:config I2CDETECT
-//config:       bool "i2cdetect (7.1 kb)"
+//config:       bool "i2cdetect (7.3 kb)"
 //config:       default y
 //config:       help
 //config:       Detect I2C chips.
 //config:
 //config:config I2CTRANSFER
-//config:       bool "i2ctransfer (4.0 kb)"
+//config:       bool "i2ctransfer (5.5 kb)"
 //config:       default y
 //config:       help
 //config:       Send user-defined I2C messages in one transfer.
@@ -107,6 +107,7 @@ static ALWAYS_INLINE void *itoptr(int i)
         return (void*)(intptr_t)i;
 }
 
+#if ENABLE_I2CGET || ENABLE_I2CSET || ENABLE_I2CDUMP || ENABLE_I2CDETECT
 static int32_t i2c_smbus_access(int fd, char read_write, uint8_t cmd,
                                 int size, union i2c_smbus_data *data)
 {
@@ -120,7 +121,6 @@ static int32_t i2c_smbus_access(int fd, char read_write, uint8_t cmd,
         return ioctl(fd, I2C_SMBUS, &args);
 }
 
-#if ENABLE_I2CGET || ENABLE_I2CSET || ENABLE_I2CDUMP || ENABLE_I2CDETECT
 static int32_t i2c_smbus_read_byte(int fd)
 {
         union i2c_smbus_data data;
diff --git a/miscutils/lsscsi.c b/miscutils/lsscsi.c
index 8f7eda761..9f677ba28 100644
--- a/miscutils/lsscsi.c
+++ b/miscutils/lsscsi.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config LSSCSI
-//config:       bool "lsscsi (2.5 kb)"
+//config:       bool "lsscsi (2.9 kb)"
 //config:       default y
 //config:       help
 //config:       lsscsi is a utility for displaying information about SCSI buses in the
diff --git a/miscutils/makedevs.c b/miscutils/makedevs.c
index 93c550042..48be91875 100644
--- a/miscutils/makedevs.c
+++ b/miscutils/makedevs.c
@@ -7,7 +7,7 @@
  * known bugs: can't deal with alpha ranges
  */
 //config:config MAKEDEVS
-//config:       bool "makedevs (9.2 kb)"
+//config:       bool "makedevs (9.4 kb)"
 //config:       default y
 //config:       help
 //config:       'makedevs' is a utility used to create a batch of devices with
diff --git a/miscutils/microcom.c b/miscutils/microcom.c
index 97b46342f..99db207bf 100644
--- a/miscutils/microcom.c
+++ b/miscutils/microcom.c
@@ -8,7 +8,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config MICROCOM
-//config:       bool "microcom (5.7 kb)"
+//config:       bool "microcom (5.9 kb)"
 //config:       default y
 //config:       help
 //config:       The poor man's minicom utility for chatting with serial port devices.
diff --git a/miscutils/mt.c b/miscutils/mt.c
index 52d5476a1..c781ef545 100644
--- a/miscutils/mt.c
+++ b/miscutils/mt.c
@@ -3,7 +3,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config MT
-//config:       bool "mt (2.5 kb)"
+//config:       bool "mt (2.7 kb)"
 //config:       default y
 //config:       help
 //config:       mt is used to control tape devices. You can use the mt utility
diff --git a/miscutils/nandwrite.c b/miscutils/nandwrite.c
index 52bf49434..6ac92aa1f 100644
--- a/miscutils/nandwrite.c
+++ b/miscutils/nandwrite.c
@@ -8,13 +8,13 @@
  * TODO: add support for large (>4GB) MTD devices
  */
 //config:config NANDWRITE
-//config:       bool "nandwrite (4.8 kb)"
+//config:       bool "nandwrite (5 kb)"
 //config:       default y
 //config:       help
 //config:       Write to the specified MTD device, with bad blocks awareness
 //config:
 //config:config NANDDUMP
-//config:       bool "nanddump (5.2 kb)"
+//config:       bool "nanddump (5.4 kb)"
 //config:       default y
 //config:       help
 //config:       Dump the content of raw NAND chip
diff --git a/miscutils/partprobe.c b/miscutils/partprobe.c
index 0fb1927b7..b21c6241b 100644
--- a/miscutils/partprobe.c
+++ b/miscutils/partprobe.c
@@ -5,7 +5,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config PARTPROBE
-//config:       bool "partprobe (3.5 kb)"
+//config:       bool "partprobe (3.7 kb)"
 //config:       default y
 //config:       help
 //config:       Ask kernel to rescan partition table.
diff --git a/miscutils/raidautorun.c b/miscutils/raidautorun.c
index 905862cf7..8e70b5a51 100644
--- a/miscutils/raidautorun.c
+++ b/miscutils/raidautorun.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config RAIDAUTORUN
-//config:       bool "raidautorun (1.3 kb)"
+//config:       bool "raidautorun (1.6 kb)"
 //config:       default y
 //config:       help
 //config:       raidautorun tells the kernel md driver to
diff --git a/miscutils/readahead.c b/miscutils/readahead.c
index d2bed2092..a9e672617 100644
--- a/miscutils/readahead.c
+++ b/miscutils/readahead.c
@@ -10,7 +10,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config READAHEAD
-//config:       bool "readahead (1.5 kb)"
+//config:       bool "readahead (1.7 kb)"
 //config:       default y
 //config:       depends on LFS
 //config:       help
diff --git a/miscutils/runlevel.c b/miscutils/runlevel.c
index 2f1581ead..7b96a5472 100644
--- a/miscutils/runlevel.c
+++ b/miscutils/runlevel.c
@@ -12,7 +12,7 @@
  * initially busyboxified by Bernhard Reutner-Fischer
  */
 //config:config RUNLEVEL
-//config:       bool "runlevel (559 bytes)"
+//config:       bool "runlevel (837 bytes)"
 //config:       default y
 //config:       depends on FEATURE_UTMP
 //config:       help
diff --git a/miscutils/rx.c b/miscutils/rx.c
index d8b041480..3052bdef7 100644
--- a/miscutils/rx.c
+++ b/miscutils/rx.c
@@ -15,7 +15,7 @@
  * This was originally written for blob and then adapted for busybox.
  */
 //config:config RX
-//config:       bool "rx (2.9 kb)"
+//config:       bool "rx (3.2 kb)"
 //config:       default y
 //config:       help
 //config:       Receive files using the Xmodem protocol.
diff --git a/miscutils/seedrng.c b/miscutils/seedrng.c
index 3bf6e2ea7..7a2331cb1 100644
--- a/miscutils/seedrng.c
+++ b/miscutils/seedrng.c
@@ -20,7 +20,7 @@
  * This is based on code from <https://git.zx2c4.com/seedrng/about/>.
  */
 //config:config SEEDRNG
-//config:       bool "seedrng (1.3 kb)"
+//config:       bool "seedrng (9.1 kb)"
 //config:       default y
 //config:       help
 //config:       Seed the kernel RNG from seed files, meant to be called
diff --git a/miscutils/setfattr.c b/miscutils/setfattr.c
index 9792c2660..10d1840c9 100644
--- a/miscutils/setfattr.c
+++ b/miscutils/setfattr.c
@@ -6,7 +6,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config SETFATTR
-//config:       bool "setfattr (3.7 kb)"
+//config:       bool "setfattr (3.9 kb)"
 //config:       default y
 //config:       help
 //config:       Set/delete extended attributes on files
diff --git a/miscutils/setserial.c b/miscutils/setserial.c
index 2006861e2..5fb93d226 100644
--- a/miscutils/setserial.c
+++ b/miscutils/setserial.c
@@ -8,7 +8,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config SETSERIAL
-//config:       bool "setserial (6.9 kb)"
+//config:       bool "setserial (7.1 kb)"
 //config:       default y
 //config:       help
 //config:       Retrieve or set Linux serial port.
@@ -535,7 +535,7 @@ static int serial_ctl(int fd, int ops, struct serial_struct *serinfo)
         bb_simple_perror_msg(err);
         if (ops & CTL_NODIE)
                 goto nodie;
-        exit(EXIT_FAILURE);
+        exit_FAILURE();
 }
 
 static void print_flag(const char **prefix, const char *flag)
diff --git a/miscutils/strings.c b/miscutils/strings.c
index b01884968..036df5c5d 100644
--- a/miscutils/strings.c
+++ b/miscutils/strings.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config STRINGS
-//config:       bool "strings (4.6 kb)"
+//config:       bool "strings (4.8 kb)"
 //config:       default y
 //config:       help
 //config:       strings prints the printable character sequences for each file
diff --git a/miscutils/time.c b/miscutils/time.c
index ac37a1375..2c71382bf 100644
--- a/miscutils/time.c
+++ b/miscutils/time.c
@@ -10,7 +10,7 @@
  * Heavily modified for busybox by Erik Andersen <andersen@codepoet.org>
  */
 //config:config TIME
-//config:       bool "time (6.8 kb)"
+//config:       bool "time (8.1 kb)"
 //config:       default y
 //config:       help
 //config:       The time command runs the specified program with the given arguments.
diff --git a/miscutils/tree.c b/miscutils/tree.c
index fa55696c6..0b142c85c 100644
--- a/miscutils/tree.c
+++ b/miscutils/tree.c
@@ -5,7 +5,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config TREE
-//config:       bool "tree (0.6 kb)"
+//config:       bool "tree (2.5 kb)"
 //config:       default y
 //config:       help
 //config:       List files and directories in a tree structure.
diff --git a/miscutils/ts.c b/miscutils/ts.c
index af6677fc7..f5e727eb5 100644
--- a/miscutils/ts.c
+++ b/miscutils/ts.c
@@ -4,7 +4,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config TS
-//config:       bool "ts (450 bytes)"
+//config:       bool "ts (4.4 kb)"
 //config:       default y
 
 //applet:IF_TS(APPLET(ts, BB_DIR_USR_BIN, BB_SUID_DROP))
diff --git a/miscutils/ttysize.c b/miscutils/ttysize.c
index d635b29ce..e95936637 100644
--- a/miscutils/ttysize.c
+++ b/miscutils/ttysize.c
@@ -10,7 +10,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config TTYSIZE
-//config:       bool "ttysize (432 bytes)"
+//config:       bool "ttysize (718 bytes)"
 //config:       default y
 //config:       help
 //config:       A replacement for "stty size". Unlike stty, can report only width,
diff --git a/miscutils/ubi_tools.c b/miscutils/ubi_tools.c
index 6d49f61d9..8de444eb2 100644
--- a/miscutils/ubi_tools.c
+++ b/miscutils/ubi_tools.c
@@ -4,37 +4,37 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config UBIATTACH
-//config:       bool "ubiattach (4.2 kb)"
+//config:       bool "ubiattach (4.5 kb)"
 //config:       default y
 //config:       help
 //config:       Attach MTD device to an UBI device.
 //config:
 //config:config UBIDETACH
-//config:       bool "ubidetach (4.1 kb)"
+//config:       bool "ubidetach (4.3 kb)"
 //config:       default y
 //config:       help
 //config:       Detach MTD device from an UBI device.
 //config:
 //config:config UBIMKVOL
-//config:       bool "ubimkvol (5.3 kb)"
+//config:       bool "ubimkvol (5.5 kb)"
 //config:       default y
 //config:       help
 //config:       Create a UBI volume.
 //config:
 //config:config UBIRMVOL
-//config:       bool "ubirmvol (4.9 kb)"
+//config:       bool "ubirmvol (5.1 kb)"
 //config:       default y
 //config:       help
 //config:       Delete a UBI volume.
 //config:
 //config:config UBIRSVOL
-//config:       bool "ubirsvol (4.2 kb)"
+//config:       bool "ubirsvol (4.4 kb)"
 //config:       default y
 //config:       help
 //config:       Resize a UBI volume.
 //config:
 //config:config UBIUPDATEVOL
-//config:       bool "ubiupdatevol (5.2 kb)"
+//config:       bool "ubiupdatevol (5.6 kb)"
 //config:       default y
 //config:       help
 //config:       Update a UBI volume.
diff --git a/miscutils/ubirename.c b/miscutils/ubirename.c
index 06a0adacf..af94354f3 100644
--- a/miscutils/ubirename.c
+++ b/miscutils/ubirename.c
@@ -7,7 +7,7 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 //config:config UBIRENAME
-//config:       bool "ubirename (2.4 kb)"
+//config:       bool "ubirename (2.7 kb)"
 //config:       default y
 //config:       help
 //config:       Utility to rename UBI volumes
diff --git a/miscutils/volname.c b/miscutils/volname.c
index 027d01272..fbf87322d 100644
--- a/miscutils/volname.c
+++ b/miscutils/volname.c
@@ -28,7 +28,7 @@
  * Matthew Stoltenberg <d3matt@gmail.com>
  */
 //config:config VOLNAME
-//config:       bool "volname (1.6 kb)"
+//config:       bool "volname (1.9 kb)"
 //config:       default y
 //config:       help
 //config:       Prints a CD-ROM volume name.
diff --git a/miscutils/watchdog.c b/miscutils/watchdog.c
index 9f5a4b849..db1d27b48 100644
--- a/miscutils/watchdog.c
+++ b/miscutils/watchdog.c
@@ -9,7 +9,7 @@
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 //config:config WATCHDOG
-//config:       bool "watchdog (5.3 kb)"
+//config:       bool "watchdog (5.7 kb)"
 //config:       default y
 //config:       help
 //config:       The watchdog utility is used with hardware or software watchdog