Merge branch 'busybox' into merge

19 files changed, 17 insertions, 45 deletions

diff --git a/miscutils/adjtimex.c b/miscutils/adjtimex.c
index 8ca90d58a..a9de0f9aa 100644
--- a/miscutils/adjtimex.c
+++ b/miscutils/adjtimex.c
@@ -13,7 +13,6 @@
 //config:config ADJTIMEX
 //config:       bool "adjtimex (4.7 kb)"
 //config:       default y
-//config:       select PLATFORM_LINUX
 //config:       help
 //config:       Adjtimex reads and optionally sets adjustment parameters for
 //config:       the Linux clock adjustment algorithm.
diff --git a/miscutils/beep.c b/miscutils/beep.c
index 92faa1cd5..1669332fd 100644
--- a/miscutils/beep.c
+++ b/miscutils/beep.c
@@ -9,7 +9,6 @@
 //config:config BEEP
 //config:       bool "beep (2.4 kb)"
 //config:       default y
-//config:       select PLATFORM_LINUX
 //config:       help
 //config:       The beep applets beeps in a given freq/Hz.
 //config:
diff --git a/miscutils/conspy.c b/miscutils/conspy.c
index a0e0d4e4b..fac11d339 100644
--- a/miscutils/conspy.c
+++ b/miscutils/conspy.c
@@ -12,7 +12,6 @@
 //config:config CONSPY
 //config:       bool "conspy (10 kb)"
 //config:       default y
-//config:       select PLATFORM_LINUX
 //config:       help
 //config:       A text-mode VNC like program for Linux virtual terminals.
 //config:       example:  conspy NUM      shared access to console num
diff --git a/miscutils/crontab.c b/miscutils/crontab.c
index c71d914fc..411a18a50 100644
--- a/miscutils/crontab.c
+++ b/miscutils/crontab.c
@@ -165,8 +165,12 @@ int crontab_main(int argc UNUSED_PARAM, char **argv)
                         close(fd);
                         xlseek(src_fd, 0, SEEK_SET);
                 }
-                close_on_exec_on(src_fd); /* don't want editor to see this fd */
+                close(src_fd);
                 edit_file(pas, tmp_fname);
+                /* The src_fd needs to be reopened to handle editors that do
+                 * save the buffer as new file and rename it to tmp_fname (so
+                 * for example vim). */
+                src_fd = xopen3(tmp_fname, O_RDONLY, 0600);
                 /* fall through */
 
         case 0: /* Replace (no -l, -e, or -r were given) */
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c
index d47ee4d47..17d8fb6b9 100644
--- a/miscutils/devfsd.c
+++ b/miscutils/devfsd.c
@@ -56,7 +56,6 @@
 //config:config DEVFSD
 //config:       bool "devfsd (obsolete)"
 //config:       default n
-//config:       select PLATFORM_LINUX
 //config:       select FEATURE_SYSLOG
 //config:       help
 //config:       This is deprecated and should NOT be used anymore.
@@ -99,7 +98,6 @@
 //config:config FEATURE_DEVFS
 //config:       bool "Use devfs names for all devices (obsolete)"
 //config:       default n
-//config:       select PLATFORM_LINUX
 //config:       help
 //config:       This is obsolete and should NOT be used anymore.
 //config:       Use linux >= 2.6 (optionally with hotplug) and mdev instead!
diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c
index 141957809..2934d8eb7 100644
--- a/miscutils/fbsplash.c
+++ b/miscutils/fbsplash.c
@@ -23,7 +23,6 @@
 //config:config FBSPLASH
 //config:       bool "fbsplash (26 kb)"
 //config:       default y
-//config:       select PLATFORM_LINUX
 //config:       help
 //config:       Shows splash image and progress bar on framebuffer device.
 //config:       Can be used during boot phase of an embedded device.
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c
index beabb1ad5..d25a2466e 100644
--- a/miscutils/hdparm.c
+++ b/miscutils/hdparm.c
@@ -14,7 +14,6 @@
 //config:config HDPARM
 //config:       bool "hdparm (25 kb)"
 //config:       default y
-//config:       select PLATFORM_LINUX
 //config:       help
 //config:       Get/Set hard drive parameters. Primarily intended for ATA
 //config:       drives.
diff --git a/miscutils/i2c_tools.c b/miscutils/i2c_tools.c
index 82a559f74..cc8b99a92 100644
--- a/miscutils/i2c_tools.c
+++ b/miscutils/i2c_tools.c
@@ -11,35 +11,30 @@
 //config:config I2CGET
 //config:       bool "i2cget (5.5 kb)"
 //config:       default y
-//config:       select PLATFORM_LINUX
 //config:       help
 //config:       Read from I2C/SMBus chip registers.
 //config:
 //config:config I2CSET
 //config:       bool "i2cset (6.7 kb)"
 //config:       default y
