42 files changed, 219 insertions, 41 deletions

diff --git a/miscutils/Config.src b/miscutils/Config.src
index cadaabb65..151f61bcc 100644
--- a/miscutils/Config.src
+++ b/miscutils/Config.src
@@ -22,6 +22,20 @@ config BBCONFIG
           The bbconfig applet will print the config file with which
           busybox was built.
 
+config FEATURE_COMPRESS_BBCONFIG
+        bool "Compress bbconfig data"
+        default y
+        depends on BBCONFIG
+        help
+          Store bbconfig data in compressed form, uncompress them on-the-fly
+          before output.
+
+          If you have a really tiny busybox with few applets enabled (and
+          bunzip2 isn't one of them), the overhead of the decompressor might
+          be noticeable. Also, if you run executables directly from ROM
+          and have very little memory, this might not be a win. Otherwise,
+          you probably want this.
+
 config BEEP
         bool "beep"
         default y
diff --git a/miscutils/Kbuild.src b/miscutils/Kbuild.src
index d9bf14312..8c498643b 100644
--- a/miscutils/Kbuild.src
+++ b/miscutils/Kbuild.src
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org>
 #
-# Licensed under the GPL v2, see the file LICENSE in this tarball.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 
 lib-y:=
 
diff --git a/miscutils/adjtimex.c b/miscutils/adjtimex.c
index a6f323ba2..8e8ff8c0a 100644
--- a/miscutils/adjtimex.c
+++ b/miscutils/adjtimex.c
@@ -8,7 +8,7 @@
  *
  * busyboxed 20 March 2001, Larry Doolittle <ldoolitt@recycle.lbl.gov>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 #include "libbb.h"
diff --git a/miscutils/bbconfig.c b/miscutils/bbconfig.c
index 0d649b4e5..286077168 100644
--- a/miscutils/bbconfig.c
+++ b/miscutils/bbconfig.c
@@ -3,10 +3,32 @@
  */
 #include "libbb.h"
 #include "bbconfigopts.h"
+#if ENABLE_FEATURE_COMPRESS_BBCONFIG
+# include "unarchive.h"
+# include "bbconfigopts_bz2.h"
+#endif
 
 int bbconfig_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int bbconfig_main(int argc UNUSED_PARAM, char **argv UNUSED_PARAM)
 {
+#if ENABLE_FEATURE_COMPRESS_BBCONFIG
+        bunzip_data *bd;
+        int i = start_bunzip(&bd,
+                        /* src_fd: */ -1,
+                        /* inbuf:  */ (void *)bbconfig_config_bz2,
+                        /* len:    */ sizeof(bbconfig_config_bz2));
+        /* read_bunzip can longjmp to start_bunzip, and ultimately
+         * end up here with i != 0 on read data errors! Not trivial */
+        if (!i) {
+                /* Cannot use xmalloc: will leak bd in NOFORK case! */
+                char *outbuf = malloc_or_warn(sizeof(bbconfig_config));
+                if (outbuf) {
+                        read_bunzip(bd, outbuf, sizeof(bbconfig_config));
+                        full_write1_str(outbuf);
+                }
+        }
+#else
         full_write1_str(bbconfig_config);
+#endif
         return 0;
 }
diff --git a/miscutils/beep.c b/miscutils/beep.c
index b0ee7ea25..013a72543 100644
--- a/miscutils/beep.c
+++ b/miscutils/beep.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2009 Bernhard Reutner-Fischer
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
  */
 #include "libbb.h"
diff --git a/miscutils/chat.c b/miscutils/chat.c
index 3ffd7b228..2040c3f6a 100644
--- a/miscutils/chat.c
+++ b/miscutils/chat.c
@@ -5,7 +5,7 @@
  *
  * Copyright (C) 2008 by Vladimir Dronnikov <dronnikov@gmail.com>
  *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 #include "libbb.h"
 
diff --git a/miscutils/chrt.c b/miscutils/chrt.c
index d5f87c4d7..c40277b39 100644
--- a/miscutils/chrt.c
+++ b/miscutils/chrt.c
@@ -3,7 +3,7 @@
  * chrt - manipulate real-time attributes of a process
  * Copyright (c) 2006-2007 Bernhard Reutner-Fischer
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 #include <sched.h>
 #include "libbb.h"
diff --git a/miscutils/conspy.c b/miscutils/conspy.c
index 02b13e9c8..01928b35f 100644
--- a/miscutils/conspy.c
+++ b/miscutils/conspy.c
@@ -7,7 +7,7 @@
  * Based on Russell Stuart's conspy.c
  *   http://ace-host.stuart.id.au/russell/files/conspy.c
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 //applet:IF_CONSPY(APPLET(conspy, _BB_DIR_BIN, _BB_SUID_DROP))
diff --git a/miscutils/crond.c b/miscutils/crond.c
index d028eb089..fddddcd8c 100644
--- a/miscutils/crond.c
+++ b/miscutils/crond.c
@@ -8,7 +8,7 @@
  * (version 2.3.2)
  * Vladimir Oleynik <dzo@simtreas.ru> (C) 2002
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 #include "libbb.h"
diff --git a/miscutils/crontab.c b/miscutils/crontab.c
index b8a5abc64..163e15dce 100644
--- a/miscutils/crontab.c
+++ b/miscutils/crontab.c
@@ -7,7 +7,7 @@
  * Copyright 1994 Matthew Dillon (dillon@apollo.west.oic.com)
  * Vladimir Oleynik <dzo@simtreas.ru> (C) 2002
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 #include "libbb.h"
diff --git a/miscutils/dc.c b/miscutils/dc.c
index 767d746e0..777ec1654 100644
--- a/miscutils/dc.c
+++ b/miscutils/dc.c
@@ -1,6 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 #include "libbb.h"
diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c
index 4ccb76d95..8f19288cc 100644
--- a/miscutils/devfsd.c
+++ b/miscutils/devfsd.c
@@ -1,6 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 /*
diff --git a/miscutils/devmem.c b/miscutils/devmem.c
index 39b580840..7a9f533af 100644
--- a/miscutils/devmem.c
+++ b/miscutils/devmem.c
@@ -1,5 +1,5 @@
 /*
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * 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
  */
diff --git a/miscutils/eject.c b/miscutils/eject.c
index a869c6311..63d20d3ad 100644
--- a/miscutils/eject.c
+++ b/miscutils/eject.c
@@ -5,7 +5,7 @@
  * Copyright (C) 2004  Peter Willis <psyphreak@phreaker.net>
  * Copyright (C) 2005  Tito Ragusa <farmatito@tiscali.it>
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 /*
diff --git a/miscutils/fbsplash.c b/miscutils/fbsplash.c
index a031cbd3a..6b84563a3 100644
--- a/miscutils/fbsplash.c
+++ b/miscutils/fbsplash.c
@@ -2,7 +2,7 @@
 /*
  * Copyright (C) 2008 Michele Sanges <michele.sanges@gmail.com>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
  * Usage:
  * - use kernel option 'vga=xxx' or otherwise enable framebuffer device.
diff --git a/miscutils/flash_eraseall.c b/miscutils/flash_eraseall.c
index ca00a130e..53aad3d52 100644
--- a/miscutils/flash_eraseall.c
+++ b/miscutils/flash_eraseall.c
@@ -7,7 +7,7 @@
  *
  * Renamed to flash_eraseall.c
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 #include "libbb.h"
diff --git a/miscutils/flash_lock_unlock.c b/miscutils/flash_lock_unlock.c
index f4e2f73b2..fcb836b07 100644
--- a/miscutils/flash_lock_unlock.c
+++ b/miscutils/flash_lock_unlock.c
@@ -1,7 +1,7 @@
 /* vi: set sw=4 ts=4: */
 /* Ported to busybox from mtd-utils.
  *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 #include "libbb.h"
 #include <mtd/mtd-user.h>
diff --git a/miscutils/flashcp.c b/miscutils/flashcp.c
index 9472c7527..fe37c3913 100644
--- a/miscutils/flashcp.c
+++ b/miscutils/flashcp.c
@@ -4,7 +4,7 @@
  *
  * (C) 2009 Stefan Seyfried <seife@sphairon.com>
  *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
 #include "libbb.h"
diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c
index c6ca3af80..d946c7165 100644
--- a/miscutils/hdparm.c
+++ b/miscutils/hdparm.c
@@ -5,7 +5,7 @@
  * Copyright (C) [2003] by [Matteo Croce] <3297627799@wind.it>
  * Hacked by Tito <farmatito@tiscali.it> for size optimization.
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
  * This program is based on the source code of hdparm: see below...
  * hdparm.c - Command line interface to get/set hard disk parameters
diff --git a/miscutils/inotifyd.c b/miscutils/inotifyd.c
index 271f3ade1..fe429b636 100644
--- a/miscutils/inotifyd.c
+++ b/miscutils/inotifyd.c
@@ -5,7 +5,7 @@
  *
  * Copyright (C) 2008 by Vladimir Dronnikov <dronnikov@gmail.com>
  *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
 /*
diff --git a/miscutils/ionice.c b/miscutils/ionice.c
index 6b791c491..481a738ee 100644
--- a/miscutils/ionice.c
+++ b/miscutils/ionice.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2008 by  <u173034@informatik.uni-oldenburg.de>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 #include <sys/syscall.h>
diff --git a/miscutils/last.c b/miscutils/last.c
index 55c03ae41..888a0a3d1 100644
--- a/miscutils/last.c
+++ b/miscutils/last.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2003-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * Licensed under the GPL version 2, see the file LICENSE in this tarball.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
 #include "libbb.h"
diff --git a/miscutils/last_fancy.c b/miscutils/last_fancy.c
index f3ea0375d..7e69fc281 100644
--- a/miscutils/last_fancy.c
+++ b/miscutils/last_fancy.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2008 by Patricia Muscalu <patricia.muscalu@axis.com>
  *
- * Licensed under the GPLv2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 #include "libbb.h"
diff --git a/miscutils/less.c b/miscutils/less.c
index da2cd07af..d737e4cba 100644
--- a/miscutils/less.c
+++ b/miscutils/less.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2005 by Rob Sullivan <cogito.ergo.cogito@gmail.com>
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 /*
diff --git a/miscutils/makedevs.c b/miscutils/makedevs.c
index 0578d9251..bba7fa61d 100644
--- a/miscutils/makedevs.c
+++ b/miscutils/makedevs.c
@@ -76,7 +76,7 @@ int makedevs_main(int argc, char **argv)
 
 #elif ENABLE_FEATURE_MAKEDEVS_TABLE
 
-/* Licensed under the GPL v2 or later, see the file LICENSE in this tarball. */
+/* Licensed under GPLv2 or later, see file LICENSE in this source tree. */
 
 int makedevs_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int makedevs_main(int argc UNUSED_PARAM, char **argv)
diff --git a/miscutils/man.c b/miscutils/man.c
index a4ff274d4..2d3776cf3 100644
--- a/miscutils/man.c
+++ b/miscutils/man.c
@@ -1,6 +1,6 @@
 /* mini man implementation for busybox
  * Copyright (C) 2008 Denys Vlasenko <vda.linux@googlemail.com>
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
 #include "libbb.h"
diff --git a/miscutils/microcom.c b/miscutils/microcom.c
index 78863d49f..3acbe3023 100644
--- a/miscutils/microcom.c
+++ b/miscutils/microcom.c
@@ -5,7 +5,7 @@
  *
  * Copyright (C) 2008 by Vladimir Dronnikov <dronnikov@gmail.com>
  *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 #include "libbb.h"
 
diff --git a/miscutils/mountpoint.c b/miscutils/mountpoint.c
index a35c38907..784c3cbfc 100644
--- a/miscutils/mountpoint.c
+++ b/miscutils/mountpoint.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2005 Bernhard Reutner-Fischer
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
  * Based on sysvinit's mountpoint
  */
diff --git a/miscutils/mt.c b/miscutils/mt.c
index 8df2b75f7..d19866a5f 100644
--- a/miscutils/mt.c
+++ b/miscutils/mt.c
@@ -1,6 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 #include "libbb.h"
diff --git a/miscutils/nandwrite.c b/miscutils/nandwrite.c
new file mode 100644
index 000000000..f42242687
--- /dev/null
+++ b/miscutils/nandwrite.c
@@ -0,0 +1,142 @@
+/*
+ * nandwrite.c - ported to busybox from mtd-utils
+ *
+ * Author: Baruch Siach <baruch@tkos.co.il>, Orex Computed Radiography
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ *
+ * TODO: add support for large (>4GB) MTD devices
+ */
+
+//applet:IF_NANDWRITE(APPLET(nandwrite, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
+
+//kbuild:lib-$(CONFIG_NANDWRITE) += nandwrite.o
+
+//config:config NANDWRITE
+//config:       bool "nandwrite"
+//config:       default n
+//config:       depends on PLATFORM_LINUX
+//config:       help
+//config:         Write to the specified MTD device, with bad blocks awareness
+
+#include "libbb.h"
+#include <mtd/mtd-user.h>
+
+//usage:#define nandwrite_trivial_usage
+//usage:        "[-p] [-s ADDR] MTD_DEVICE [FILE]"
+//usage:#define nandwrite_full_usage "\n\n"
+//usage:        "Write to the specified MTD device\n"
+//usage:     "\nOptions:"
+//usage:     "\n        -p      Pad to page size"
+//usage:     "\n        -s ADDR Start address"
+
+static unsigned next_good_eraseblock(int fd, struct mtd_info_user *meminfo,
+                unsigned block_offset)
+{
+        while (1) {
+                loff_t offs;
+                if (block_offset >= meminfo->size)
+                        bb_error_msg_and_die("not enough space in MTD device");
+                offs = block_offset;
+                if (xioctl(fd, MEMGETBADBLOCK, &offs) == 0)
+                        return block_offset;
+                /* ioctl returned 1 => "bad block" */
+                printf("Skipping bad block at 0x%08x\n", block_offset);
+                block_offset += meminfo->erasesize;
+        }
+}
+
+int nandwrite_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int nandwrite_main(int argc UNUSED_PARAM, char **argv)
+{
+        unsigned opts;
+        int fd;
+        ssize_t cnt;
+        unsigned mtdoffset, meminfo_writesize, blockstart;
+        struct mtd_info_user meminfo;
+        unsigned char *filebuf;
+        const char *opt_s = "0";
+        enum {
+                OPT_p = (1 << 0),
+                OPT_s = (1 << 1),
+        };
+
+        opt_complementary = "-1:?2";
+        opts = getopt32(argv, "ps:", &opt_s);
+        argv += optind;
+
+        if (argv[1])
+                xmove_fd(xopen_stdin(argv[1]), STDIN_FILENO);
+
+        fd = xopen(argv[0], O_RDWR);
+        xioctl(fd, MEMGETINFO, &meminfo);
+
+        mtdoffset = bb_strtou(opt_s, NULL, 0);
+        if (errno)
+                bb_error_msg_and_die("invalid number '%s'", opt_s);
+
+        /* Pull it into a CPU register (hopefully) - smaller code that way */
+        meminfo_writesize = meminfo.writesize;
+
+        if (mtdoffset & (meminfo_writesize - 1))
+                bb_error_msg_and_die("start address is not page aligned");
+
+        filebuf = xmalloc(meminfo_writesize);
+
+        blockstart = mtdoffset & ~(meminfo.erasesize - 1);
+        if (blockstart != mtdoffset) {
+                unsigned tmp;
+                /* mtdoffset is in the middle of an erase block, verify that
+                 * this block is OK. Advance mtdoffset only if this block is
+                 * bad.
+                 */
+                tmp = next_good_eraseblock(fd, &meminfo, blockstart);
+                if (tmp != blockstart) /* bad block(s), advance mtdoffset */
+                        mtdoffset = tmp;
+        }
+
+        cnt = -1;
+        while (mtdoffset < meminfo.size) {
+                blockstart = mtdoffset & ~(meminfo.erasesize - 1);
+                if (blockstart == mtdoffset) {
+                        /* starting a new eraseblock */
+                        mtdoffset = next_good_eraseblock(fd, &meminfo, blockstart);
+                        printf("Writing at 0x%08x\n", mtdoffset);
+                }
+                /* get some more data from input */
+                cnt = full_read(STDIN_FILENO, filebuf, meminfo_writesize);
+                if (cnt == 0) {
+                        /* even with -p, we do not pad past the end of input
+                         * (-p only zero-pads last incomplete page)
+                         */
+                        break;
+                }
+                if (cnt < meminfo_writesize) {
+                        if (!(opts & OPT_p))
+                                bb_error_msg_and_die("input size is not rounded up to page size, "
+                                                "use -p to zero pad");
+                        /* zero pad to end of write block */
+                        memset(filebuf + cnt, 0, meminfo_writesize - cnt);
+                }
+                xlseek(fd, mtdoffset, SEEK_SET);
+                xwrite(fd, filebuf, meminfo_writesize);
+                mtdoffset += meminfo_writesize;
+                if (cnt < meminfo_writesize)
+                        break;
+        }
+
+        if (cnt != 0) {
+                /* We filled entire MTD, but did we reach EOF on input? */
+                if (full_read(STDIN_FILENO, filebuf, meminfo_writesize) != 0) {
+                        /* no */
+                        bb_error_msg_and_die("not enough space in MTD device");
+                }
+        }
+
+        if (ENABLE_FEATURE_CLEAN_UP) {
+                free(filebuf);
+                close(fd);
+        }
+
+        return EXIT_SUCCESS;
+}
diff --git a/miscutils/raidautorun.c b/miscutils/raidautorun.c
index 113e49ff2..bbfa8577c 100644
--- a/miscutils/raidautorun.c
+++ b/miscutils/raidautorun.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 2006 Bernhard Reutner-Fischer
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
  */
 
diff --git a/miscutils/readahead.c b/miscutils/readahead.c
index e7b75f12f..dd6de7c45 100644
--- a/miscutils/readahead.c
+++ b/miscutils/readahead.c
@@ -7,7 +7,7 @@
  *
  * Copyright (C) 2006  Michael Opdenacker <michael@free-electrons.com>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 #include "libbb.h"
diff --git a/miscutils/rfkill.c b/miscutils/rfkill.c
index 7d8ad1cfc..b150b2cae 100644
--- a/miscutils/rfkill.c
+++ b/miscutils/rfkill.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2010  Malek Degachi <malek-degachi@laposte.net>
 *
-* Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+* Licensed under GPLv2 or later, see file LICENSE in this source tree.
 */
 #include "libbb.h"
 #include <linux/rfkill.h>
diff --git a/miscutils/runlevel.c b/miscutils/runlevel.c
index 83b5a77d4..608e87fe1 100644
--- a/miscutils/runlevel.c
+++ b/miscutils/runlevel.c
@@ -7,7 +7,7 @@
  *              This file is part of the sysvinit suite,
  *              Copyright 1991-1997 Miquel van Smoorenburg.
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
  * initially busyboxified by Bernhard Reutner-Fischer
  */
diff --git a/miscutils/rx.c b/miscutils/rx.c
index 4c5d5a19c..de785d53c 100644
--- a/miscutils/rx.c
+++ b/miscutils/rx.c
@@ -10,7 +10,7 @@
  *
  * Copyright (C) 2001 Hewlett-Packard Laboratories
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  *
  * This was originally written for blob and then adapted for busybox.
  */
diff --git a/miscutils/strings.c b/miscutils/strings.c
index b4c5854cf..40478de40 100644
--- a/miscutils/strings.c
+++ b/miscutils/strings.c
@@ -4,7 +4,7 @@
  *
  * Copyright 2003 Tito Ragusa <farmatito@tiscali.it>
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 #include "libbb.h"
diff --git a/miscutils/taskset.c b/miscutils/taskset.c
index 08198d5d4..389ef43e4 100644
--- a/miscutils/taskset.c
+++ b/miscutils/taskset.c
@@ -3,7 +3,7 @@
  * taskset - retrieve or set a processes' CPU affinity
  * Copyright (c) 2006 Bernhard Reutner-Fischer
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 #include <sched.h>
diff --git a/miscutils/time.c b/miscutils/time.c
index 9facc3657..6b1c3c42c 100644
--- a/miscutils/time.c
+++ b/miscutils/time.c
@@ -2,7 +2,7 @@
 /* 'time' utility to display resource usage of processes.
    Copyright (C) 1990, 91, 92, 93, 96 Free Software Foundation, Inc.
 
-   Licensed under GPL version 2, see file LICENSE in this tarball for details.
+   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>.
diff --git a/miscutils/ttysize.c b/miscutils/ttysize.c
index ca9a2ec8d..f93a506a2 100644
--- a/miscutils/ttysize.c
+++ b/miscutils/ttysize.c
@@ -7,7 +7,7 @@
  *
  * Copyright (C) 2007 by Denys Vlasenko <vda.linux@googlemail.com>
  *
- * Licensed under the GPL v2, see the file LICENSE in this tarball.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 #include "libbb.h"
 
diff --git a/miscutils/ubi_attach_detach.c b/miscutils/ubi_attach_detach.c
index 0d63a10d5..18ffd4df2 100644
--- a/miscutils/ubi_attach_detach.c
+++ b/miscutils/ubi_attach_detach.c
@@ -1,6 +1,6 @@
 /* Ported to busybox from mtd-utils.
  *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
 //applet:IF_UBIATTACH(APPLET_ODDNAME(ubiattach, ubi_attach_detach, _BB_DIR_USR_SBIN, _BB_SUID_DROP, ubiattach))
@@ -63,9 +63,9 @@ int ubi_attach_detach_main(int argc UNUSED_PARAM, char **argv)
         ubi_ctrl = argv[optind];
 
         fd = xopen(ubi_ctrl, O_RDWR);
-        //fstat(fd, &st);
+        //xfstat(fd, &st, ubi_ctrl);
         //if (!S_ISCHR(st.st_mode))
-        //      bb_error_msg_and_die("'%s' is not a char device", ubi_ctrl);
+        //      bb_error_msg_and_die("%s: not a char device", ubi_ctrl);
 
         if (do_attach) {
                 if (!(opts & OPTION_M))
diff --git a/miscutils/wall.c b/miscutils/wall.c
index 2dbab60b4..eecfc166b 100644
--- a/miscutils/wall.c
+++ b/miscutils/wall.c
@@ -3,7 +3,7 @@
  * wall - write a message to all logged-in users
  * Copyright (c) 2009 Bernhard Reutner-Fischer
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 #include "libbb.h"
diff --git a/miscutils/watchdog.c b/miscutils/watchdog.c
index 8e961f0c1..332539658 100644
--- a/miscutils/watchdog.c
+++ b/miscutils/watchdog.c
@@ -6,7 +6,7 @@
  * Copyright (C) 2006  Bernhard Reutner-Fischer <busybox@busybox.net>
  * Copyright (C) 2008  Darius Augulis <augulis.darius@gmail.com>
  *
- * Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 #include "libbb.h"