Merge branch 'busybox' into merge

8 files changed, 58 insertions, 29 deletions

diff --git a/miscutils/bbconfig.c b/miscutils/bbconfig.c
index bcc9caa7c..2151c622c 100644
--- a/miscutils/bbconfig.c
+++ b/miscutils/bbconfig.c
@@ -1,5 +1,6 @@
 /* vi: set sw=4 ts=4: */
-/* This file was released into the public domain by Paul Fox.
+/*
+ * This file was released into the public domain by Paul Fox.
  */
 //config:config BBCONFIG
 //config:       bool "bbconfig (9.7 kb)"
diff --git a/miscutils/devmem.c b/miscutils/devmem.c
index 624054770..51ac3f22f 100644
--- a/miscutils/devmem.c
+++ b/miscutils/devmem.c
@@ -1,7 +1,7 @@
 /*
+ * Copyright (C) 2000, Jan-Derk Bakker (J.D.Bakker@its.tudelft.nl)
+ * Copyright (C) 2008, BusyBox Team. -solar 4/26/08
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
- *  Copyright (C) 2000, Jan-Derk Bakker (J.D.Bakker@its.tudelft.nl)
- *  Copyright (C) 2008, BusyBox Team. -solar 4/26/08
  */
 //config:config DEVMEM
 //config:       bool "devmem (2.5 kb)"
diff --git a/miscutils/flash_eraseall.c b/miscutils/flash_eraseall.c
index a6ce41f27..fab21291c 100644
--- a/miscutils/flash_eraseall.c
+++ b/miscutils/flash_eraseall.c
@@ -1,5 +1,6 @@
 /* vi: set sw=4 ts=4: */
-/* eraseall.c -- erase the whole of a MTD device
+/*
+ * eraseall.c -- erase the whole of a MTD device
  *
  * Ported to busybox from mtd-utils.
  *
diff --git a/miscutils/flash_lock_unlock.c b/miscutils/flash_lock_unlock.c
index 6f2c049f4..12f72efaf 100644
--- a/miscutils/flash_lock_unlock.c
+++ b/miscutils/flash_lock_unlock.c
@@ -1,5 +1,6 @@
 /* vi: set sw=4 ts=4: */
-/* Ported to busybox from mtd-utils.
+/*
+ * Ported to busybox from mtd-utils.
  *
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
diff --git a/miscutils/i2c_tools.c b/miscutils/i2c_tools.c
index fc392d9dc..82f9842bd 100644
--- a/miscutils/i2c_tools.c
+++ b/miscutils/i2c_tools.c
@@ -562,14 +562,19 @@ int i2cset_main(int argc, char **argv)
                               opt_m = (1 << 2), opt_r = (1 << 3);
 
         int bus_num, bus_addr, data_addr, mode = I2C_SMBUS_BYTE, pec = 0;
-        int val, blen = 0, mask = 0, fd, status;
+        int val, blen, mask, fd, status;
         unsigned char block[I2C_SMBUS_BLOCK_MAX];
         char *opt_m_arg = NULL;
         unsigned opts;
 
-        opts = getopt32(argv, "^" "fym:r" "\0" "-3"/*from 3 to ? args*/, &opt_m_arg);
+        opts = getopt32(argv, "^"
+                "fym:r"
+                "\0" "-3", /* minimum 3 args */
+                &opt_m_arg
+        );
         argv += optind;
         argc -= optind;
+        argc--; /* now argv[argc] is last arg */
 
         bus_num = i2c_bus_lookup(argv[0]);
         bus_addr = i2c_parse_bus_addr(argv[1]);