-//config:       select PLATFORM_LINUX
 //config:       help
 //config:       Set I2C registers.
 //config:
 //config:config I2CDUMP
 //config:       bool "i2cdump (7.1 kb)"
 //config:       default y
-//config:       select PLATFORM_LINUX
 //config:       help
 //config:       Examine I2C registers.
 //config:
 //config:config I2CDETECT
 //config:       bool "i2cdetect (7.1 kb)"
 //config:       default y
-//config:       select PLATFORM_LINUX
 //config:       help
 //config:       Detect I2C chips.
 //config:
 //config:config I2CTRANSFER
 //config:       bool "i2ctransfer (4.0 kb)"
 //config:       default y
-//config:       select PLATFORM_LINUX
 //config:       help
 //config:       Send user-defined I2C messages in one transfer.
 //config:
diff --git a/miscutils/lsscsi.c b/miscutils/lsscsi.c
index f737d33d9..8f7eda761 100644
--- a/miscutils/lsscsi.c
+++ b/miscutils/lsscsi.c
@@ -9,7 +9,6 @@
 //config:config LSSCSI
 //config:       bool "lsscsi (2.5 kb)"
 //config:       default y
-//config:       #select PLATFORM_LINUX
 //config:       help
 //config:       lsscsi is a utility for displaying information about SCSI buses in the
 //config:       system and devices connected to them.
@@ -27,25 +26,21 @@
 
 static const char scsi_dir[] ALIGN1 = "/sys/bus/scsi/devices";
 
-static char *get_line(const char *filename, char *buf, unsigned *bufsize_p)
+static char *get_line(const char *filename, char *buf, char *bufend)
 {
-        unsigned bufsize = *bufsize_p;
-        ssize_t sz;
+        ssize_t sz = bufend - buf - 2; /* -2 for two NULs */
 
-        if ((int)(bufsize - 2) <= 0)
+        if (sz <= 0)
                 return buf;
 
-        sz = open_read_close(filename, buf, bufsize - 2);
+        sz = open_read_close(filename, buf, sz);
         if (sz < 0)
                 sz = 0;
         buf[sz] = '\0';
 
-        sz = (trim(buf) - buf) + 1;
-        bufsize -= sz;
-        buf += sz;
+        buf = trim(buf) + 1;
         buf[0] = '\0';
 
-        *bufsize_p = bufsize;
         return buf;
 }
 
@@ -61,7 +56,6 @@ int lsscsi_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
         while ((de = readdir(dir)) != NULL) {
                 char buf[256];
                 char *ptr;
-                unsigned bufsize;
                 const char *vendor;
                 const char *type_str;
                 const char *type_name;
@@ -76,15 +70,17 @@ int lsscsi_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                 if (chdir(de->d_name) != 0)
                         continue;
 
-                bufsize = sizeof(buf);
                 vendor = buf;
-                ptr = get_line("vendor", buf, &bufsize);
+                ptr = get_line("vendor", buf, buf + sizeof(buf));
+
                 type_str = ptr;
-                ptr = get_line("type", ptr, &bufsize);
+                ptr = get_line("type", ptr, buf + sizeof(buf));
+
                 model = ptr;
-                ptr = get_line("model", ptr, &bufsize);
+                ptr = get_line("model", ptr, buf + sizeof(buf));
+
                 rev = ptr;
-                ptr = get_line("rev", ptr, &bufsize);
+                /*ptr =*/ get_line("rev", ptr, buf + sizeof(buf));
 
                 printf("[%s]\t", de->d_name);
 
diff --git a/miscutils/nandwrite.c b/miscutils/nandwrite.c
index f111c6363..52bf49434 100644
--- a/miscutils/nandwrite.c
+++ b/miscutils/nandwrite.c
@@ -10,14 +10,12 @@
 //config:config NANDWRITE
 //config:       bool "nandwrite (4.8 kb)"
 //config:       default y
-//config:       select PLATFORM_LINUX
 //config:       help
 //config:       Write to the specified MTD device, with bad blocks awareness
 //config:
 //config:config NANDDUMP
 //config:       bool "nanddump (5.2 kb)"
 //config:       default y
-//config:       select PLATFORM_LINUX
 //config:       help
 //config:       Dump the content of raw NAND chip
 
diff --git a/miscutils/partprobe.c b/miscutils/partprobe.c
index 0abed6ff1..0fb1927b7 100644
--- a/miscutils/partprobe.c
+++ b/miscutils/partprobe.c
@@ -7,7 +7,6 @@
 //config:config PARTPROBE
 //config:       bool "partprobe (3.5 kb)"
 //config:       default y
-//config:       select PLATFORM_LINUX
 //config:       help
 //config:       Ask kernel to rescan partition table.
 
diff --git a/miscutils/raidautorun.c b/miscutils/raidautorun.c
index 39816ab1f..905862cf7 100644
--- a/miscutils/raidautorun.c
+++ b/miscutils/raidautorun.c
@@ -9,7 +9,6 @@
 //config:config RAIDAUTORUN
 //config:       bool "raidautorun (1.3 kb)"
 //config:       default y
-//config:       select PLATFORM_LINUX
 //config:       help
 //config:       raidautorun tells the kernel md driver to
 //config:       search and start RAID arrays.
diff --git a/miscutils/readahead.c b/miscutils/readahead.c
index cc0ba5ba3..d2bed2092 100644
--- a/miscutils/readahead.c
+++ b/miscutils/readahead.c
@@ -13,7 +13,6 @@
 //config:       bool "readahead (1.5 kb)"
 //config:       default y
 //config:       depends on LFS
-//config:       select PLATFORM_LINUX
 //config:       help
 //config:       Preload the files listed on the command line into RAM cache so that
 //config:       subsequent reads on these files will not block on disk I/O.
diff --git a/miscutils/rfkill.c b/miscutils/rfkill.c
index db7c83750..9d91ea82f 100644
--- a/miscutils/rfkill.c
+++ b/miscutils/rfkill.c
@@ -9,7 +9,6 @@
 //config:config RFKILL
 //config:       bool "rfkill (4.4 kb)"
 //config:       default n # doesn't build on Ubuntu 9.04
-//config:       select PLATFORM_LINUX
 //config:       help
 //config:       Enable/disable wireless devices.
 //config:
diff --git a/miscutils/rx.c b/miscutils/rx.c
index 319ec1d49..d8b041480 100644
--- a/miscutils/rx.c
+++ b/miscutils/rx.c
@@ -17,7 +17,6 @@
 //config:config RX
 //config:       bool "rx (2.9 kb)"
 //config:       default y
-//config:       select PLATFORM_LINUX
 //config:       help
 //config:       Receive files using the Xmodem protocol.
 
diff --git a/miscutils/setserial.c b/miscutils/setserial.c
index 71b274568..1e75bf433 100644
--- a/miscutils/setserial.c
+++ b/miscutils/setserial.c
@@ -10,7 +10,6 @@
 //config:config SETSERIAL
 //config:       bool "setserial (6.9 kb)"
 //config:       default y
-//config:       select PLATFORM_LINUX
 //config:       help
 //config:       Retrieve or set Linux serial port.
 
diff --git a/miscutils/ubi_tools.c b/miscutils/ubi_tools.c
index 8318df0f9..94a637eee 100644
--- a/miscutils/ubi_tools.c
+++ b/miscutils/ubi_tools.c
@@ -6,42 +6,36 @@
 //config:config UBIATTACH
 //config:       bool "ubiattach (4.2 kb)"
 //config:       default y
-//config:       select PLATFORM_LINUX
 //config:       help
 //config:       Attach MTD device to an UBI device.
 //config:
 //config:config UBIDETACH
 //config:       bool "ubidetach (4.1 kb)"
 //config:       default y
-//config:       select PLATFORM_LINUX
 //config:       help
 //config:       Detach MTD device from an UBI device.
 //config:
 //config:config UBIMKVOL
 //config:       bool "ubimkvol (5.3 kb)"
 //config:       default y
-//config:       select PLATFORM_LINUX
 //config:       help
 //config:       Create a UBI volume.
 //config:
 //config:config UBIRMVOL
 //config:       bool "ubirmvol (4.9 kb)"
 //config:       default y
-//config:       select PLATFORM_LINUX
 //config:       help
 //config:       Delete a UBI volume.
 //config:
 //config:config UBIRSVOL
 //config:       bool "ubirsvol (4.2 kb)"
 //config:       default y
-//config:       select PLATFORM_LINUX
 //config:       help
 //config:       Resize a UBI volume.
 //config:
 //config:config UBIUPDATEVOL
 //config:       bool "ubiupdatevol (5.2 kb)"
 //config:       default y
-//config:       select PLATFORM_LINUX
 //config:       help
 //config:       Update a UBI volume.
 
diff --git a/miscutils/ubirename.c b/miscutils/ubirename.c
index e7c56640c..06a0adacf 100644
--- a/miscutils/ubirename.c
+++ b/miscutils/ubirename.c
@@ -9,7 +9,6 @@
 //config:config UBIRENAME
 //config:       bool "ubirename (2.4 kb)"
 //config:       default y
-//config:       select PLATFORM_LINUX
 //config:       help
 //config:       Utility to rename UBI volumes
 
diff --git a/miscutils/watchdog.c b/miscutils/watchdog.c
index 86600b72f..8c8d7217f 100644
--- a/miscutils/watchdog.c
+++ b/miscutils/watchdog.c
@@ -11,7 +11,6 @@
 //config:config WATCHDOG
 //config:       bool "watchdog (5.3 kb)"
 //config:       default y
-//config:       select PLATFORM_LINUX
 //config:       help
 //config:       The watchdog utility is used with hardware or software watchdog
 //config:       device drivers. It opens the specified watchdog device special file