@@ -579,20 +584,26 @@ int i2cset_main(int argc, char **argv)
                 if (!argv[4] && argv[3][0] != 'c') {
                         mode = I2C_SMBUS_BYTE_DATA; /* Implicit b */
                 } else {
-                        switch (argv[argc-1][0]) {
-                        case 'c': /* Already set */                     break;
-                        case 'b': mode = I2C_SMBUS_BYTE_DATA;           break;
-                        case 'w': mode = I2C_SMBUS_WORD_DATA;           break;
-                        case 's': mode = I2C_SMBUS_BLOCK_DATA;          break;
-                        case 'i': mode = I2C_SMBUS_I2C_BLOCK_DATA;      break;
+                        switch (argv[argc][0]) {
+                        case 'c': /* Already set */
+                                break;
+                        case 'b': mode = I2C_SMBUS_BYTE_DATA;
+                                break;
+                        case 'w': mode = I2C_SMBUS_WORD_DATA;
+                                break;
+                        case 's': mode = I2C_SMBUS_BLOCK_DATA;
+                                break;
+                        case 'i': mode = I2C_SMBUS_I2C_BLOCK_DATA;
+                                break;
                         default:
                                 bb_error_msg("invalid mode");
                                 bb_show_usage();
                         }
 
-                        pec = argv[argc-1][1] == 'p';
-                        if (mode == I2C_SMBUS_BLOCK_DATA ||
-                                        mode == I2C_SMBUS_I2C_BLOCK_DATA) {
+                        pec = (argv[argc][1] == 'p');
+                        if (mode == I2C_SMBUS_BLOCK_DATA
+                         || mode == I2C_SMBUS_I2C_BLOCK_DATA
+                        ) {
                                 if (pec && mode == I2C_SMBUS_I2C_BLOCK_DATA)
                                         bb_error_msg_and_die(
                                                 "PEC not supported for I2C "
@@ -606,6 +617,8 @@ int i2cset_main(int argc, char **argv)
         }
 
         /* Prepare the value(s) to be written according to current mode. */
+        mask = 0;
+        blen = 0;
         switch (mode) {
         case I2C_SMBUS_BYTE_DATA:
                 val = xstrtou_range(argv[3], 0, 0, 0xff);
@@ -615,8 +628,9 @@ int i2cset_main(int argc, char **argv)
                 break;
         case I2C_SMBUS_BLOCK_DATA:
         case I2C_SMBUS_I2C_BLOCK_DATA:
-                for (blen = 3; blen < (argc - 1); blen++)
-                        block[blen] = xstrtou_range(argv[blen], 0, 0, 0xff);
+                for (blen = 3; blen < argc; blen++)
+                        block[blen - 3] = xstrtou_range(argv[blen], 0, 0, 0xff);
+                blen -= 3;
                 val = -1;
                 break;
         default:
diff --git a/miscutils/lsscsi.c b/miscutils/lsscsi.c
index d7cd51056..0aaa01ded 100644
--- a/miscutils/lsscsi.c
+++ b/miscutils/lsscsi.c
@@ -25,6 +25,8 @@
 
 #include "libbb.h"
 
+static const char scsi_dir[] ALIGN1 = "/sys/bus/scsi/devices";
+
 static char *get_line(const char *filename, char *buf, unsigned *bufsize_p)
 {
         unsigned bufsize = *bufsize_p;
@@ -53,7 +55,7 @@ int lsscsi_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
         struct dirent *de;
         DIR *dir;
 
-        xchdir("/sys/bus/scsi/devices");
+        xchdir(scsi_dir);
 
         dir = xopendir(".");
         while ((de = readdir(dir)) != NULL) {
@@ -112,7 +114,10 @@ int lsscsi_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
                 );
                 /* TODO: also output device column, e.g. "/dev/sdX" */
 
-                xchdir("..");
+                /* chdir("..") may not work as expected,
+                 * since we might have followed a symlink.
+                 */
+                xchdir(scsi_dir);
         }
 
         if (ENABLE_FEATURE_CLEAN_UP)
diff --git a/miscutils/time.c b/miscutils/time.c
index 65dbcdcf3..61f078755 100644
--- a/miscutils/time.c
+++ b/miscutils/time.c
@@ -1,13 +1,14 @@
 /* vi: set sw=4 ts=4: */
-/* 'time' utility to display resource usage of processes.
-   Copyright (C) 1990, 91, 92, 93, 96 Free Software Foundation, Inc.
-
-   Licensed under GPLv2, see file LICENSE in this source tree.
-*/
+/*
+ * 'time' utility to display resource usage of processes.
+ * Copyright (C) 1990, 91, 92, 93, 96 Free Software Foundation, Inc.
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
 /* Originally written by David Keppel <pardo@cs.washington.edu>.
-   Heavily modified by David MacKenzie <djm@gnu.ai.mit.edu>.
-   Heavily modified for busybox by Erik Andersen <andersen@codepoet.org>
-*/
+ * Heavily modified by David MacKenzie <djm@gnu.ai.mit.edu>.
+ * Heavily modified for busybox by Erik Andersen <andersen@codepoet.org>
+ */
 //config:config TIME
 //config:       bool "time (7 kb)"
 //config:       default y
@@ -441,11 +442,16 @@ int time_main(int argc UNUSED_PARAM, char **argv)
                 output_format = posix_format;
         output_fd = STDERR_FILENO;
         if (opt & OPT_o) {
+#ifndef O_CLOEXEC
+# define O_CLOEXEC 0
+#endif
                 output_fd = xopen(output_filename,
                         (opt & OPT_a) /* append? */
                         ? (O_CREAT | O_WRONLY | O_CLOEXEC | O_APPEND)
                         : (O_CREAT | O_WRONLY | O_CLOEXEC | O_TRUNC)
                 );
+                if (!O_CLOEXEC)
+                        close_on_exec_on(output_fd);
         }
 
         run_command(argv, &res);
diff --git a/miscutils/ubi_tools.c b/miscutils/ubi_tools.c
index 1ef8fd90e..a947abab5 100644
--- a/miscutils/ubi_tools.c
+++ b/miscutils/ubi_tools.c
@@ -1,4 +1,5 @@
-/* Ported to busybox from mtd-utils.
+/*
+ * Ported to busybox from mtd-utils.
  *
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */