Merge branch 'origin/master' (early part)

author: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> 2010-09-14 13:57:26 +1000
committer: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> 2010-09-14 13:57:26 +1000
commit: 0c9d2455301ed633826e222aacd930126990913e (patch)
tree: 2353a480f55dfa41d9e6d2fa328af1b60dd3653e
parent: e8db4fe96b3a68b6f971d88084ef2fd2c8513e78 (diff)
parent: 9dc04124d5a3f0c9be249287817a964691e187b0 (diff)
download: busybox-w32-0c9d2455301ed633826e222aacd930126990913e.tar.gz
busybox-w32-0c9d2455301ed633826e222aacd930126990913e.tar.bz2
busybox-w32-0c9d2455301ed633826e222aacd930126990913e.zip
582 files changed, 1502 insertions, 866 deletions
diff --git a/Makefile b/Makefile
index 0a2a3db01..60999dd4b 100644
--- a/Makefile
+++ b/Makefile
@@ -434,7 +434,12 @@ ifeq ($(config-targets),1)
 -include $(srctree)/arch/$(ARCH)/Makefile
 export KBUILD_DEFCONFIG
-config %config: scripts_basic outputmakefile gen_build_files FORCE
+config: scripts_basic outputmakefile gen_build_files FORCE
+        $(Q)mkdir -p include
+        $(Q)$(MAKE) $(build)=scripts/kconfig $@
+        $(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease
+%config: scripts_basic outputmakefile gen_build_files FORCE
        $(Q)mkdir -p include
        $(Q)$(MAKE) $(build)=scripts/kconfig $@
        $(Q)$(MAKE) -C $(srctree) KBUILD_SRC= .kernelrelease
@@ -839,7 +844,7 @@ export CPPFLAGS_busybox.lds += -P -C -U$(ARCH)
 #       Split autoconf.h into include/linux/config/*
 quiet_cmd_gen_bbconfigopts = GEN     include/bbconfigopts.h
-      cmd_gen_bbconfigopts = $(srctree)/scripts/mkconfigs > include/bbconfigopts.h
+      cmd_gen_bbconfigopts = $(srctree)/scripts/mkconfigs include/bbconfigopts.h include/bbconfigopts_bz2.h
 quiet_cmd_split_autoconf   = SPLIT   include/autoconf.h -> include/config/*
      cmd_split_autoconf   = scripts/basic/split-include include/autoconf.h include/config
 #bbox# piggybacked generation of few .h files
@@ -1287,9 +1292,13 @@ endif
        $(Q)$(MAKE) $(build)=$(build-dir) $(target-dir)$(notdir $@)
 # Modules
-/ %/: prepare scripts FORCE
+%/: prepare scripts FORCE
        $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
        $(build)=$(build-dir)
+/: prepare scripts FORCE
+        $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1) \
+        $(build)=$(build-dir)
 %.ko: prepare scripts FORCE
        $(Q)$(MAKE) KBUILD_MODULES=$(if $(CONFIG_MODULES),1)   \
        $(build)=$(build-dir) $(@:.ko=.o)
diff --git a/applets/Kbuild.src b/applets/Kbuild.src
index 31fee8d1e..9b9808f25 100644
--- a/applets/Kbuild.src
+++ b/applets/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.
 obj-y :=
 obj-y += applets.o
diff --git a/applets/applet_tables.c b/applets/applet_tables.c
index f56908420..32dcdb73d 100644
--- a/applets/applet_tables.c
+++ b/applets/applet_tables.c
@@ -5,7 +5,7 @@
 *
 * Copyright (C) 2007 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 <stdlib.h>
diff --git a/applets/applets.c b/applets/applets.c
index 5a7b88e88..98c2b44f5 100644
--- a/applets/applets.c
+++ b/applets/applets.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2007 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 "busybox.h"
diff --git a/applets/individual.c b/applets/individual.c
index 341f4d1c2..1e74e4ce5 100644
--- a/applets/individual.c
+++ b/applets/individual.c
@@ -2,7 +2,7 @@
 *
 * Copyright 2005 Rob Landley <rob@landley.net
 *
- * Licensed under GPL version 2, see file LICENSE in this tarball for details
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 const char *applet_name;
diff --git a/applets/usage.c b/applets/usage.c
index 46adbf475..94520ff66 100644
--- a/applets/usage.c
+++ b/applets/usage.c
@@ -2,7 +2,7 @@
 /*
 * Copyright (C) 2008 Denys Vlasenko.
 *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #include <unistd.h>
 #include <stdlib.h>
diff --git a/applets/usage_pod.c b/applets/usage_pod.c
index 85a2a8ec4..da0baefc6 100644
--- a/applets/usage_pod.c
+++ b/applets/usage_pod.c
@@ -2,7 +2,7 @@
 /*
 * Copyright (C) 2009 Denys Vlasenko.
 *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #include <unistd.h>
 #include <stdint.h>
diff --git a/archival/Config.src b/archival/Config.src
index 9a84fd6c6..81788ecd9 100644
--- a/archival/Config.src
+++ b/archival/Config.src
@@ -194,7 +194,7 @@ config LZOP
          Lzop compression/decompresion.
 config LZOP_COMPR_HIGH
-        bool "lzop complession levels 7,8,9 (not very useful)"
+        bool "lzop compression levels 7,8,9 (not very useful)"
        default n
        depends on LZOP
        help
@@ -206,7 +206,7 @@ config RPM2CPIO
        bool "rpm2cpio"
        default y
        help
-          Converts an RPM file into a CPIO archive.
+          Converts a RPM file into a CPIO archive.
 config RPM
        bool "rpm"
diff --git a/archival/Kbuild.src b/archival/Kbuild.src
index 076e58278..a0edb123d 100644
--- a/archival/Kbuild.src
+++ b/archival/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.
 libs-y                          += libunarchive/
diff --git a/archival/ar.c b/archival/ar.c
index 1b7b66a57..05556c6cb 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -6,7 +6,7 @@
 *
 * Based in part on BusyBox tar, Debian dpkg-deb and GNU ar.
 *
- * 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.
 *
 * Archive creation support:
 * Copyright (C) 2010 Nokia Corporation. All rights reserved.
@@ -123,8 +123,7 @@ static int write_ar_archive(archive_handle_t *handle)
        struct stat st;
        archive_handle_t *out_handle;
-        if (fstat(handle->src_fd, &st) == -1)
+        xfstat(handle->src_fd, &st, handle->ar__name);
-                bb_simple_perror_msg_and_die(handle->ar__name);
        /* if archive exists, create a new handle for output.
         * we create it in place of the old one.
diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index c1259ac46..787f4124d 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -1,8 +1,8 @@
 /* vi: set sw=4 ts=4: */
 /*
- *  Common code for gunzip-like applets
+ * Common code for gunzip-like applets
 *
- *  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"
 #include "unarchive.h"
@@ -165,7 +165,7 @@ char* FAST_FUNC make_new_name_generic(char *filename, const char *expected_ext)
 /*
 * Uncompress applet for busybox (c) 2002 Glenn McGrath
 *
- * 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.
 */
 #if ENABLE_UNCOMPRESS
 static
@@ -206,7 +206,7 @@ int uncompress_main(int argc UNUSED_PARAM, char **argv)
 * General cleanup to better adhere to the style guide and make use of standard
 * busybox functions by Glenn McGrath
 *
- * 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.
 *
 * gzip (GNU zip) -- compress files with zip algorithm and 'compress' interface
 * Copyright (C) 1992-1993 Jean-loup Gailly
@@ -302,7 +302,7 @@ int gunzip_main(int argc UNUSED_PARAM, char **argv)
 * Modified for busybox by Glenn McGrath
 * Added support output to stdout by Thomas Lundquist <thomasez@zelow.no>
 *
- * 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:#define bunzip2_trivial_usage
 //usage:       "[OPTIONS] [FILE]..."
@@ -342,7 +342,7 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
 *
 * Based on bunzip.c from busybox
 *
- * Licensed under GPL v2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #if ENABLE_UNLZMA
 static
diff --git a/archival/cpio.c b/archival/cpio.c
index e0ca7fa5c..7cd8ee8a7 100644
--- a/archival/cpio.c
+++ b/archival/cpio.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2001 by Glenn McGrath
 *
- * 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.
 *
 * Limitations:
 * Doesn't check CRC's
diff --git a/archival/dpkg_deb.c b/archival/dpkg_deb.c
index 45a791bba..4c627e890 100644
--- a/archival/dpkg_deb.c
+++ b/archival/dpkg_deb.c
@@ -2,7 +2,7 @@
 /*
 * dpkg-deb packs, unpacks and provides information about Debian archives.
 *
- * 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"
 #include "unarchive.h"
diff --git a/archival/gzip.c b/archival/gzip.c
index f80754f8b..e9f09730d 100644
--- a/archival/gzip.c
+++ b/archival/gzip.c
@@ -13,7 +13,7 @@
 * files as well as stdin/stdout, and to generally behave itself wrt
 * command line handling.
 *
- * 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.
 */
 /* big objects in bss:
diff --git a/archival/libunarchive/Kbuild.src b/archival/libunarchive/Kbuild.src
index a8549570e..e92b4aad2 100644
--- a/archival/libunarchive/Kbuild.src
+++ b/archival/libunarchive/Kbuild.src
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 #
-# 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.
 lib-y:=
@@ -54,6 +54,7 @@ lib-$(CONFIG_FEATURE_SEAMLESS_BZ2)      += open_transformer.o decompress_bunzip2
 lib-$(CONFIG_FEATURE_SEAMLESS_LZMA)     += open_transformer.o decompress_unlzma.o get_header_tar_lzma.o
 lib-$(CONFIG_FEATURE_SEAMLESS_XZ)       += open_transformer.o decompress_unxz.o
 lib-$(CONFIG_FEATURE_COMPRESS_USAGE)    += decompress_bunzip2.o
+lib-$(CONFIG_FEATURE_COMPRESS_BBCONFIG) += decompress_bunzip2.o
 lib-$(CONFIG_FEATURE_TAR_TO_COMMAND)    += data_extract_to_command.o
 ifneq ($(lib-y),)
diff --git a/archival/libunarchive/data_align.c b/archival/libunarchive/data_align.c
index 0c8542bf5..4e21a36b3 100644
--- a/archival/libunarchive/data_align.c
+++ b/archival/libunarchive/data_align.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/archival/libunarchive/data_extract_all.c b/archival/libunarchive/data_extract_all.c
index 00e67d405..cc549cd78 100644
--- a/archival/libunarchive/data_extract_all.c
+++ b/archival/libunarchive/data_extract_all.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/archival/libunarchive/data_extract_to_command.c b/archival/libunarchive/data_extract_to_command.c
index 95f5bc864..b54f7f215 100644
--- a/archival/libunarchive/data_extract_to_command.c
+++ b/archival/libunarchive/data_extract_to_command.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/archival/libunarchive/data_extract_to_stdout.c b/archival/libunarchive/data_extract_to_stdout.c
index a3efea16d..ce0713ac4 100644
--- a/archival/libunarchive/data_extract_to_stdout.c
+++ b/archival/libunarchive/data_extract_to_stdout.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/archival/libunarchive/data_skip.c b/archival/libunarchive/data_skip.c
index 06d3dced4..06b74399d 100644
--- a/archival/libunarchive/data_skip.c
+++ b/archival/libunarchive/data_skip.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/archival/libunarchive/decompress_bunzip2.c b/archival/libunarchive/decompress_bunzip2.c
index bdbd39ac2..22015683c 100644
--- a/archival/libunarchive/decompress_bunzip2.c
+++ b/archival/libunarchive/decompress_bunzip2.c
@@ -6,7 +6,7 @@
   Peter Fenwick, Alistair Moffat, Radford Neal, Ian H. Witten,
   Robert Sedgewick, and Jon L. Bentley.
-   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/archival/libunarchive/decompress_unlzma.c b/archival/libunarchive/decompress_unlzma.c
index ecda17481..1a3a8f86b 100644
--- a/archival/libunarchive/decompress_unlzma.c
+++ b/archival/libunarchive/decompress_unlzma.c
@@ -6,7 +6,7 @@
 * Based on LzmaDecode.c from the LZMA SDK 4.22 (http://www.7-zip.org/)
 * Copyright (C) 1999-2005  Igor Pavlov
 *
- * 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"
 #include "unarchive.h"
diff --git a/archival/libunarchive/decompress_unxz.c b/archival/libunarchive/decompress_unxz.c
index 721acd907..faba9ca82 100644
--- a/archival/libunarchive/decompress_unxz.c
+++ b/archival/libunarchive/decompress_unxz.c
@@ -7,7 +7,7 @@
 *
 * This file is:
 * Copyright (C) 2010 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"
 #include "unarchive.h"
diff --git a/archival/libunarchive/decompress_unzip.c b/archival/libunarchive/decompress_unzip.c
index bccd0262e..20fda9d26 100644
--- a/archival/libunarchive/decompress_unzip.c
+++ b/archival/libunarchive/decompress_unzip.c
@@ -30,7 +30,7 @@
 *
 * See the file algorithm.doc for the compression algorithms and file formats.
 *
- * 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 <setjmp.h>
diff --git a/archival/libunarchive/filter_accept_all.c b/archival/libunarchive/filter_accept_all.c
index 21f9c5c9e..cb1f506c8 100644
--- a/archival/libunarchive/filter_accept_all.c
+++ b/archival/libunarchive/filter_accept_all.c
@@ -2,7 +2,7 @@
 /*
 * Copyright (C) 2002 by Glenn McGrath
 *
- * 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/archival/libunarchive/filter_accept_list.c b/archival/libunarchive/filter_accept_list.c
index afa0b4cbf..fe4414c85 100644
--- a/archival/libunarchive/filter_accept_list.c
+++ b/archival/libunarchive/filter_accept_list.c
@@ -2,7 +2,7 @@
 /*
 * Copyright (C) 2002 by Glenn McGrath
 *
- * 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/archival/libunarchive/filter_accept_list_reassign.c b/archival/libunarchive/filter_accept_list_reassign.c
index 060a2c72b..891f58390 100644
--- a/archival/libunarchive/filter_accept_list_reassign.c
+++ b/archival/libunarchive/filter_accept_list_reassign.c
@@ -2,7 +2,7 @@
 /*
 *  Copyright (C) 2002 by Glenn McGrath
 *
- * 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/archival/libunarchive/filter_accept_reject_list.c b/archival/libunarchive/filter_accept_reject_list.c
index aa601e137..89a5502d5 100644
--- a/archival/libunarchive/filter_accept_reject_list.c
+++ b/archival/libunarchive/filter_accept_reject_list.c
@@ -2,7 +2,7 @@
 /*
 * Copyright (C) 2002 by Glenn McGrath
 *
- * 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/archival/libunarchive/find_list_entry.c b/archival/libunarchive/find_list_entry.c
index bc7bc6471..5c0c85f09 100644
--- a/archival/libunarchive/find_list_entry.c
+++ b/archival/libunarchive/find_list_entry.c
@@ -2,7 +2,7 @@
 /*
 * Copyright (C) 2002 by Glenn McGrath
 *
- * 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 <fnmatch.h>
diff --git a/archival/libunarchive/get_header_ar.c b/archival/libunarchive/get_header_ar.c
index dbc5ec004..6bfc6bc27 100644
--- a/archival/libunarchive/get_header_ar.c
+++ b/archival/libunarchive/get_header_ar.c
@@ -1,7 +1,7 @@
 /* vi: set sw=4 ts=4: */
 /* Copyright 2001 Glenn McGrath.
 *
- * 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/archival/libunarchive/get_header_cpio.c b/archival/libunarchive/get_header_cpio.c
index 4507d538b..8cd1096ba 100644
--- a/archival/libunarchive/get_header_cpio.c
+++ b/archival/libunarchive/get_header_cpio.c
@@ -1,7 +1,7 @@
 /* vi: set sw=4 ts=4: */
 /* Copyright 2002 Laurence Anderson
 *
- * 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/archival/libunarchive/get_header_tar.c b/archival/libunarchive/get_header_tar.c
index d5c92359c..cf6487207 100644
--- a/archival/libunarchive/get_header_tar.c
+++ b/archival/libunarchive/get_header_tar.c
@@ -1,14 +1,14 @@
 /* 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.
 *
- *  FIXME:
+ * FIXME:
 *    In privileged mode if uname and gname map to a uid and gid then use the
 *    mapped value instead of the uid/gid values in tar header
 *
- *  References:
+ * References:
 *    GNU tar and star man pages,
 *    Opengroup's ustar interchange format,
- *      http://www.opengroup.org/onlinepubs/007904975/utilities/pax.html
+ *    http://www.opengroup.org/onlinepubs/007904975/utilities/pax.html
 */
 #include "libbb.h"
diff --git a/archival/libunarchive/get_header_tar_bz2.c b/archival/libunarchive/get_header_tar_bz2.c
index 615bbba4a..4ffc17086 100644
--- a/archival/libunarchive/get_header_tar_bz2.c
+++ b/archival/libunarchive/get_header_tar_bz2.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/archival/libunarchive/get_header_tar_gz.c b/archival/libunarchive/get_header_tar_gz.c
index e88b720a8..a9af22e0e 100644
--- a/archival/libunarchive/get_header_tar_gz.c
+++ b/archival/libunarchive/get_header_tar_gz.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/archival/libunarchive/get_header_tar_lzma.c b/archival/libunarchive/get_header_tar_lzma.c
index 03b1b792d..9876b3827 100644
--- a/archival/libunarchive/get_header_tar_lzma.c
+++ b/archival/libunarchive/get_header_tar_lzma.c
@@ -3,7 +3,7 @@
 * Small lzma deflate implementation.
 * Copyright (C) 2006  Aurelien Jacobs <aurel@gnuage.org>
 *
- * Licensed under GPL v2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #include "libbb.h"
diff --git a/archival/libunarchive/header_list.c b/archival/libunarchive/header_list.c
index b1c425aca..902d6ebe0 100644
--- a/archival/libunarchive/header_list.c
+++ b/archival/libunarchive/header_list.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"
 #include "unarchive.h"
diff --git a/archival/libunarchive/header_skip.c b/archival/libunarchive/header_skip.c
index a97a9ce80..2af36ac9c 100644
--- a/archival/libunarchive/header_skip.c
+++ b/archival/libunarchive/header_skip.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"
 #include "unarchive.h"
diff --git a/archival/libunarchive/header_verbose_list.c b/archival/libunarchive/header_verbose_list.c
index 3319e63a9..d863e6a29 100644
--- a/archival/libunarchive/header_verbose_list.c
+++ b/archival/libunarchive/header_verbose_list.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/archival/libunarchive/init_handle.c b/archival/libunarchive/init_handle.c
index ff7d484e5..de7021f78 100644
--- a/archival/libunarchive/init_handle.c
+++ b/archival/libunarchive/init_handle.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/archival/libunarchive/open_transformer.c b/archival/libunarchive/open_transformer.c
index cba049f1f..ed6a556bb 100644
--- a/archival/libunarchive/open_transformer.c
+++ b/archival/libunarchive/open_transformer.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/archival/libunarchive/seek_by_jump.c b/archival/libunarchive/seek_by_jump.c
index 7181cb3ce..bda55e1b1 100644
--- a/archival/libunarchive/seek_by_jump.c
+++ b/archival/libunarchive/seek_by_jump.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/archival/libunarchive/seek_by_read.c b/archival/libunarchive/seek_by_read.c
index af65e5d85..25b31365d 100644
--- a/archival/libunarchive/seek_by_read.c
+++ b/archival/libunarchive/seek_by_read.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/archival/libunarchive/unpack_ar_archive.c b/archival/libunarchive/unpack_ar_archive.c
index 300d10e48..4f68ba3d8 100644
--- a/archival/libunarchive/unpack_ar_archive.c
+++ b/archival/libunarchive/unpack_ar_archive.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/archival/rpm.c b/archival/rpm.c
index 38ec20ef5..7b316a5b8 100644
--- a/archival/rpm.c
+++ b/archival/rpm.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2001,2002 by Laurence Anderson
 *
- * 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/archival/rpm.h b/archival/rpm.h
index f7c6fc2fa..afe2b550c 100644
--- a/archival/rpm.h
+++ b/archival/rpm.h
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2001 by Laurence Anderson
 *
- * 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.
 */
 /* RPM file starts with this struct: */
diff --git a/archival/rpm2cpio.c b/archival/rpm2cpio.c
index 5bc50b88f..70021d539 100644
--- a/archival/rpm2cpio.c
+++ b/archival/rpm2cpio.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2001 by Laurence Anderson
 *
- * 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"
 #include "unarchive.h"
diff --git a/archival/tar.c b/archival/tar.c
index 5ddff7fa5..2176ad2ac 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -15,12 +15,12 @@
 *  Copyright (c) 1999 by David I. Bell
 *  Permission is granted to use, distribute, or modify this source,
 *  provided that this copyright notice remains intact.
- *  Permission to distribute sash derived code under the GPL has been granted.
+ *  Permission to distribute sash derived code under GPL has been granted.
 *
 * Based in part on the tar implementation from busybox-0.28
 *  Copyright (C) 1995 Bruce Perens
 *
- * 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 <fnmatch.h>
@@ -572,8 +572,7 @@ static NOINLINE int writeTarFile(int tar_fd, int verboseFlag,
        /* Store the stat info for the tarball's file, so
         * can avoid including the tarball into itself....  */
-        if (fstat(tbInfo.tarFd, &tbInfo.tarFileStatBuf) < 0)
+        xfstat(tbInfo.tarFd, &tbInfo.tarFileStatBuf, "can't stat tar file");
-                bb_perror_msg_and_die("can't stat tar file");
 #if ENABLE_FEATURE_SEAMLESS_GZ || ENABLE_FEATURE_SEAMLESS_BZ2
        if (gzip)
diff --git a/archival/unzip.c b/archival/unzip.c
index d9705a56e..204e34952 100644
--- a/archival/unzip.c
+++ b/archival/unzip.c
@@ -7,7 +7,7 @@
 * Loosely based on original busybox unzip applet by Laurence Anderson.
 * All options and features should work in this version.
 *
- * 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.
 */
 /* For reference see
diff --git a/console-tools/Kbuild.src b/console-tools/Kbuild.src
index 17f660638..94de9ad9f 100644
--- a/console-tools/Kbuild.src
+++ b/console-tools/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/console-tools/chvt.c b/console-tools/chvt.c
index 977c26905..07e58c3b8 100644
--- a/console-tools/chvt.c
+++ b/console-tools/chvt.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 *
- * 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/console-tools/clear.c b/console-tools/clear.c
index cac716394..dcb9bfb02 100644
--- a/console-tools/clear.c
+++ b/console-tools/clear.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 *
- * 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/console-tools/deallocvt.c b/console-tools/deallocvt.c
index 09748834f..6a1d13d14 100644
--- a/console-tools/deallocvt.c
+++ b/console-tools/deallocvt.c
@@ -5,7 +5,7 @@
 * Copyright (C) 2003 by Tito Ragusa <farmatito@tiscali.it>
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 *
- * 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.
 */
 /* no options, no getopt */
diff --git a/console-tools/dumpkmap.c b/console-tools/dumpkmap.c
index a03b59340..301a90674 100644
--- a/console-tools/dumpkmap.c
+++ b/console-tools/dumpkmap.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) Arne Bernin <arne@matrix.loopback.org>
 *
- * 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.
 *
 */
 /* no options, no getopt */
diff --git a/console-tools/fgconsole.c b/console-tools/fgconsole.c
index 75fd98fd5..e2dba4860 100644
--- a/console-tools/fgconsole.c
+++ b/console-tools/fgconsole.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2010 by Grigory Batalov <bga@altlinux.org>
 *
- * 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/console-tools/kbd_mode.c b/console-tools/kbd_mode.c
index e1d85231c..14f2ae516 100644
--- a/console-tools/kbd_mode.c
+++ b/console-tools/kbd_mode.c
@@ -6,7 +6,7 @@
 *   written using Andries Brouwer <aeb@cwi.nl>'s kbd_mode from
 *   console-utils v0.2.3, licensed under GNU GPLv2
 *
- * 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"
 #include <linux/kd.h>
diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c
index e51142c8e..3c77813b5 100644
--- a/console-tools/loadfont.c
+++ b/console-tools/loadfont.c
@@ -7,7 +7,7 @@
 * Loads the console font, and possibly the corresponding screen map(s).
 * (Adapted for busybox by Matej Vela.)
 *
- * 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 <sys/kd.h>
diff --git a/console-tools/loadkmap.c b/console-tools/loadkmap.c
index 8f1a9153a..2d1c9e284 100644
--- a/console-tools/loadkmap.c
+++ b/console-tools/loadkmap.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 1998 Enrique Zanardi <ezanardi@ull.es>
 *
- * 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/console-tools/openvt.c b/console-tools/openvt.c
index e3ea71bc5..6e0b589a0 100644
--- a/console-tools/openvt.c
+++ b/console-tools/openvt.c
@@ -5,7 +5,7 @@
 *  busyboxed by Quy Tonthat <quy@signal3.com>
 *  hacked by Tito <farmatito@tiscali.it>
 *
- * 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 <linux/vt.h>
diff --git a/console-tools/reset.c b/console-tools/reset.c
index f0ea5cb20..7dffdea18 100644
--- a/console-tools/reset.c
+++ b/console-tools/reset.c
@@ -5,7 +5,7 @@
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 * Written by Erik Andersen and Kent Robotti <robotti@metconnect.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/console-tools/resize.c b/console-tools/resize.c
index 828b5bb42..12e50a116 100644
--- a/console-tools/resize.c
+++ b/console-tools/resize.c
@@ -4,7 +4,7 @@
 *
 * Copyright 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.
 */
 /* no options, no getopt */
 #include "libbb.h"
diff --git a/console-tools/setconsole.c b/console-tools/setconsole.c
index 8ad9948dd..87265baf8 100644
--- a/console-tools/setconsole.c
+++ b/console-tools/setconsole.c
@@ -5,7 +5,7 @@
 *  Copyright (C) 2004,2005  Enrik Berkhan <Enrik.Berkhan@inka.de>
 *  Copyright (C) 2008 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/console-tools/setkeycodes.c b/console-tools/setkeycodes.c
index b6a9a32af..ca8cd21c2 100644
--- a/console-tools/setkeycodes.c
+++ b/console-tools/setkeycodes.c
@@ -6,7 +6,7 @@
 *
 * Adjusted for BusyBox by Erik Andersen <andersen@codepoet.org>
 *
- * 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/console-tools/setlogcons.c b/console-tools/setlogcons.c
index dd44591a3..52d2608aa 100644
--- a/console-tools/setlogcons.c
+++ b/console-tools/setlogcons.c
@@ -6,7 +6,7 @@
 *
 * Based on setlogcons (kbd-1.12) by Andries E. Brouwer
 *
- * 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/console-tools/showkey.c b/console-tools/showkey.c
index 681114df7..149ea6465 100644
--- a/console-tools/showkey.c
+++ b/console-tools/showkey.c
@@ -4,7 +4,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"
@@ -13,21 +13,19 @@
 // set raw tty mode
 // also used by microcom
 // libbb candidates?
-static void xget1(int fd, struct termios *t, struct termios *oldt)
+static void xget1(struct termios *t, struct termios *oldt)
 {
-        tcgetattr(fd, oldt);
+        tcgetattr(STDIN_FILENO, oldt);
        *t = *oldt;
        cfmakeraw(t);
 }
-static int xset1(int fd, struct termios *tio, const char *device)
+static void xset1(struct termios *tio)
 {
-        int ret = tcsetattr(fd, TCSAFLUSH, tio);
+        int ret = tcsetattr(STDIN_FILENO, TCSAFLUSH, tio);
        if (ret) {
-                bb_perror_msg("can't tcsetattr for %s", device);
+                bb_perror_msg("can't tcsetattr for stdin");
        }
-        return ret;
 }
 /*
@@ -49,7 +47,7 @@ struct globals {
 static void signal_handler(int signo)
 {
        // restore keyboard and console settings
-        xset1(STDIN_FILENO, &tio0, "stdin");
+        xset1(&tio0);
        xioctl(STDIN_FILENO, KDSKBMODE, (void *)(ptrdiff_t)kbmode);
        // alarmed? -> exit 0
        exit(SIGALRM == signo);
@@ -79,15 +77,15 @@ int showkey_main(int argc UNUSED_PARAM, char **argv)
                , (option_mask32 & OPT_a) ? "when CTRL+D pressed" : "10s after last keypress"
        );
        // prepare for raw mode
-        xget1(STDIN_FILENO, &tio, &tio0);
+        xget1(&tio, &tio0);
        // put stdin in raw mode
-        xset1(STDIN_FILENO, &tio, "stdin");
+        xset1(&tio);
        if (option_mask32 & OPT_a) {
-                char c;
+                unsigned char c;
                // just read stdin char by char
                while (1 == safe_read(STDIN_FILENO, &c, 1)) {
-                        printf("%3d 0%03o 0x%02x\r\n", c, c, c);
+                        printf("%3u 0%03o 0x%02x\r\n", c, c, c);
                        if (04 /*CTRL-D*/ == c)
                                break;
                }
@@ -114,16 +112,18 @@ int showkey_main(int argc UNUSED_PARAM, char **argv)
                                // show interpreted scancodes (default) ? ->
                                } else {
                                        int kc;
-                                        if (i+2 < n && (c & 0x7f) == 0
+                                        if (i+2 < n
-                                                && (buf[i+1] & 0x80) != 0
+                                         && (c & 0x7f) == 0
-                                                && (buf[i+2] & 0x80) != 0) {
+                                         && (buf[i+1] & 0x80) != 0
+                                         && (buf[i+2] & 0x80) != 0
+                                        ) {
                                                kc = ((buf[i+1] & 0x7f) << 7) | (buf[i+2] & 0x7f);
                                                i += 3;
                                        } else {
                                                kc = (c & 0x7f);
                                                i++;
                                        }
-                                        printf("keycode %3d %s", kc, (c & 0x80) ? "release" : "press");
+                                        printf("keycode %3u %s", kc, (c & 0x80) ? "release" : "press");
                                }
                        }
                        puts("\r");
diff --git a/coreutils/Kbuild.src b/coreutils/Kbuild.src
index 1c846a75f..630b048df 100644
--- a/coreutils/Kbuild.src
+++ b/coreutils/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.
 libs-y                  += libcoreutils/
diff --git a/coreutils/basename.c b/coreutils/basename.c
index b79d561c2..d44124741 100644
--- a/coreutils/basename.c
+++ b/coreutils/basename.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 *
- * 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.
 */
 /* Mar 16, 2003      Manuel Novoa III   (mjn3@codepoet.org)
diff --git a/coreutils/cal.c b/coreutils/cal.c
index c98229cb0..ef5dbeadb 100644
--- a/coreutils/cal.c
+++ b/coreutils/cal.c
@@ -4,7 +4,7 @@
 *
 * See original copyright at the end of this file
 *
- * 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.
 */
 /* BB_AUDIT SUSv3 compliant with -j and -y extensions (from util-linux). */
diff --git a/coreutils/cat.c b/coreutils/cat.c
index 454c46b68..922549828 100644
--- a/coreutils/cat.c
+++ b/coreutils/cat.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
 *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 /* BB_AUDIT SUSv3 compliant */
diff --git a/coreutils/catv.c b/coreutils/catv.c
index ff3139c80..f92d93d24 100644
--- a/coreutils/catv.c
+++ b/coreutils/catv.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2006 Rob Landley <rob@landley.net>
 *
- * 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.
 */
 /* See "Cat -v considered harmful" at
diff --git a/coreutils/chgrp.c b/coreutils/chgrp.c
index 7f3904805..58f78e736 100644
--- a/coreutils/chgrp.c
+++ b/coreutils/chgrp.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 *
- * 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.
 */
 /* BB_AUDIT SUSv3 defects - none? */
diff --git a/coreutils/chmod.c b/coreutils/chmod.c
index c04201eec..f07a49bd3 100644
--- a/coreutils/chmod.c
+++ b/coreutils/chmod.c
@@ -7,7 +7,7 @@
 * Reworked by (C) 2002 Vladimir Oleynik <dzo@simtreas.ru>
 *  to correctly parse '-rwxgoa'
 *
- * 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.
 */
 /* BB_AUDIT SUSv3 compliant */
diff --git a/coreutils/chown.c b/coreutils/chown.c
index 717e4b17a..282deccfb 100644
--- a/coreutils/chown.c
+++ b/coreutils/chown.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 *
- * 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.
 */
 /* BB_AUDIT SUSv3 defects - none? */
diff --git a/coreutils/chroot.c b/coreutils/chroot.c
index 046c2fabf..b80a12ee0 100644
--- a/coreutils/chroot.c
+++ b/coreutils/chroot.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 *
- * 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.
 */
 /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
diff --git a/coreutils/cksum.c b/coreutils/cksum.c
index 8e65b1ca3..8e7800ee9 100644
--- a/coreutils/cksum.c
+++ b/coreutils/cksum.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2006 by Rob Sullivan, with ideas from code by Walter Harms
 *
- * 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/coreutils/comm.c b/coreutils/comm.c
index 221cbfbcc..c04da1896 100644
--- a/coreutils/comm.c
+++ b/coreutils/comm.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2005 by Robert Sullivan <cogito.ergo.cogito@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.
 */
 #include "libbb.h"
diff --git a/coreutils/cp.c b/coreutils/cp.c
index d7c8d91cc..ab17b39a6 100644
--- a/coreutils/cp.c
+++ b/coreutils/cp.c
@@ -5,7 +5,7 @@
 * Copyright (C) 2000 by Matt Kraai <kraai@alumni.carnegiemellon.edu>
 * SELinux support by Yuichi Nakamura <ynakam@hitachisoft.jp>
 *
- * Licensed under GPL v2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
 */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/cp.html */
diff --git a/coreutils/cut.c b/coreutils/cut.c
index b7a3cfabb..38cd32c77 100644
--- a/coreutils/cut.c
+++ b/coreutils/cut.c
@@ -6,7 +6,7 @@
 * Written by Mark Whitley <markw@codepoet.org>
 * debloated by 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/coreutils/date.c b/coreutils/date.c
index 3ce352c8d..c9dfedf81 100644
--- a/coreutils/date.c
+++ b/coreutils/date.c
@@ -7,7 +7,7 @@
 * iso-format handling added by Robert Griebl <griebl@gmx.de>
 * bugfixes and cleanup by 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.
 */
 /* This 'date' command supports only 2 time setting formats,
diff --git a/coreutils/dd.c b/coreutils/dd.c
index eb9f8885f..c22a39da7 100644
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@@ -5,7 +5,7 @@
 *
 * Copyright (C) 2000,2001  Matt Kraai
 *
- * 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/coreutils/df.c b/coreutils/df.c
index 5eeb5b476..af9b77b23 100644
--- a/coreutils/df.c
+++ b/coreutils/df.c
@@ -5,7 +5,7 @@
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 * based on original code by (I think) Bruce Perens <bruce@pixar.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.
 */
 /* BB_AUDIT SUSv3 _NOT_ compliant -- option -t missing. */
diff --git a/coreutils/dirname.c b/coreutils/dirname.c
index 94c22a7ee..246946ed0 100644
--- a/coreutils/dirname.c
+++ b/coreutils/dirname.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 *
- * 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.
 */
 /* BB_AUDIT SUSv3 compliant */
diff --git a/coreutils/dos2unix.c b/coreutils/dos2unix.c
index 98eaec172..ef1ea4328 100644
--- a/coreutils/dos2unix.c
+++ b/coreutils/dos2unix.c
@@ -9,7 +9,7 @@
 *
 * dos2unix filters reading input from stdin and writing output to stdout.
 *
- * 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/coreutils/du.c b/coreutils/du.c
index 5894ed438..cc3c78433 100644
--- a/coreutils/du.c
+++ b/coreutils/du.c
@@ -6,7 +6,7 @@
 * Copyright (C) 1999,2000,2001 by John Beppu <beppu@codepoet.org>
 * Copyright (C) 2002  Edward Betts <edward@debian.org>
 *
- * 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.
 */
 /* BB_AUDIT SUSv3 compliant (unless default blocksize set to 1k) */
diff --git a/coreutils/echo.c b/coreutils/echo.c
index 69039969b..3821e594e 100644
--- a/coreutils/echo.c
+++ b/coreutils/echo.c
@@ -5,7 +5,7 @@
 * Copyright (c) 1991, 1993
 *      The Regents of the University of California.  All rights reserved.
 *
- * 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.
 *
 * Original copyright notice is retained at the end of this file.
 */
diff --git a/coreutils/env.c b/coreutils/env.c
index d4eab191b..f50ee7869 100644
--- a/coreutils/env.c
+++ b/coreutils/env.c
@@ -5,7 +5,7 @@
 * Copyright (c) 1988, 1993, 1994
 *      The Regents of the University of California.  All rights reserved.
 *
- * 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.
 *
 * Original copyright notice is retained at the end of this file.
 *
diff --git a/coreutils/expand.c b/coreutils/expand.c
index b874b6ad4..7491b717a 100644
--- a/coreutils/expand.c
+++ b/coreutils/expand.c
@@ -3,7 +3,7 @@
 *
 * Copyright (C) 89, 91, 1995-2006 Free Software Foundation, Inc.
 *
- * 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.
 *
 * David MacKenzie <djm@gnu.ai.mit.edu>
 *
diff --git a/coreutils/expr.c b/coreutils/expr.c
index 8988340f1..04d783f2b 100644
--- a/coreutils/expr.c
+++ b/coreutils/expr.c
@@ -11,7 +11,7 @@
 *  - reduced 464 bytes.
 *  - 64 math support
 *
- * 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 program evaluates expressions.  Each token (operator, operand,
diff --git a/coreutils/false.c b/coreutils/false.c
index f448ebf72..033d2bff4 100644
--- a/coreutils/false.c
+++ b/coreutils/false.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 *
- * 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.
 */
 /* BB_AUDIT SUSv3 compliant */
diff --git a/coreutils/fold.c b/coreutils/fold.c
index cbea31fad..54f1aa2ac 100644
--- a/coreutils/fold.c
+++ b/coreutils/fold.c
@@ -7,7 +7,7 @@
   Modified for busybox based on coreutils v 5.0
   Copyright (C) 2003 Glenn McGrath
-   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 "unicode.h"
diff --git a/coreutils/fsync.c b/coreutils/fsync.c
index 53900f8d2..d1fe2b584 100644
--- a/coreutils/fsync.c
+++ b/coreutils/fsync.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2008 Nokia Corporation. All rights reserved.
 *
- * 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"
 #ifndef O_NOATIME
diff --git a/coreutils/head.c b/coreutils/head.c
index cc2837411..0845b4375 100644
--- a/coreutils/head.c
+++ b/coreutils/head.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
 *
- * 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.
 */
 /* BB_AUDIT SUSv3 compliant */
diff --git a/coreutils/hostid.c b/coreutils/hostid.c
index a537e3ad6..635e48e12 100644
--- a/coreutils/hostid.c
+++ b/coreutils/hostid.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2000  Edward Betts <edward@debian.org>.
 *
- * 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.
 */
 /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
diff --git a/coreutils/id.c b/coreutils/id.c
index ec9227d06..56286f4d4 100644
--- a/coreutils/id.c
+++ b/coreutils/id.c
@@ -5,7 +5,7 @@
 * Copyright (C) 2000 by Randolph Chung <tausq@debian.org>
 * Copyright (C) 2008 by Tito Ragusa <farmatito@tiscali.it>
 *
- * 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.
 */
 /* BB_AUDIT SUSv3 compliant. */
diff --git a/coreutils/install.c b/coreutils/install.c
index ab9feffaf..9dc90d641 100644
--- a/coreutils/install.c
+++ b/coreutils/install.c
@@ -3,7 +3,7 @@
 * Copyright (C) 2003 by Glenn McGrath
 * SELinux support: by Yuichi Nakamura <ynakam@hitachisoft.jp>
 *
- * 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/coreutils/length.c b/coreutils/length.c
index 015b2216f..7f0b48ccd 100644
--- a/coreutils/length.c
+++ b/coreutils/length.c
@@ -1,6 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 /* BB_AUDIT SUSv3 N/A -- Apparently a busybox (obsolete?) extension. */
diff --git a/coreutils/libcoreutils/Kbuild.src b/coreutils/libcoreutils/Kbuild.src
index 981b60628..2042d5f84 100644
--- a/coreutils/libcoreutils/Kbuild.src
+++ b/coreutils/libcoreutils/Kbuild.src
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 #
-# 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.
 lib-y:=
diff --git a/coreutils/libcoreutils/coreutils.h b/coreutils/libcoreutils/coreutils.h
index 99b67b14d..307d0330a 100644
--- a/coreutils/libcoreutils/coreutils.h
+++ b/coreutils/libcoreutils/coreutils.h
@@ -1,6 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
- * 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.
 */
 #ifndef COREUTILS_H
diff --git a/coreutils/ln.c b/coreutils/ln.c
index f977aa177..ddad120d1 100644
--- a/coreutils/ln.c
+++ b/coreutils/ln.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 *
- * 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.
 */
 /* BB_AUDIT SUSv3 compliant */
diff --git a/coreutils/logname.c b/coreutils/logname.c
index 8357b9a33..62f453f2f 100644
--- a/coreutils/logname.c
+++ b/coreutils/logname.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2000  Edward Betts <edward@debian.org>.
 *
- * 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.
 */
 /* BB_AUDIT SUSv3 compliant */
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 279d30c69..ab66b42c1 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -3,7 +3,7 @@
 * tiny-ls.c version 0.1.0: A minimalist 'ls'
 * Copyright (C) 1996 Brian Candler <B.Candler@pobox.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.
 */
 /* [date unknown. Perhaps before year 2000]
diff --git a/coreutils/md5_sha1_sum.c b/coreutils/md5_sha1_sum.c
index 3d50bb0f5..646f8bd10 100644
--- a/coreutils/md5_sha1_sum.c
+++ b/coreutils/md5_sha1_sum.c
@@ -3,7 +3,7 @@
 *  Copyright (C) 2003 Glenn L. McGrath
 *  Copyright (C) 2003-2004 Erik Andersen
 *
- * 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/coreutils/mkdir.c b/coreutils/mkdir.c
index c837e9726..0de0d5c3b 100644
--- a/coreutils/mkdir.c
+++ b/coreutils/mkdir.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2001 Matt Kraai <kraai@alumni.carnegiemellon.edu>
 *
- * 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.
 */
 /* BB_AUDIT SUSv3 compliant */
diff --git a/coreutils/mkfifo.c b/coreutils/mkfifo.c
index 65494609c..41aedd099 100644
--- a/coreutils/mkfifo.c
+++ b/coreutils/mkfifo.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
 *
- * 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.
 */
 /* BB_AUDIT SUSv3 compliant */
diff --git a/coreutils/mknod.c b/coreutils/mknod.c
index 0c694948e..0e5542dde 100644
--- a/coreutils/mknod.c
+++ b/coreutils/mknod.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
 *
- * 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.
 */
 /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
diff --git a/coreutils/mv.c b/coreutils/mv.c
index 1c5a46792..7f49d5bab 100644
--- a/coreutils/mv.c
+++ b/coreutils/mv.c
@@ -5,7 +5,7 @@
 * Copyright (C) 2000 by Matt Kraai <kraai@alumni.carnegiemellon.edu>
 * SELinux support by Yuichi Nakamura <ynakam@hitachisoft.jp>
 *
- * 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.
 */
 /* Mar 16, 2003      Manuel Novoa III   (mjn3@codepoet.org)
diff --git a/coreutils/nice.c b/coreutils/nice.c
index ff3eb1140..6b8fce24d 100644
--- a/coreutils/nice.c
+++ b/coreutils/nice.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2005  Manuel Novoa III  <mjn3@codepoet.org>
 *
- * 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/resource.h>
diff --git a/coreutils/nohup.c b/coreutils/nohup.c
index 3dc531409..c21aae9f5 100644
--- a/coreutils/nohup.c
+++ b/coreutils/nohup.c
@@ -7,7 +7,7 @@
 * Copyright 2006 Rob Landley <rob@landley.net>
 * Copyright 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 "libbb.h"
diff --git a/coreutils/od.c b/coreutils/od.c
index 228db19ac..30b5bd676 100644
--- a/coreutils/od.c
+++ b/coreutils/od.c
@@ -6,7 +6,7 @@
 * Copyright (c) 1990
 *      The Regents of the University of California.  All rights reserved.
 *
- * 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.
 *
 * Original copyright notice is retained at the end of this file.
 */
diff --git a/coreutils/printenv.c b/coreutils/printenv.c
index 2430f3a1a..d38f8fb5f 100644
--- a/coreutils/printenv.c
+++ b/coreutils/printenv.c
@@ -5,7 +5,7 @@
 * Copyright (C) 2005 by Erik Andersen <andersen@codepoet.org>
 * Copyright (C) 2005 by Mike Frysinger <vapier@gentoo.org>
 *
- * 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/coreutils/printf.c b/coreutils/printf.c
index eb53fa490..2cc238439 100644
--- a/coreutils/printf.c
+++ b/coreutils/printf.c
@@ -4,7 +4,7 @@
   Copyright 1999 Dave Cinege
   Portions copyright (C) 1990-1996 Free Software Foundation, Inc.
-   Licensed under GPL v2 or later, see file LICENSE in this tarball for details.
+   Licensed under GPLv2 or later, see file LICENSE in this source tree.
 */
 /* Usage: printf format [argument...]
@@ -66,7 +66,7 @@ static int multiconvert(const char *arg, void *result, converter convert)
        errno = 0;
        convert(arg, result);
        if (errno) {
-                bb_error_msg("%s: invalid number", arg);
+                bb_error_msg("invalid number '%s'", arg);
                return 1;
        }
        return 0;
@@ -230,7 +230,7 @@ static int get_width_prec(const char *str)
 {
        int v = bb_strtoi(str, NULL, 10);
        if (errno) {
-                bb_error_msg("%s: invalid number", str);
+                bb_error_msg("invalid number '%s'", str);
                v = 0;
        }
        return v;
diff --git a/coreutils/pwd.c b/coreutils/pwd.c
index 11278a2a5..2949c55c2 100644
--- a/coreutils/pwd.c
+++ b/coreutils/pwd.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 1995, 1996 by Bruce Perens <bruce@pixar.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/coreutils/readlink.c b/coreutils/readlink.c
index 2ed5e2cac..87602fbc6 100644
--- a/coreutils/readlink.c
+++ b/coreutils/readlink.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2000,2001 Matt Kraai <kraai@alumni.carnegiemellon.edu>
 *
- * Licensed under GPL v2 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/coreutils/realpath.c b/coreutils/realpath.c
index 3bc40ee04..5933062b8 100644
--- a/coreutils/realpath.c
+++ b/coreutils/realpath.c
@@ -7,7 +7,7 @@
 * Now does proper error checking on output and returns a failure exit code
 * if one or more paths cannot be resolved.
 *
- * 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/coreutils/rm.c b/coreutils/rm.c
index 3090cc323..69c473ddb 100644
--- a/coreutils/rm.c
+++ b/coreutils/rm.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2001 Matt Kraai <kraai@alumni.carnegiemellon.edu>
 *
- * 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.
 */
 /* BB_AUDIT SUSv3 compliant */
diff --git a/coreutils/rmdir.c b/coreutils/rmdir.c
index 2450a43a3..75bfc2813 100644
--- a/coreutils/rmdir.c
+++ b/coreutils/rmdir.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
 *
- * 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.
 */
 /* BB_AUDIT SUSv3 compliant */
diff --git a/coreutils/seq.c b/coreutils/seq.c
index 84d11fd8c..8be25360f 100644
--- a/coreutils/seq.c
+++ b/coreutils/seq.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2004, Glenn McGrath
 *
- * 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/coreutils/sleep.c b/coreutils/sleep.c
index 399a38dd4..b983df47e 100644
--- a/coreutils/sleep.c
+++ b/coreutils/sleep.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
 *
- * 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.
 */
 /* BB_AUDIT SUSv3 compliant */
diff --git a/coreutils/sort.c b/coreutils/sort.c
index 5c3fa1a71..4407b7105 100644
--- a/coreutils/sort.c
+++ b/coreutils/sort.c
@@ -6,7 +6,7 @@
 *
 * MAINTAINER: Rob Landley <rob@landley.net>
 *
- * 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.
 *
 * See SuS3 sort standard at:
 * http://www.opengroup.org/onlinepubs/007904975/utilities/sort.html
diff --git a/coreutils/split.c b/coreutils/split.c
index c2f388501..db5a1727a 100644
--- a/coreutils/split.c
+++ b/coreutils/split.c
@@ -3,7 +3,7 @@
 * split - split a file into pieces
 * Copyright (c) 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.
 */
 /* BB_AUDIT: SUSv3 compliant
 * SUSv3 requirements:
@@ -82,9 +82,7 @@ int split_main(int argc UNUSED_PARAM, char **argv)
                int fd;
                if (argv[1])
                        sfx = argv[1];
-                fd = open_or_warn_stdin(argv[0]);
+                fd = xopen_stdin(argv[0]);
-                if (fd == -1)
-                        return EXIT_FAILURE;
                xmove_fd(fd, STDIN_FILENO);
        } else {
                argv[0] = (char *) bb_msg_standard_input;
diff --git a/coreutils/stat.c b/coreutils/stat.c
index e7c24e642..777197292 100644
--- a/coreutils/stat.c
+++ b/coreutils/stat.c
@@ -10,7 +10,7 @@
 * Written by Michael Meskes
 * Taken from coreutils and turned into a busybox applet by Mike Frysinger
 *
- * 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/coreutils/stty.c b/coreutils/stty.c
index 33f7b21dd..0cb4fb234 100644
--- a/coreutils/stty.c
+++ b/coreutils/stty.c
@@ -2,7 +2,7 @@
 /* stty -- change and print terminal line settings
   Copyright (C) 1990-1999 Free Software Foundation, Inc.
-   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.
 */
 /* Usage: stty [-ag] [-F device] [setting...]
diff --git a/coreutils/sum.c b/coreutils/sum.c
index 35e89a6a3..e087fb85b 100644
--- a/coreutils/sum.c
+++ b/coreutils/sum.c
@@ -10,7 +10,7 @@
 * Written by Kayvan Aghaiepour and David MacKenzie
 * Taken from coreutils and turned into a busybox applet by Mike Frysinger
 *
- * 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/coreutils/sync.c b/coreutils/sync.c
index 59305c677..bb112ea38 100644
--- a/coreutils/sync.c
+++ b/coreutils/sync.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 1995, 1996 by Bruce Perens <bruce@pixar.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.
 */
 /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
diff --git a/coreutils/tac.c b/coreutils/tac.c
index b8db8eaba..ab3e66ac2 100644
--- a/coreutils/tac.c
+++ b/coreutils/tac.c
@@ -6,7 +6,7 @@
 * Copyright (C) 2007  Natanael Copa  <natanael.copa@gmail.com>
 * Copyright (C) 2007  Tito Ragusa    <farmatito@tiscali.it>
 *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 *
 */
diff --git a/coreutils/tail.c b/coreutils/tail.c
index 6397702a0..44698f304 100644
--- a/coreutils/tail.c
+++ b/coreutils/tail.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2001 by Matt Kraai <kraai@alumni.carnegiemellon.edu>
 *
- * 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.
 */
 /* BB_AUDIT SUSv3 compliant (need fancy for -c) */
diff --git a/coreutils/tee.c b/coreutils/tee.c
index 0f2424670..8db9042aa 100644
--- a/coreutils/tee.c
+++ b/coreutils/tee.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
 *
- * 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.
 */
 /* BB_AUDIT SUSv3 compliant */
diff --git a/coreutils/test.c b/coreutils/test.c
index fb5778760..1952337b3 100644
--- a/coreutils/test.c
+++ b/coreutils/test.c
@@ -14,7 +14,7 @@
 *     in busybox.
 *     modified by Bernhard Reutner-Fischer to be useable (i.e. a bit less bloaty).
 *
- * 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.
 *
 * Original copyright notice states:
 *     "This program is in the Public Domain."
diff --git a/coreutils/test_ptr_hack.c b/coreutils/test_ptr_hack.c
index a05203d68..5ba9dcc68 100644
--- a/coreutils/test_ptr_hack.c
+++ b/coreutils/test_ptr_hack.c
@@ -2,7 +2,7 @@
 /*
 * Copyright (C) 2008 by 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.
 */
 struct test_statics;
diff --git a/coreutils/touch.c b/coreutils/touch.c
index dceb7c1cc..03aac3aa2 100644
--- a/coreutils/touch.c
+++ b/coreutils/touch.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 *
- * 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.
 */
 /* BB_AUDIT SUSv3 _NOT_ compliant -- options -a, -m, -r, -t not supported. */
diff --git a/coreutils/tr.c b/coreutils/tr.c
index f3db3793f..d6bc7d20a 100644
--- a/coreutils/tr.c
+++ b/coreutils/tr.c
@@ -13,7 +13,7 @@
 * This version of tr is adapted from Minix tr and was modified
 * by Erik Andersen <andersen@codepoet.org> to be used in busybox.
 *
- * 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.
 */
 /* http://www.opengroup.org/onlinepubs/009695399/utilities/tr.html
 * TODO: graph, print
diff --git a/coreutils/true.c b/coreutils/true.c
index 8a7e6ae9e..0a862ef18 100644
--- a/coreutils/true.c
+++ b/coreutils/true.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 *
- * 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.
 */
 /* BB_AUDIT SUSv3 compliant */
diff --git a/coreutils/tty.c b/coreutils/tty.c
index 69352ecf8..489181319 100644
--- a/coreutils/tty.c
+++ b/coreutils/tty.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
 *
- * 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.
 */
 /* BB_AUDIT SUSv4 compliant */
diff --git a/coreutils/uname.c b/coreutils/uname.c
index 9822e49bd..d1c50e222 100644
--- a/coreutils/uname.c
+++ b/coreutils/uname.c
@@ -2,7 +2,7 @@
 /* uname -- print system information
 * Copyright (C) 1989-1999 Free Software Foundation, Inc.
 *
- * 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.
 */
 /* BB_AUDIT SUSv3 compliant */
diff --git a/coreutils/uniq.c b/coreutils/uniq.c
index e566dc1bc..f0364b9a1 100644
--- a/coreutils/uniq.c
+++ b/coreutils/uniq.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2005  Manuel Novoa III  <mjn3@codepoet.org>
 *
- * 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.
 */
 /* BB_AUDIT SUSv3 compliant */
diff --git a/coreutils/usleep.c b/coreutils/usleep.c
index e7acd5f82..cb4ec5898 100644
--- a/coreutils/usleep.c
+++ b/coreutils/usleep.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
 *
- * 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.
 */
 /* BB_AUDIT SUSv3 N/A -- Apparently a busybox extension. */
diff --git a/coreutils/uudecode.c b/coreutils/uudecode.c
index 0298a4bdb..207fb0b8d 100644
--- a/coreutils/uudecode.c
+++ b/coreutils/uudecode.c
@@ -1,19 +1,18 @@
 /* vi: set sw=4 ts=4: */
 /*
- *  Copyright 2003, Glenn McGrath
+ * Copyright 2003, Glenn McGrath
 *
- *  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.
 *
- *  Based on specification from
+ * Based on specification from
- *  http://www.opengroup.org/onlinepubs/007904975/utilities/uuencode.html
+ * http://www.opengroup.org/onlinepubs/007904975/utilities/uuencode.html
 *
- *  Bugs: the spec doesn't mention anything about "`\n`\n" prior to the
+ * Bugs: the spec doesn't mention anything about "`\n`\n" prior to the
- *        "end" line
+ * "end" line
 */
 #include "libbb.h"
+#if ENABLE_UUDECODE
 static void read_stduu(FILE *src_stream, FILE *dst_stream)
 {
        char *line;
@@ -74,13 +73,14 @@ static void read_stduu(FILE *src_stream, FILE *dst_stream)
        }
        bb_error_msg_and_die("short file");
 }
+#endif
 static void read_base64(FILE *src_stream, FILE *dst_stream)
 {
        int term_count = 1;
        while (1) {
-                char translated[4];
+                unsigned char translated[4];
                int count = 0;
                while (count < 4) {
@@ -94,6 +94,12 @@ static void read_base64(FILE *src_stream, FILE *dst_stream)
                        do {
                                ch = fgetc(src_stream);
                                if (ch == EOF) {
+                                        if (ENABLE_BASE64
+                                         && (!ENABLE_UUDECODE || applet_name[0] == 'b')
+                                         && count == 0
+                                        ) {
+                                                return;
+                                        }
                                        bb_error_msg_and_die("short file");
                                }
                                table_ptr = strchr(bb_uuenc_tbl_base64, ch);
@@ -135,6 +141,7 @@ static void read_base64(FILE *src_stream, FILE *dst_stream)
        }
 }
+#if ENABLE_UUDECODE
 int uudecode_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int uudecode_main(int argc UNUSED_PARAM, char **argv)
 {
@@ -146,9 +153,9 @@ int uudecode_main(int argc UNUSED_PARAM, char **argv)
        getopt32(argv, "o:", &outname);
        argv += optind;
-        if (!*argv)
+        if (!argv[0])
                *--argv = (char*)"-";
-        src_stream = xfopen_stdin(*argv);
+        src_stream = xfopen_stdin(argv[0]);
        /* Search for the start of the encoding */
        while ((line = xmalloc_fgetline(src_stream)) != NULL) {
@@ -189,6 +196,68 @@ int uudecode_main(int argc UNUSED_PARAM, char **argv)
        }
        bb_error_msg_and_die("no 'begin' line");
 }
+#endif
+//applet:IF_BASE64(APPLET(base64, _BB_DIR_BIN, _BB_SUID_DROP))
+//kbuild:lib-$(CONFIG_BASE64) += uudecode.o
+//config:config BASE64
+//config:       bool "base64"
+//config:       default y
+//config:       help
+//config:         Base64 encode and decode
+//usage:#define base64_trivial_usage
+//usage:        "[-d] [FILE]"
+//usage:#define base64_full_usage "\n\n"
+//usage:       "Base64 encode or decode FILE to standard output"
+//usage:     "\nOptions:"
+//usage:     "\n        -d      Decode data"
+////usage:     "\n      -w COL  Wrap lines at COL (default 76, 0 disables)"
+////usage:     "\n      -i      When decoding, ignore non-alphabet characters"
+#if ENABLE_BASE64
+int base64_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int base64_main(int argc UNUSED_PARAM, char **argv)
+{
+        FILE *src_stream;
+        unsigned opts;
+        opt_complementary = "?1"; /* 1 argument max */
+        opts = getopt32(argv, "d");
+        argv += optind;
+        if (!argv[0])
+                *--argv = (char*)"-";
+        src_stream = xfopen_stdin(argv[0]);
+        if (opts) {
+                read_base64(src_stream, stdout);
+        } else {
+                enum {
+                        SRC_BUF_SIZE = 76/4*3,  /* This *MUST* be a multiple of 3 */
+                        DST_BUF_SIZE = 4 * ((SRC_BUF_SIZE + 2) / 3),
+                };
+                char src_buf[SRC_BUF_SIZE];
+                char dst_buf[DST_BUF_SIZE + 1];
+                int src_fd = fileno(src_stream);
+                while (1) {
+                        size_t size = full_read(src_fd, src_buf, SRC_BUF_SIZE);
+                        if (!size)
+                                break;
+                        if ((ssize_t)size < 0)
+                                bb_perror_msg_and_die(bb_msg_read_error);
+                        /* Encode the buffer we just read in */
+                        bb_uuencode(dst_buf, src_buf, size, bb_uuenc_tbl_base64);
+                        xwrite(STDOUT_FILENO, dst_buf, 4 * ((size + 2) / 3));
+                        bb_putchar('\n');
+                        fflush(stdout);
+                }
+        }
+        fflush_stdout_and_exit(EXIT_SUCCESS);
+}
+#endif
 /* Test script.
 Put this into an empty dir with busybox binary, an run.
diff --git a/coreutils/uuencode.c b/coreutils/uuencode.c
index bf661851d..fe9e8c664 100644
--- a/coreutils/uuencode.c
+++ b/coreutils/uuencode.c
@@ -5,13 +5,13 @@
 *  based on the function base64_encode from http.c in wget v1.6
 *  Copyright (C) 1995, 1996, 1997, 1998, 2000 Free Software Foundation, Inc.
 *
- * 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"
 enum {
-        SRC_BUF_SIZE = 45,  /* This *MUST* be a multiple of 3 */
+        SRC_BUF_SIZE = 15*3,  /* This *MUST* be a multiple of 3 */
        DST_BUF_SIZE = 4 * ((SRC_BUF_SIZE + 2) / 3),
 };
@@ -33,7 +33,7 @@ int uuencode_main(int argc UNUSED_PARAM, char **argv)
        }
        argv += optind;
        if (argv[1]) {
-                src_fd = xopen(*argv, O_RDONLY);
+                src_fd = xopen(argv[0], O_RDONLY);
                fstat(src_fd, &stat_buf);
                mode = stat_buf.st_mode & (S_IRWXU | S_IRWXG | S_IRWXO);
                argv++;
diff --git a/coreutils/wc.c b/coreutils/wc.c
index 711684225..4f14374c3 100644
--- a/coreutils/wc.c
+++ b/coreutils/wc.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
 *
- * 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.
 */
 /* BB_AUDIT SUSv3 _NOT_ compliant -- option -m is not currently supported. */
diff --git a/coreutils/who.c b/coreutils/who.c
index 2b4331025..8384d9534 100644
--- a/coreutils/who.c
+++ b/coreutils/who.c
@@ -12,7 +12,7 @@
 *
 * Copyright (c) 2002 AYR Networks, Inc.
 *
- * 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/coreutils/whoami.c b/coreutils/whoami.c
index 22d722ec7..78d20db14 100644
--- a/coreutils/whoami.c
+++ b/coreutils/whoami.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2000  Edward Betts <edward@debian.org>.
 *
- * 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.
 */
 /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
diff --git a/coreutils/yes.c b/coreutils/yes.c
index ead674b27..5d799f09b 100644
--- a/coreutils/yes.c
+++ b/coreutils/yes.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
 *
- * 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.
 */
 /* BB_AUDIT SUSv3 N/A -- Matches GNU behavior. */
diff --git a/debianutils/Kbuild.src b/debianutils/Kbuild.src
index da34e4e4f..d41b5c8e4 100644
--- a/debianutils/Kbuild.src
+++ b/debianutils/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/debianutils/mktemp.c b/debianutils/mktemp.c
index 7ce9f1096..86881f86d 100644
--- a/debianutils/mktemp.c
+++ b/debianutils/mktemp.c
@@ -6,7 +6,7 @@
 * Copyright (C) 2000 by Daniel Jacobowitz
 * Written by Daniel Jacobowitz <dan@debian.org>
 *
- * 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.
 */
 /* Coreutils 6.12 man page says:
diff --git a/debianutils/pipe_progress.c b/debianutils/pipe_progress.c
index 6adefac99..1e57dc241 100644
--- a/debianutils/pipe_progress.c
+++ b/debianutils/pipe_progress.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2003 by Rob Landley <rob@landley.net>, Joey Hess
 *
- * 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/debianutils/run_parts.c b/debianutils/run_parts.c
index ba05897f9..b93a5a917 100644
--- a/debianutils/run_parts.c
+++ b/debianutils/run_parts.c
@@ -12,7 +12,7 @@
 *   Copyright (C) 1996-1999 Guy Maor <maor@debian.org>
 *
 *
- * Licensed under GPL v2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
 */
 /* This is my first attempt to write a program in C (well, this is my first
diff --git a/debianutils/start_stop_daemon.c b/debianutils/start_stop_daemon.c
index 568f32eec..d2ee95068 100644
--- a/debianutils/start_stop_daemon.c
+++ b/debianutils/start_stop_daemon.c
@@ -5,7 +5,7 @@
 * Written by Marek Michalkiewicz <marekm@i17linuxb.ists.pwr.wroc.pl>,
 * Adapted for busybox David Kimdon <dwhedon@gordian.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.
 */
 /*
diff --git a/debianutils/which.c b/debianutils/which.c
index 59dedf58d..0cf786803 100644
--- a/debianutils/which.c
+++ b/debianutils/which.c
@@ -5,7 +5,7 @@
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 * Copyright (C) 2006 Gabriel Somlo <somlo at cmu.edu>
 *
- * 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 which from debianutils
 */
diff --git a/docs/new-applet-HOWTO.txt b/docs/new-applet-HOWTO.txt
index a2c5a49fe..2f237564d 100644
--- a/docs/new-applet-HOWTO.txt
+++ b/docs/new-applet-HOWTO.txt
@@ -36,7 +36,7 @@ For a new applet mu, here is the code that would go in mu.c:
 *
 * Copyright (C) [YEAR] by [YOUR NAME] <YOUR EMAIL>
 *
- * 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/e2fsprogs/Kbuild.src b/e2fsprogs/Kbuild.src
index 31c271238..b7a14c381 100644
--- a/e2fsprogs/Kbuild.src
+++ b/e2fsprogs/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/e2fsprogs/e2fs_lib.c b/e2fsprogs/e2fs_lib.c
index f033a19ed..a6aec9484 100644
--- a/e2fsprogs/e2fs_lib.c
+++ b/e2fsprogs/e2fs_lib.c
@@ -2,7 +2,7 @@
 /*
 * See README for additional information
 *
- * 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/e2fsprogs/fsck.c b/e2fsprogs/fsck.c
index d694bb110..a86a9d96f 100644
--- a/e2fsprogs/fsck.c
+++ b/e2fsprogs/fsck.c
@@ -20,7 +20,7 @@
 * Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
 *      2001, 2002, 2003, 2004, 2005 by  Theodore Ts'o.
 *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 /* All filesystem specific hooks have been removed.
diff --git a/e2fsprogs/old_e2fsprogs/Kbuild.src b/e2fsprogs/old_e2fsprogs/Kbuild.src
index 07a09ca3d..fff1a0d6f 100644
--- a/e2fsprogs/old_e2fsprogs/Kbuild.src
+++ b/e2fsprogs/old_e2fsprogs/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/e2fsprogs/old_e2fsprogs/blkid/Kbuild.src b/e2fsprogs/old_e2fsprogs/blkid/Kbuild.src
index bae77fe63..02b4d2496 100644
--- a/e2fsprogs/old_e2fsprogs/blkid/Kbuild.src
+++ b/e2fsprogs/old_e2fsprogs/blkid/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.
 NEEDED-$(CONFIG_E2FSCK) = y
 NEEDED-$(CONFIG_FSCK) = y
diff --git a/e2fsprogs/old_e2fsprogs/e2fsck.c b/e2fsprogs/old_e2fsprogs/e2fsck.c
index cf52f51b6..d73665988 100644
--- a/e2fsprogs/old_e2fsprogs/e2fsck.c
+++ b/e2fsprogs/old_e2fsprogs/e2fsck.c
@@ -26,7 +26,7 @@
 * Journal recovery routines for the generic filesystem journaling code;
 * part of the ext2fs journaling system.
 *
- * 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 "e2fsck.h"     /*Put all of our defines here to clean things up*/
diff --git a/e2fsprogs/old_e2fsprogs/e2p/Kbuild.src b/e2fsprogs/old_e2fsprogs/e2p/Kbuild.src
index 194870788..482630cc2 100644
--- a/e2fsprogs/old_e2fsprogs/e2p/Kbuild.src
+++ b/e2fsprogs/old_e2fsprogs/e2p/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.
 NEEDED-$(CONFIG_CHATTR) = y
 NEEDED-$(CONFIG_LSATTR) = y
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/Kbuild.src b/e2fsprogs/old_e2fsprogs/ext2fs/Kbuild.src
index 8ca65ee90..12adc6e46 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/Kbuild.src
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/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.
 NEEDED-$(CONFIG_E2FSCK) = y
 NEEDED-$(CONFIG_FSCK) = y
diff --git a/e2fsprogs/old_e2fsprogs/fsck.c b/e2fsprogs/old_e2fsprogs/fsck.c
index 2a66d728a..524b84652 100644
--- a/e2fsprogs/old_e2fsprogs/fsck.c
+++ b/e2fsprogs/old_e2fsprogs/fsck.c
@@ -20,7 +20,7 @@
 * Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
 *      2001, 2002, 2003, 2004, 2005 by  Theodore Ts'o.
 *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #include <sys/types.h>
diff --git a/e2fsprogs/old_e2fsprogs/mke2fs.c b/e2fsprogs/old_e2fsprogs/mke2fs.c
index f1e97b96a..7555650a2 100644
--- a/e2fsprogs/old_e2fsprogs/mke2fs.c
+++ b/e2fsprogs/old_e2fsprogs/mke2fs.c
@@ -5,7 +5,7 @@
 * Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
 *      2003, 2004, 2005 by Theodore Ts'o.
 *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 /* Usage: mke2fs [options] device
diff --git a/e2fsprogs/old_e2fsprogs/tune2fs.c b/e2fsprogs/old_e2fsprogs/tune2fs.c
index 00f8682a5..3c3f4afa5 100644
--- a/e2fsprogs/old_e2fsprogs/tune2fs.c
+++ b/e2fsprogs/old_e2fsprogs/tune2fs.c
@@ -8,7 +8,7 @@
 *
 * Copyright 1995, 1996, 1997, 1998, 1999, 2000 by Theodore Ts'o.
 *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 /*
diff --git a/e2fsprogs/old_e2fsprogs/util.c b/e2fsprogs/old_e2fsprogs/util.c
index 0829f5686..a61abc2c6 100644
--- a/e2fsprogs/old_e2fsprogs/util.c
+++ b/e2fsprogs/old_e2fsprogs/util.c
@@ -4,7 +4,7 @@
 *
 * Copyright 1995, 1996, 1997, 1998, 1999, 2000 by Theodore Ts'o.
 *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #include <stdio.h>
diff --git a/e2fsprogs/old_e2fsprogs/uuid/Kbuild.src b/e2fsprogs/old_e2fsprogs/uuid/Kbuild.src
index 9454faba7..b8c687d30 100644
--- a/e2fsprogs/old_e2fsprogs/uuid/Kbuild.src
+++ b/e2fsprogs/old_e2fsprogs/uuid/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.
 NEEDED-$(CONFIG_E2FSCK) = y
 NEEDED-$(CONFIG_FSCK) = y
diff --git a/e2fsprogs/tune2fs.c b/e2fsprogs/tune2fs.c
index 00ede4f1e..311349fec 100644
--- a/e2fsprogs/tune2fs.c
+++ b/e2fsprogs/tune2fs.c
@@ -4,7 +4,7 @@
 *
 * Busybox'ed (2009) 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"
 #include <linux/fs.h>
diff --git a/editors/Kbuild.src b/editors/Kbuild.src
index 9d4b9d053..98128064d 100644
--- a/editors/Kbuild.src
+++ b/editors/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/editors/awk.c b/editors/awk.c
index 83c5b47ce..f47d1ab02 100644
--- a/editors/awk.c
+++ b/editors/awk.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2002 by Dmitry Zakharov <dmit@crp.bank.gov.ua>
 *
- * 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/editors/cmp.c b/editors/cmp.c
index dbfa4be35..f495da7d2 100644
--- a/editors/cmp.c
+++ b/editors/cmp.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2000,2001 by Matt Kraai <kraai@alumni.carnegiemellon.edu>
 *
- * 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.
 */
 /* BB_AUDIT SUSv3 (virtually) compliant -- uses nicer GNU format for -l. */
diff --git a/editors/diff.c b/editors/diff.c
index a3ca2b660..83de52753 100644
--- a/editors/diff.c
+++ b/editors/diff.c
@@ -10,7 +10,7 @@
 * Agency (DARPA) and Air Force Research Laboratory, Air Force
 * Materiel Command, USAF, under agreement number F39502-99-1-0512.
 *
- * 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.
 */
 /*
@@ -479,7 +479,7 @@ start:
        for (; suff < nlen[0] - pref && suff < nlen[1] - pref &&
               nfile[0][nlen[0] - suff].value == nfile[1][nlen[1] - suff].value;
               suff++);
-        /* Arrays are pruned by the suffix and prefix lenght,
+        /* Arrays are pruned by the suffix and prefix length,
         * the result being sorted and stored in sfile[fileno],
         * and their sizes are stored in slen[fileno]
         */
diff --git a/editors/patch.c b/editors/patch.c
index eb16bca12..c40f54155 100644
--- a/editors/patch.c
+++ b/editors/patch.c
@@ -12,7 +12,6 @@
 * TODO:
 * -b backup
 * -l treat all whitespace as a single space
- * -N ignore already applied
 * -d chdir first
 * -D define wrap #ifdef and #ifndef around changes
 * -o outfile output here instead of in place
@@ -244,14 +243,12 @@ struct globals {
 } while (0)
-//bbox had: "p:i:RN"
 #define FLAG_STR "Rup:i:Nx"
 /* FLAG_REVERSE must be == 1! Code uses this fact. */
 #define FLAG_REVERSE (1 << 0)
 #define FLAG_u       (1 << 1)
 #define FLAG_PATHLEN (1 << 2)
 #define FLAG_INPUT   (1 << 3)
-// -N: not supported yet
 #define FLAG_IGNORE  (1 << 4)
 //non-standard:
 #define FLAG_DEBUG   (1 << 5)
@@ -314,6 +311,10 @@ static int apply_one_hunk(void)
 {
        struct double_list *plist, *buf = NULL, *check;
        int matcheof = 0, reverse = option_mask32 & FLAG_REVERSE, backwarn = 0;
+        /* Do we try "dummy" revert to check whether
+         * to silently skip this hunk? Used to implement -N.
+         */
+        int dummy_revert = 0;
        // Break doubly linked list so we can use singly linked traversal function.
        TT.current_hunk->prev->next = NULL;
@@ -343,9 +344,14 @@ static int apply_one_hunk(void)
                while (plist && *plist->data == "+-"[reverse]) {
                        if (data && !strcmp(data, plist->data+1)) {
                                if (!backwarn) {
+                                        backwarn++;
+                                        if (option_mask32 & FLAG_IGNORE) {
+                                                dummy_revert = 1;
+                                                reverse ^= 1;
+                                                continue;
+                                        }
                                        fdprintf(2,"Possibly reversed hunk %d at %ld\n",
                                                TT.hunknum, TT.linenum);
-                                        backwarn++;
                                }
                        }
                        plist = plist->next;
@@ -409,7 +415,7 @@ static int apply_one_hunk(void)
        }
 out:
        // We have a match.  Emit changed data.
-        TT.state = "-+"[reverse];
+        TT.state = "-+"[reverse ^ dummy_revert];
        llist_free(TT.current_hunk, do_line);
        TT.current_hunk = NULL;
        TT.state = 1;
@@ -441,10 +447,21 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
        INIT_TT();
        opts = getopt32(argv, FLAG_STR, &opt_p, &opt_i);
+        argv += optind;
        reverse = opts & FLAG_REVERSE;
        TT.prefix = (opts & FLAG_PATHLEN) ? xatoi(opt_p) : 0; // can be negative!
-        if (opts & FLAG_INPUT) TT.filepatch = xopen(opt_i, O_RDONLY);
        TT.filein = TT.fileout = -1;
+        if (opts & FLAG_INPUT) {
+                TT.filepatch = xopen_stdin(opt_i);
+        } else {
+                if (argv[0] && argv[1]) {
+                        TT.filepatch = xopen_stdin(argv[1]);
+                }
+        }
+        if (argv[0]) {
+                oldname = xstrdup(argv[0]);
+                newname = xstrdup(argv[0]);
+        }
        // Loop through the lines in the patch
        for(;;) {
@@ -492,18 +509,20 @@ int patch_main(int argc UNUSED_PARAM, char **argv)
                                state = 1;
                        }
-                        free(*name);
                        finish_oldfile();
-                        // Trim date from end of filename (if any).  We don't care.
+                        if (!argv[0]) {
-                        for (s = patchline+4; *s && *s!='\t'; s++)
+                                free(*name);
-                                if (*s=='\\' && s[1]) s++;
+                                // Trim date from end of filename (if any).  We don't care.
-                        i = atoi(s);
+                                for (s = patchline+4; *s && *s!='\t'; s++)
-                        if (i>1900 && i<=1970)
+                                        if (*s=='\\' && s[1]) s++;
-                                *name = xstrdup("/dev/null");
+                                i = atoi(s);
-                        else {
+                                if (i>1900 && i<=1970)
-                                *s = 0;
+                                        *name = xstrdup("/dev/null");
-                                *name = xstrdup(patchline+4);
+                                else {
+                                        *s = 0;
+                                        *name = xstrdup(patchline+4);
+                                }
                        }
                        // We defer actually opening the file because svn produces broken
diff --git a/editors/patch_bbox.c b/editors/patch_bbox.c
index 62477af16..78aa5fde8 100644
--- a/editors/patch_bbox.c
+++ b/editors/patch_bbox.c
@@ -1,22 +1,22 @@
 /* vi: set sw=4 ts=4: */
 /*
- *  busybox patch applet to handle the unified diff format.
+ * busybox patch applet to handle the unified diff format.
- *  Copyright (C) 2003 Glenn McGrath
+ * Copyright (C) 2003 Glenn McGrath
 *
- *  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 applet is written to work with patches generated by GNU diff,
+ * This applet is written to work with patches generated by GNU diff,
- *  where there is equivalent functionality busybox patch shall behave
+ * where there is equivalent functionality busybox patch shall behave
- *  as per GNU patch.
+ * as per GNU patch.
 *
- *  There is a SUSv3 specification for patch, however it looks to be
+ * There is a SUSv3 specification for patch, however it looks to be
- *  incomplete, it doesnt even mention unified diff format.
+ * incomplete, it doesnt even mention unified diff format.
- *  http://www.opengroup.org/onlinepubs/007904975/utilities/patch.html
+ * http://www.opengroup.org/onlinepubs/007904975/utilities/patch.html
 *
- *  Issues
+ * Issues
- *   - Non-interactive
+ * - Non-interactive
- *   - Patches must apply cleanly or patch (not just one hunk) will fail.
+ * - Patches must apply cleanly or patch (not just one hunk) will fail.
- *   - Reject file isnt saved
+ * - Reject file isnt saved
 */
 #include "libbb.h"
diff --git a/editors/sed.c b/editors/sed.c
index 7d6e7e79f..8d9f7b25b 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -10,7 +10,7 @@
 *
 * MAINTAINER: Rob Landley <rob@landley.net>
 *
- * Licensed under GPL version 2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 /* Code overview.
@@ -992,6 +992,8 @@ static void process_files(void)
                }
                /* actual sedding */
+                //bb_error_msg("pattern_space:'%s' next_line:'%s' cmd:%c",
+                //pattern_space, next_line, sed_cmd->cmd);
                switch (sed_cmd->cmd) {
                /* Print line number */
@@ -1118,10 +1120,16 @@ static void process_files(void)
                {
                        int len;
                        /* If no next line, jump to end of script and exit. */
+                        /* http://www.gnu.org/software/sed/manual/sed.html:
+                         * "Most versions of sed exit without printing anything
+                         * when the N command is issued on the last line of
+                         * a file. GNU sed prints pattern space before exiting
+                         * unless of course the -n command switch has been
+                         * specified. This choice is by design."
+                         */
                        if (next_line == NULL) {
-                                free(next_line);
+                                //goto discard_line;
-                                next_line = NULL;
+                                goto discard_commands; /* GNU behavior */
-                                goto discard_line;
                        }
                        /* Append next_line, read new next_line. */
                        len = strlen(pattern_space);
diff --git a/editors/vi.c b/editors/vi.c
index 73e095cf8..602fc61d9 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -3,7 +3,7 @@
 * tiny vi.c: A small 'vi' clone
 * Copyright (C) 2000, 2001 Sterling Huxley <sterling@europa.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/examples/depmod b/examples/depmod
index d8c4cc5aa..d769590d0 100755
--- a/examples/depmod
+++ b/examples/depmod
@@ -4,7 +4,7 @@
 #
 # Copyright (C) 2008 by Vladimir Dronnikov <dronnikov@gmail.com>
 #
-# Licensed under GPLv2
+# Licensed under GPLv2, see file LICENSE in this source tree.
 #
 local BASE="${1:-/usr/lib/modules}"
diff --git a/findutils/Kbuild.src b/findutils/Kbuild.src
index 771789ff5..6b4fb7470 100644
--- a/findutils/Kbuild.src
+++ b/findutils/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/findutils/find.c b/findutils/find.c
index d4bcd6545..dd00f37ea 100644
--- a/findutils/find.c
+++ b/findutils/find.c
@@ -7,7 +7,7 @@
 * Reworked by David Douthitt <n9ubh@callsign.net> and
 *  Matt Kraai <kraai@alumni.carnegiemellon.edu>.
 *
- * Licensed under the GPL version 2, see the file LICENSE in this tarball.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 /* findutils-4.1.20:
@@ -748,13 +748,13 @@ static action*** parse_params(char **argv)
        /* This is the only place in busybox where we use nested function.
         * So far more standard alternatives were bigger. */
-        /* Suppress a warning "func without a prototype" */
+        /* Auto decl suppresses "func without a prototype" warning: */
        auto action* alloc_action(int sizeof_struct, action_fp f);
        action* alloc_action(int sizeof_struct, action_fp f)
        {
                action *ap;
                appp[cur_group] = xrealloc(appp[cur_group], (cur_action+2) * sizeof(*appp));
-                appp[cur_group][cur_action++] = ap = xmalloc(sizeof_struct);
+                appp[cur_group][cur_action++] = ap = xzalloc(sizeof_struct);
                appp[cur_group][cur_action] = NULL;
                ap->f = f;
                IF_FEATURE_FIND_NOT( ap->invert = invert_flag; )
@@ -854,16 +854,20 @@ static action*** parse_params(char **argv)
                        IF_FEATURE_FIND_NOT( invert_flag = 0; )
                        ap = ALLOC_ACTION(exec);
                        ap->exec_argv = ++argv; /* first arg after -exec */
-                        ap->exec_argc = 0;
+                        /*ap->exec_argc = 0; - ALLOC_ACTION did it */
                        while (1) {
                                if (!*argv) /* did not see ';' or '+' until end */
                                        bb_error_msg_and_die(bb_msg_requires_arg, "-exec");
-                                if (LONE_CHAR(argv[0], ';'))
+                                // find -exec echo Foo ">{}<" ";"
+                                // executes "echo Foo <filename>",
+                                // find -exec echo Foo ">{}<" "+"
+                                // executes "echo Foo <filename1> <filename2> <filename3>...".
+                                // TODO (so far we treat "+" just like ";")
+                                if ((argv[0][0] == ';' || argv[0][0] == '+')
+                                 && argv[0][1] == '\0'
+                                ) {
                                        break;
-                                //TODO: implement {} + (like xargs)
+                                }
-                                // See:
-                                // find findutils/ -exec echo ">"{}"<" \;
-                                // find findutils/ -exec echo ">"{}"<" +
                                argv++;
                                ap->exec_argc++;
                        }
@@ -936,7 +940,7 @@ static action*** parse_params(char **argv)
                        ap = ALLOC_ACTION(perm);
                        ap->perm_char = arg1[0];
                        arg1 = plus_minus_num(arg1);
-                        ap->perm_mask = 0;
+                        /*ap->perm_mask = 0; - ALLOC_ACTION did it */
                        if (!bb_parse_mode(arg1, &ap->perm_mask))
                                bb_error_msg_and_die("invalid mode '%s'", arg1);
                }
@@ -1022,7 +1026,7 @@ static action*** parse_params(char **argv)
                else if (parm == PARM_context) {
                        action_context *ap;
                        ap = ALLOC_ACTION(context);
-                        ap->context = NULL;
+                        /*ap->context = NULL; - ALLOC_ACTION did it */
                        /* SELinux headers erroneously declare non-const parameter */
                        if (selinux_raw_to_trans_context((char*)arg1, &ap->context))
                                bb_simple_perror_msg(arg1);
diff --git a/findutils/grep.c b/findutils/grep.c
index 9eb5e5a1b..bf42753c5 100644
--- a/findutils/grep.c
+++ b/findutils/grep.c
@@ -5,7 +5,7 @@
 * Copyright (C) 1999,2000,2001 by Lineo, inc. and Mark Whitley
 * Copyright (C) 1999,2000,2001 by Mark Whitley <markw@codepoet.org>
 *
- * 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.
 */
 /* BB_AUDIT SUSv3 defects - unsupported option -x "match whole line only". */
 /* BB_AUDIT GNU defects - always acts as -a.  */
@@ -469,15 +469,19 @@ static int grep_file(FILE *file)
                                                if (found)
                                                        print_line(gl->pattern, strlen(gl->pattern), linenum, ':');
                                        } else while (1) {
+                                                unsigned start = gl->matched_range.rm_so;
                                                unsigned end = gl->matched_range.rm_eo;
+                                                unsigned len = end - start;
                                                char old = line[end];
                                                line[end] = '\0';
-                                                print_line(line + gl->matched_range.rm_so,
+                                                /* Empty match is not printed: try "echo test | grep -o ''" */
-                                                                end - gl->matched_range.rm_so,
+                                                if (len != 0)
-                                                                linenum, ':');
+                                                        print_line(line + start, len, linenum, ':');
                                                if (old == '\0')
                                                        break;
                                                line[end] = old;
+                                                if (len == 0)
+                                                        end++;
 #if !ENABLE_EXTRA_COMPAT
                                                if (regexec(&gl->compiled_regex, line + end,
                                                                1, &gl->matched_range, REG_NOTBOL) != 0)
diff --git a/findutils/xargs.c b/findutils/xargs.c
index 7b9f1fb73..d73fad9de 100644
--- a/findutils/xargs.c
+++ b/findutils/xargs.c
@@ -9,7 +9,7 @@
 * - Mike Rendell <michael@cs.mun.ca>
 * and David MacKenzie <djm@gnu.ai.mit.edu>.
 *
- * 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.
 *
 * xargs is described in the Single Unix Specification v3 at
 * http://www.opengroup.org/onlinepubs/007904975/utilities/xargs.html
diff --git a/include/ar.h b/include/ar.h
index 26678895a..386fe0456 100644
--- a/include/ar.h
+++ b/include/ar.h
@@ -1,6 +1,6 @@
 /*
 * busybox ar archive data structures
- * Licensed under the GPL v2 or later, see the file LICENSE in this source tree.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
 */
 #ifndef AR_H
 #define AR_H
diff --git a/include/busybox.h b/include/busybox.h
index 48fc0b4c8..76415dd72 100644
--- a/include/busybox.h
+++ b/include/busybox.h
@@ -2,7 +2,7 @@
 /*
 * Busybox main internal header file
 *
- * 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.
 */
 #ifndef BUSYBOX_H
 #define BUSYBOX_H 1
diff --git a/include/fix_u32.h b/include/fix_u32.h
index c26e5d192..a2ba6d0a9 100644
--- a/include/fix_u32.h
+++ b/include/fix_u32.h
@@ -3,7 +3,7 @@
 * This header makes it easier to include kernel headers
 * which use u32 and such.
 *
- * Licensed under the GPL version 2, see the file LICENSE in this tarball.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #ifndef FIX_U32_H
 #define FIX_U32_H 1
diff --git a/include/libbb.h b/include/libbb.h
index fcff7b51e..7c0ff9de0 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -3,9 +3,9 @@
 * Busybox main internal header file
 *
 * Based in part on code from sash, Copyright (c) 1999 by David I. Bell
- * Permission has been granted to redistribute this code under the GPL.
+ * Permission has been granted to redistribute this code under GPL.
 *
- * Licensed under the GPL version 2, see the file LICENSE in this tarball.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #ifndef LIBBB_H
 #define LIBBB_H 1
@@ -422,12 +422,14 @@ void bb_unsetenv(const char *key) FAST_FUNC;
 void bb_unsetenv_and_free(char *key) FAST_FUNC;
 void xunlink(const char *pathname) FAST_FUNC;
 void xstat(const char *pathname, struct stat *buf) FAST_FUNC;
+void xfstat(int fd, struct stat *buf, const char *errmsg) FAST_FUNC;
 int xopen(const char *pathname, int flags) FAST_FUNC;
 int xopen_nonblocking(const char *pathname) FAST_FUNC;
 int xopen3(const char *pathname, int flags, int mode) FAST_FUNC;
 int open_or_warn(const char *pathname, int flags) FAST_FUNC;
 int open3_or_warn(const char *pathname, int flags, int mode) FAST_FUNC;
 int open_or_warn_stdin(const char *pathname) FAST_FUNC;
+int xopen_stdin(const char *pathname) FAST_FUNC;
 void xrename(const char *oldpath, const char *newpath) FAST_FUNC;
 int rename_or_warn(const char *oldpath, const char *newpath) FAST_FUNC;
 off_t xlseek(int fd, off_t offset, int whence) FAST_FUNC;
@@ -1402,6 +1404,29 @@ enum { COMM_LEN = TASK_COMM_LEN };
 enum { COMM_LEN = 16 };
 # endif
 #endif
+struct smaprec {
+        unsigned long mapped_rw;
+        unsigned long mapped_ro;
+        unsigned long shared_clean;
+        unsigned long shared_dirty;
+        unsigned long private_clean;
+        unsigned long private_dirty;
+        unsigned long stack;
+        unsigned long smap_pss, smap_swap;
+        unsigned long smap_size;
+        unsigned long smap_start;
+        char smap_mode[5];
+        char *smap_name;
+};
+#if !ENABLE_PMAP
+#define procps_read_smaps(pid, total, cb, data) \
+        procps_read_smaps(pid, total)
+#endif
+int FAST_FUNC procps_read_smaps(pid_t pid, struct smaprec *total,
+                      void (*cb)(struct smaprec *, void *), void *data);
 typedef struct procps_status_t {
        DIR *dir;
        IF_FEATURE_SHOW_THREADS(DIR *task_dir;)
@@ -1430,13 +1455,7 @@ typedef struct procps_status_t {
 #endif
        unsigned tty_major,tty_minor;
 #if ENABLE_FEATURE_TOPMEM
-        unsigned long mapped_rw;
+        struct smaprec smaps;
-        unsigned long mapped_ro;
-        unsigned long shared_clean;
-        unsigned long shared_dirty;
-        unsigned long private_clean;
-        unsigned long private_dirty;
-        unsigned long stack;
 #endif
        char state[4];
        /* basename of executable in exec(2), read from /proc/N/stat
diff --git a/include/platform.h b/include/platform.h
index 7f2216a55..232fead89 100644
--- a/include/platform.h
+++ b/include/platform.h
@@ -1,8 +1,8 @@
 /* vi: set sw=4 ts=4: */
 /*
- *  Copyright 2006, Bernhard Reutner-Fischer
+ * Copyright 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.
 */
 #ifndef BB_PLATFORM_H
 #define BB_PLATFORM_H 1
diff --git a/include/rtc_.h b/include/rtc_.h
index b5fe8ec32..bd322c940 100644
--- a/include/rtc_.h
+++ b/include/rtc_.h
@@ -1,7 +1,7 @@
 /*
 * Common defines/structures/etc... for applets that need to work with the RTC.
 *
- * Licensed under the GPL-2 or later.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
 */
 #ifndef BB_RTC_H
diff --git a/include/unicode.h b/include/unicode.h
index e9e2bd14a..1dd55e67d 100644
--- a/include/unicode.h
+++ b/include/unicode.h
@@ -1,6 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Licensed under the GPL version 2, see the file LICENSE in this tarball.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #ifndef UNICODE_H
 #define UNICODE_H 1
diff --git a/include/xatonum.h b/include/xatonum.h
index 978c502f6..6f76a3c96 100644
--- a/include/xatonum.h
+++ b/include/xatonum.h
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
 *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
diff --git a/include/xregex.h b/include/xregex.h
index 44a2297e6..5e5e6a256 100644
--- a/include/xregex.h
+++ b/include/xregex.h
@@ -4,9 +4,9 @@
 * C library we're linking against may not support regex.h.
 *
 * Based in part on code from sash, Copyright (c) 1999 by David I. Bell
- * Permission has been granted to redistribute this code under the GPL.
+ * Permission has been granted to redistribute this code under GPL.
 *
- * 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.
 */
 #ifndef BB_REGEX_H
 #define BB_REGEX_H 1
diff --git a/init/Kbuild.src b/init/Kbuild.src
index 6095a78bb..32dd5a045 100644
--- a/init/Kbuild.src
+++ b/init/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/init/bootchartd.c b/init/bootchartd.c
index 465a34979..f14d5c0fd 100644
--- a/init/bootchartd.c
+++ b/init/bootchartd.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.
 */
 //config:config BOOTCHARTD
diff --git a/init/halt.c b/init/halt.c
index abd801fda..903953e80 100644
--- a/init/halt.c
+++ b/init/halt.c
@@ -4,7 +4,7 @@
 *
 * Copyright 2006 by Rob Landley <rob@landley.net>
 *
- * Licensed under GPL version 2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #include "libbb.h"
diff --git a/init/init.c b/init/init.c
index fa1af6d7c..5c0d11402 100644
--- a/init/init.c
+++ b/init/init.c
@@ -6,7 +6,7 @@
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 * Adjusted by so many folks, it's impossible to keep track.
 *
- * 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/init/mesg.c b/init/mesg.c
index 2e8b16e5d..ef5f0eb66 100644
--- a/init/mesg.c
+++ b/init/mesg.c
@@ -4,7 +4,7 @@
 *
 * Copyright (c) 2002 Manuel Novoa III  <mjn3@codepoet.org>
 *
- * 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/libbb/Kbuild.src b/libbb/Kbuild.src
index a6a163f3e..4fbf486b5 100644
--- a/libbb/Kbuild.src
+++ b/libbb/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.
 libbb/appletlib.o: include/usage_compressed.h
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index b470f30f9..751000e5d 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -7,9 +7,9 @@
 * here, please feel free to acknowledge your work.
 *
 * Based in part on code from sash, Copyright (c) 1999 by David I. Bell
- * Permission has been granted to redistribute this code under the GPL.
+ * Permission has been granted to redistribute this code under GPL.
 *
- * 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.
 */
 /* We are trying to not use printf, this benefits the case when selected
diff --git a/libbb/ask_confirmation.c b/libbb/ask_confirmation.c
index e0e94195e..d95729cc9 100644
--- a/libbb/ask_confirmation.c
+++ b/libbb/ask_confirmation.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
 *
- * 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.
 */
 /* Read a line from stdin.  If the first non-whitespace char is 'y' or 'Y',
diff --git a/libbb/bb_askpass.c b/libbb/bb_askpass.c
index 12ebe179e..9a4188f52 100644
--- a/libbb/bb_askpass.c
+++ b/libbb/bb_askpass.c
@@ -5,7 +5,7 @@
 *
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 *
- * 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/libbb/bb_basename.c b/libbb/bb_basename.c
index cc9b246e3..92fdb6545 100644
--- a/libbb/bb_basename.c
+++ b/libbb/bb_basename.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2007 Denys Vlasenko
 *
- * Licensed under GPL version 2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #include "libbb.h"
diff --git a/libbb/bb_do_delay.c b/libbb/bb_do_delay.c
index 139dc1878..05c879fb9 100644
--- a/libbb/bb_do_delay.c
+++ b/libbb/bb_do_delay.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2005 by Tito Ragusa <tito-wolit@tiscali.it>
 *
- * 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/libbb/bb_pwd.c b/libbb/bb_pwd.c
index d72857771..32406cb58 100644
--- a/libbb/bb_pwd.c
+++ b/libbb/bb_pwd.c
@@ -5,7 +5,7 @@
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 * Copyright (C) 2008 by 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/libbb/bb_qsort.c b/libbb/bb_qsort.c
index 9773afa6e..a54e7236a 100644
--- a/libbb/bb_qsort.c
+++ b/libbb/bb_qsort.c
@@ -4,7 +4,7 @@
 *
 * Copyright (c) 2008 Denys Vlasenko
 *
- * 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/libbb/bb_strtod.c b/libbb/bb_strtod.c
index 1e9671029..5dde78414 100644
--- a/libbb/bb_strtod.c
+++ b/libbb/bb_strtod.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 *
- * 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/libbb/bb_strtonum.c b/libbb/bb_strtonum.c
index 87cd744a7..c66c774f4 100644
--- a/libbb/bb_strtonum.c
+++ b/libbb/bb_strtonum.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 *
- * 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/libbb/chomp.c b/libbb/chomp.c
index ed4bf6beb..cb92befb1 100644
--- a/libbb/chomp.c
+++ b/libbb/chomp.c
@@ -5,7 +5,7 @@
 * Copyright (C) many different people.
 * If you wrote this, please acknowledge your work.
 *
- * 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/libbb/compare_string_array.c b/libbb/compare_string_array.c
index 599449fe0..4b10cc138 100644
--- a/libbb/compare_string_array.c
+++ b/libbb/compare_string_array.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/libbb/concat_path_file.c b/libbb/concat_path_file.c
index fb533547e..9ed295996 100644
--- a/libbb/concat_path_file.c
+++ b/libbb/concat_path_file.c
@@ -5,7 +5,7 @@
 * Copyright (C) many different people.
 * If you wrote this, please acknowledge your work.
 *
- * 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.
 */
 /* Concatenate path and filename to new allocated buffer.
diff --git a/libbb/concat_subpath_file.c b/libbb/concat_subpath_file.c
index 313fa63cf..c9167d492 100644
--- a/libbb/concat_subpath_file.c
+++ b/libbb/concat_subpath_file.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) (C) 2003  Vladimir Oleynik  <dzo@simtreas.ru>
 *
- * 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/libbb/copy_file.c b/libbb/copy_file.c
index 80a64f791..2134ee046 100644
--- a/libbb/copy_file.c
+++ b/libbb/copy_file.c
@@ -5,7 +5,7 @@
 * Copyright (C) 2001 by Matt Kraai <kraai@alumni.carnegiemellon.edu>
 * SELinux support by Yuichi Nakamura <ynakam@hitachisoft.jp>
 *
- * 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/libbb/copyfd.c b/libbb/copyfd.c
index 82622c06f..eda2747f9 100644
--- a/libbb/copyfd.c
+++ b/libbb/copyfd.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org>
 *
- * 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/libbb/crc32.c b/libbb/crc32.c
index 36ac86042..520b1ffb9 100644
--- a/libbb/crc32.c
+++ b/libbb/crc32.c
@@ -13,7 +13,7 @@
 * endian = 1: big-endian
 * endian = 0: little-endian
 *
- * 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/libbb/create_icmp6_socket.c b/libbb/create_icmp6_socket.c
index 91e478ec8..368c69028 100644
--- a/libbb/create_icmp6_socket.c
+++ b/libbb/create_icmp6_socket.c
@@ -5,7 +5,7 @@
 * create raw socket for icmp (IPv6 version) protocol
 * and drop root privileges if running setuid
 *
- * 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/libbb/create_icmp_socket.c b/libbb/create_icmp_socket.c
index d75f8452d..585626983 100644
--- a/libbb/create_icmp_socket.c
+++ b/libbb/create_icmp_socket.c
@@ -5,7 +5,7 @@
 * create raw socket for icmp protocol
 * and drop root privileges if running setuid
 *
- * 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/libbb/default_error_retval.c b/libbb/default_error_retval.c
index 0b19f2163..4da5b3efb 100644
--- a/libbb/default_error_retval.c
+++ b/libbb/default_error_retval.c
@@ -2,7 +2,7 @@
 /*
 * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
 *
- * 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.
 */
 /* Seems silly to copyright a global variable.  ;-)  Oh well.
diff --git a/libbb/device_open.c b/libbb/device_open.c
index cf8bcf646..a8fe2fcb4 100644
--- a/libbb/device_open.c
+++ b/libbb/device_open.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 *
- * 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/libbb/die_if_bad_username.c b/libbb/die_if_bad_username.c
index 8b4deec29..9946e3a1d 100644
--- a/libbb/die_if_bad_username.c
+++ b/libbb/die_if_bad_username.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2008 Tito Ragusa <farmatito@tiscali.it>
 *
- * 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/libbb/dump.c b/libbb/dump.c
index 7a87219ba..4db3f06f0 100644
--- a/libbb/dump.c
+++ b/libbb/dump.c
@@ -6,7 +6,7 @@
 * Copyright (c) 1989
 *      The Regents of the University of California.  All rights reserved.
 *
- * 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.
 *
 * Original copyright notice is retained at the end of this file.
 */
@@ -323,9 +323,7 @@ static void do_skip(priv_dumper_t *dumper, const char *fname, int statok)
        struct stat sbuf;
        if (statok) {
-                if (fstat(STDIN_FILENO, &sbuf)) {
+                xfstat(STDIN_FILENO, &sbuf, fname);
-                        bb_simple_perror_msg_and_die(fname);
-                }
                if (!(S_ISCHR(sbuf.st_mode) || S_ISBLK(sbuf.st_mode) || S_ISFIFO(sbuf.st_mode))
                 && dumper->pub.dump_skip >= sbuf.st_size
                ) {
diff --git a/libbb/execable.c b/libbb/execable.c
index de368fad0..3b144a730 100644
--- a/libbb/execable.c
+++ b/libbb/execable.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2006 Gabriel Somlo <somlo at cmu.edu>
 *
- * 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/libbb/fclose_nonstdin.c b/libbb/fclose_nonstdin.c
index 6f3f37332..5ce9d5b48 100644
--- a/libbb/fclose_nonstdin.c
+++ b/libbb/fclose_nonstdin.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
 *
- * 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.
 */
 /* A number of standard utilities can accept multiple command line args
diff --git a/libbb/fflush_stdout_and_exit.c b/libbb/fflush_stdout_and_exit.c
index 742fb9f58..9ad5dbf96 100644
--- a/libbb/fflush_stdout_and_exit.c
+++ b/libbb/fflush_stdout_and_exit.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
 *
- * 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.
 */
 /* Attempt to fflush(stdout), and exit with an error code if stdout is
diff --git a/libbb/fgets_str.c b/libbb/fgets_str.c
index 3fe61cdc3..89210a3c9 100644
--- a/libbb/fgets_str.c
+++ b/libbb/fgets_str.c
@@ -5,7 +5,7 @@
 * Copyright (C) many different people.
 * If you wrote this, please acknowledge your work.
 *
- * 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/libbb/find_mount_point.c b/libbb/find_mount_point.c
index bcb18effe..361698a6b 100644
--- a/libbb/find_mount_point.c
+++ b/libbb/find_mount_point.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 *
- * 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/libbb/find_pid_by_name.c b/libbb/find_pid_by_name.c
index 52a0c6dab..db823d05b 100644
--- a/libbb/find_pid_by_name.c
+++ b/libbb/find_pid_by_name.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 *
- * 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/libbb/find_root_device.c b/libbb/find_root_device.c
index ca46bf535..32c86cea8 100644
--- a/libbb/find_root_device.c
+++ b/libbb/find_root_device.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 *
- * 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/libbb/full_write.c b/libbb/full_write.c
index f353b7d55..a2abaee25 100644
--- a/libbb/full_write.c
+++ b/libbb/full_write.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 *
- * 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/libbb/get_console.c b/libbb/get_console.c
index 74022b543..9b6407bd0 100644
--- a/libbb/get_console.c
+++ b/libbb/get_console.c
@@ -5,7 +5,7 @@
 * Copyright (C) many different people.  If you wrote this, please
 * acknowledge your work.
 *
- * 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/libbb/get_cpu_count.c b/libbb/get_cpu_count.c
index edb7e6d37..ab468afdf 100644
--- a/libbb/get_cpu_count.c
+++ b/libbb/get_cpu_count.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2010 Marek Polacek <mmpolacek@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/libbb/get_last_path_component.c b/libbb/get_last_path_component.c
index 7c99116e9..72598d22e 100644
--- a/libbb/get_last_path_component.c
+++ b/libbb/get_last_path_component.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2001  Manuel Novoa III  <mjn3@codepoet.org>
 *
- * 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/libbb/get_line_from_file.c b/libbb/get_line_from_file.c
index cbfb45b7c..a0ed9193f 100644
--- a/libbb/get_line_from_file.c
+++ b/libbb/get_line_from_file.c
@@ -6,7 +6,7 @@
 * Copyright (C) 2004 Erik Andersen <andersen@codepoet.org>
 * Copyright (C) 2001 Matt Krai
 *
- * 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/libbb/get_volsize.c b/libbb/get_volsize.c
index 5b0270968..241ceda9b 100644
--- a/libbb/get_volsize.c
+++ b/libbb/get_volsize.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2010 Denys Vlasenko
 *
- * 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/libbb/getopt32.c b/libbb/getopt32.c
index bcb2db645..ab77755fc 100644
--- a/libbb/getopt32.c
+++ b/libbb/getopt32.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2003-2005  Vladimir Oleynik  <dzo@simtreas.ru>
 *
- * 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 <getopt.h>
diff --git a/libbb/getpty.c b/libbb/getpty.c
index 4bffd9ae6..ea653b0b6 100644
--- a/libbb/getpty.c
+++ b/libbb/getpty.c
@@ -3,7 +3,7 @@
 * Mini getpty implementation for busybox
 * Bjorn Wesen, Axis Communications AB (bjornw@axis.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/libbb/herror_msg.c b/libbb/herror_msg.c
index ca9274cf7..d041076e0 100644
--- a/libbb/herror_msg.c
+++ b/libbb/herror_msg.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 *
- * 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/libbb/human_readable.c b/libbb/human_readable.c
index 4228aaf42..22dc5d23f 100644
--- a/libbb/human_readable.c
+++ b/libbb/human_readable.c
@@ -25,7 +25,7 @@
 *      Some code to omit the decimal point and tenths digit is sketched out
 *      and "#if 0"'d below.
 *
- * 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/libbb/inet_common.c b/libbb/inet_common.c
index 0fc08d69d..b47259089 100644
--- a/libbb/inet_common.c
+++ b/libbb/inet_common.c
@@ -5,7 +5,7 @@
 *
 * Heavily modified by Manuel Novoa III       Mar 12, 2001
 *
- * 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/libbb/info_msg.c b/libbb/info_msg.c
index 81164faa0..56ca2efd4 100644
--- a/libbb/info_msg.c
+++ b/libbb/info_msg.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 *
- * 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/libbb/inode_hash.c b/libbb/inode_hash.c
index b32bd26bf..2aea08b04 100644
--- a/libbb/inode_hash.c
+++ b/libbb/inode_hash.c
@@ -5,7 +5,7 @@
 * Copyright (C) many different people.
 * If you wrote this, please acknowledge your work.
 *
- * 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/libbb/isdirectory.c b/libbb/isdirectory.c
index 4a2961e0d..9861be6f8 100644
--- a/libbb/isdirectory.c
+++ b/libbb/isdirectory.c
@@ -3,9 +3,9 @@
 * Utility routines.
 *
 * Based in part on code from sash, Copyright (c) 1999 by David I. Bell
- * Permission has been granted to redistribute this code under the GPL.
+ * Permission has been granted to redistribute this code under GPL.
 *
- * 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/stat.h>
diff --git a/libbb/kernel_version.c b/libbb/kernel_version.c
index cc237120d..a168a1e4e 100644
--- a/libbb/kernel_version.c
+++ b/libbb/kernel_version.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 *
- * 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/libbb/last_char_is.c b/libbb/last_char_is.c
index b0592568c..65e6cdf04 100644
--- a/libbb/last_char_is.c
+++ b/libbb/last_char_is.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 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/libbb/lineedit_ptr_hack.c b/libbb/lineedit_ptr_hack.c
index 53716a235..dc45855d5 100644
--- a/libbb/lineedit_ptr_hack.c
+++ b/libbb/lineedit_ptr_hack.c
@@ -2,7 +2,7 @@
 /*
 * Copyright (C) 2008 by 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.
 */
 struct lineedit_statics;
diff --git a/libbb/llist.c b/libbb/llist.c
index 51b1ce6c9..ed84e6472 100644
--- a/libbb/llist.c
+++ b/libbb/llist.c
@@ -7,7 +7,7 @@
 * Copyright (C) 2005 Bernhard Reutner-Fischer
 * Copyright (C) 2006 Rob Landley <rob@landley.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"
diff --git a/libbb/login.c b/libbb/login.c
index 740c588f3..aa2e17164 100644
--- a/libbb/login.c
+++ b/libbb/login.c
@@ -6,7 +6,7 @@
 *
 * Optimize and correcting OCRNL by Vladimir Oleynik <dzo@simtreas.ru>
 *
- * 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/libbb/loop.c b/libbb/loop.c
index eb7016d56..b798932fa 100644
--- a/libbb/loop.c
+++ b/libbb/loop.c
@@ -5,7 +5,7 @@
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 * Copyright (C) 2005 by Rob Landley <rob@landley.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/version.h>
diff --git a/libbb/make_directory.c b/libbb/make_directory.c
index 4bb79bdf6..1095b49a3 100644
--- a/libbb/make_directory.c
+++ b/libbb/make_directory.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
 *
- * 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.
 */
 /* Mar 5, 2003    Manuel Novoa III
diff --git a/libbb/makedev.c b/libbb/makedev.c
index ca71fdba6..cf59e616b 100644
--- a/libbb/makedev.c
+++ b/libbb/makedev.c
@@ -3,7 +3,7 @@
 *
 * Copyright (C) 2006 Denys Vlasenko
 *
- * Licensed under GPL version 2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 /* We do not include libbb.h - #define makedev() is there! */
diff --git a/libbb/match_fstype.c b/libbb/match_fstype.c
index 9360e757a..83d6e6770 100644
--- a/libbb/match_fstype.c
+++ b/libbb/match_fstype.c
@@ -7,7 +7,7 @@
 *
 * Returns 1 for a match, otherwise 0
 *
- * 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/libbb/md5.c b/libbb/md5.c
index a98631d0c..d8655ba91 100644
--- a/libbb/md5.c
+++ b/libbb/md5.c
@@ -1,16 +1,16 @@
 /* vi: set sw=4 ts=4: */
 /*
- *  md5.c - Compute MD5 checksum of strings according to the
+ * md5.c - Compute MD5 checksum of strings according to the
- *          definition of MD5 in RFC 1321 from April 1992.
+ *         definition of MD5 in RFC 1321 from April 1992.
 *
- *  Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
+ * Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995.
 *
- *  Copyright (C) 1995-1999 Free Software Foundation, Inc.
+ * Copyright (C) 1995-1999 Free Software Foundation, Inc.
- *  Copyright (C) 2001 Manuel Novoa III
+ * Copyright (C) 2001 Manuel Novoa III
- *  Copyright (C) 2003 Glenn L. McGrath
+ * Copyright (C) 2003 Glenn L. McGrath
- *  Copyright (C) 2003 Erik Andersen
+ * Copyright (C) 2003 Erik Andersen
 *
- *  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/libbb/messages.c b/libbb/messages.c
index ffa8d00cd..0c13449c0 100644
--- a/libbb/messages.c
+++ b/libbb/messages.c
@@ -2,7 +2,7 @@
 /*
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 *
- * 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/libbb/mode_string.c b/libbb/mode_string.c
index 7d4e514b1..f1afe7d61 100644
--- a/libbb/mode_string.c
+++ b/libbb/mode_string.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
 *
- * 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.
 */
 /* Aug 13, 2003
diff --git a/libbb/mtab.c b/libbb/mtab.c
index 586a66196..22bff6490 100644
--- a/libbb/mtab.c
+++ b/libbb/mtab.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 *
- * 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 <mntent.h>
diff --git a/libbb/mtab_file.c b/libbb/mtab_file.c
index c9d9a695e..add990ded 100644
--- a/libbb/mtab_file.c
+++ b/libbb/mtab_file.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 *
- * 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/libbb/obscure.c b/libbb/obscure.c
index 19b87523e..dd8cd319a 100644
--- a/libbb/obscure.c
+++ b/libbb/obscure.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2006 Tito Ragusa <farmatito@tiscali.it>
 *
- * 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.
 */
 /*      A good password:
@@ -45,53 +45,59 @@ static int string_checker_helper(const char *p1, const char *p2) __attribute__ (
 static int string_checker_helper(const char *p1, const char *p2)
 {
-        /* as-is or capitalized */
-        if (strcasecmp(p1, p2) == 0
        /* as sub-string */
-        || strcasestr(p2, p1) != NULL
+        if (strcasestr(p2, p1) != NULL
        /* invert in case haystack is shorter than needle */
-        || strcasestr(p1, p2) != NULL)
+         || strcasestr(p1, p2) != NULL
+        /* as-is or capitalized */
+        /* || strcasecmp(p1, p2) == 0 - 1st strcasestr should catch this too */
+        ) {
                return 1;
+        }
        return 0;
 }
 static int string_checker(const char *p1, const char *p2)
 {
-        int size;
+        int size, i;
        /* check string */
        int ret = string_checker_helper(p1, p2);
-        /* Make our own copy */
+        /* make our own copy */
        char *p = xstrdup(p1);
-        /* reverse string */
-        size = strlen(p);
-        while (size--) {
+        /* reverse string */
-                *p = p1[size];
+        i = size = strlen(p1);
-                p++;
+        while (--i >= 0) {
+                *p++ = p1[i];
        }
-        /* restore pointer */
+        p -= size; /* restore pointer */
-        p -= strlen(p1);
        /* check reversed string */
        ret |= string_checker_helper(p, p2);
        /* clean up */
-        memset(p, 0, strlen(p1));
+        memset(p, 0, size);
        free(p);
        return ret;
 }
-#define LOWERCASE          1
+#define CATEGORIES  4
-#define UPPERCASE          2
-#define NUMBERS            4
+#define LOWERCASE   1
-#define SPECIAL            8
+#define UPPERCASE   2
+#define NUMBERS     4
+#define SPECIAL     8
+#define LAST_CAT    8
 static const char *obscure_msg(const char *old_p, const char *new_p, const struct passwd *pw)
 {
-        int i;
+        unsigned length;
-        int c;
+        unsigned size;
-        int length;
+        unsigned mixed;
-        int mixed = 0;
+        unsigned c;
-        /* Add 2 for each type of characters to the minlen of password */
+        unsigned i;
-        int size = CONFIG_PASSWORD_MINLEN + 8;
        const char *p;
        char *hostname;
@@ -104,7 +110,7 @@ static const char *obscure_msg(const char *old_p, const char *new_p, const struc
                return "similar to username";
        }
        /* no gecos as-is, as sub-string, reversed, capitalized, doubled */
-        if (*pw->pw_gecos && string_checker(new_p, pw->pw_gecos)) {
+        if (pw->pw_gecos[0] && string_checker(new_p, pw->pw_gecos)) {
                return "similar to gecos";
        }
        /* hostname as-is, as sub-string, reversed, capitalized, doubled */
@@ -115,6 +121,7 @@ static const char *obscure_msg(const char *old_p, const char *new_p, const struc
                return "similar to hostname";
        /* Should / Must contain a mix of: */
+        mixed = 0;
        for (i = 0; i < length; i++) {
                if (islower(new_p[i])) {        /* a-z */
                        mixed |= LOWERCASE;
@@ -125,7 +132,7 @@ static const char *obscure_msg(const char *old_p, const char *new_p, const struc
                } else  {                       /* special characters */
                        mixed |= SPECIAL;
                }
-                /* More than 50% similar characters ? */
+                /* Count i'th char */
                c = 0;
                p = new_p;
                while (1) {
@@ -134,26 +141,31 @@ static const char *obscure_msg(const char *old_p, const char *new_p, const struc
                                break;
                        }
                        c++;
-                        if (!++p) {
+                        p++;
-                                break; /* move past the matched char if possible */
+                        if (!*p) {
+                                break;
                        }
                }
+                /* More than 50% similar characters ? */
-                if (c >= (length / 2)) {
+                if (c*2 >= length) {
                        return "too many similar characters";
                }
        }
-        for (i=0; i<4; i++)
-                if (mixed & (1<<i)) size -= 2;
+        size = CONFIG_PASSWORD_MINLEN + 2*CATEGORIES;
+        for (i = 1; i <= LAST_CAT; i <<= 1)
+                if (mixed & i)
+                        size -= 2;
        if (length < size)
                return "too weak";
-        if (old_p && old_p[0] != '\0') {
+        if (old_p && old_p[0]) {
                /* check vs. old password */
                if (string_checker(new_p, old_p)) {
                        return "similar to old password";
                }
        }
        return NULL;
 }
diff --git a/libbb/parse_config.c b/libbb/parse_config.c
index b7c3a00e0..3fff9f212 100644
--- a/libbb/parse_config.c
+++ b/libbb/parse_config.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2008 by Vladimir Dronnikov <dronnikov@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.
 * Also for use in uClibc (http://uclibc.org/) licensed under LGPLv2.1 or later.
 */
diff --git a/libbb/parse_mode.c b/libbb/parse_mode.c
index 6eca00ab1..8ea89163c 100644
--- a/libbb/parse_mode.c
+++ b/libbb/parse_mode.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
 *
- * 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.
 */
 /* http://www.opengroup.org/onlinepubs/007904975/utilities/chmod.html */
diff --git a/libbb/perror_msg.c b/libbb/perror_msg.c
index cbba805fb..fa1f0d339 100644
--- a/libbb/perror_msg.c
+++ b/libbb/perror_msg.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 *
- * 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/libbb/perror_nomsg.c b/libbb/perror_nomsg.c
index a157caa1f..a2a11cc8e 100644
--- a/libbb/perror_nomsg.c
+++ b/libbb/perror_nomsg.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
 *
- * 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.
 */
 /* gcc warns about a null format string, therefore we provide
diff --git a/libbb/perror_nomsg_and_die.c b/libbb/perror_nomsg_and_die.c
index d56e05d32..543ff5178 100644
--- a/libbb/perror_nomsg_and_die.c
+++ b/libbb/perror_nomsg_and_die.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
 *
- * 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.
 */
 /* gcc warns about a null format string, therefore we provide
diff --git a/libbb/pidfile.c b/libbb/pidfile.c
index 7b8fee21c..a48dfc38b 100644
--- a/libbb/pidfile.c
+++ b/libbb/pidfile.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2007 by Stephane Billiart <stephane.billiart@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.
 */
 /* Override ENABLE_FEATURE_PIDFILE */
diff --git a/libbb/platform.c b/libbb/platform.c
index 67048648f..30d06e3a7 100644
--- a/libbb/platform.c
+++ b/libbb/platform.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2009 by Dan Fandrich <dan@coneharvesters.com>, et. al.
 *
- * 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/libbb/print_flags.c b/libbb/print_flags.c
index 9639dc6f3..eaec731e5 100644
--- a/libbb/print_flags.c
+++ b/libbb/print_flags.c
@@ -3,7 +3,7 @@
 *
 * Copyright (C) 2008 Natanael Copa <natanael.copa@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.
 */
 #include "libbb.h"
diff --git a/libbb/printable.c b/libbb/printable.c
index ae9335932..f6ada4904 100644
--- a/libbb/printable.c
+++ b/libbb/printable.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2007 Denys Vlasenko
 *
- * Licensed under GPL version 2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #include "libbb.h"
diff --git a/libbb/printable_string.c b/libbb/printable_string.c
index 83a482196..a316f60de 100644
--- a/libbb/printable_string.c
+++ b/libbb/printable_string.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2010 Denys Vlasenko
 *
- * Licensed under GPL version 2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #include "libbb.h"
 #include "unicode.h"
diff --git a/libbb/process_escape_sequence.c b/libbb/process_escape_sequence.c
index 3ad908b57..82cbe10dc 100644
--- a/libbb/process_escape_sequence.c
+++ b/libbb/process_escape_sequence.c
@@ -5,7 +5,7 @@
 * Copyright (C) Manuel Novoa III <mjn3@codepoet.org>
 * and Vladimir Oleynik <dzo@simtreas.ru>
 *
- * 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/libbb/procps.c b/libbb/procps.c
index 48e60a792..14d4481bd 100644
--- a/libbb/procps.c
+++ b/libbb/procps.c
@@ -6,7 +6,7 @@
 * Copyright (C) 2002 by Vladimir Oleynik <dzo@simtreas.ru>
 * SELinux support: (c) 2007 by Yuichi Nakamura <ynakam@hitachisoft.jp>
 *
- * 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"
@@ -137,12 +137,9 @@ static unsigned long fast_strtoul_16(char **endptr)
        *endptr = str; /* We skip trailing space! */
        return n;
 }
-/* TOPMEM uses fast_strtoul_10, so... */
-# undef ENABLE_FEATURE_FAST_TOP
-# define ENABLE_FEATURE_FAST_TOP 1
 #endif
-#if ENABLE_FEATURE_FAST_TOP
+#if ENABLE_FEATURE_FAST_TOP || ENABLE_FEATURE_TOPMEM || ENABLE_PMAP
 /* We cut a lot of corners here for speed */
 static unsigned long fast_strtoul_10(char **endptr)
 {
@@ -177,6 +174,111 @@ static char *skip_fields(char *str, int count)
 }
 #endif
+#if ENABLE_FEATURE_TOPMEM || ENABLE_PMAP
+int FAST_FUNC procps_read_smaps(pid_t pid, struct smaprec *total,
+                      void (*cb)(struct smaprec *, void *), void *data)
+{
+        FILE *file;
+        struct smaprec currec;
+        char filename[sizeof("/proc/%u/smaps") + sizeof(int)*3];
+        char buf[PROCPS_BUFSIZE];
+#if !ENABLE_PMAP
+        void (*cb)(struct smaprec *, void *) = NULL;
+        void *data = NULL;
+#endif
+        sprintf(filename, "/proc/%u/smaps", (int)pid);
+        file = fopen_for_read(filename);
+        if (!file)
+                return 1;
+        memset(&currec, 0, sizeof(currec));
+        while (fgets(buf, PROCPS_BUFSIZE, file)) {
+                // Each mapping datum has this form:
+                // f7d29000-f7d39000 rw-s ADR M:m OFS FILE
+                // Size:                nnn kB
+                // Rss:                 nnn kB
+                // .....
+                char *tp = buf, *p;
+#define SCAN(S, X) \
+                if (strncmp(tp, S, sizeof(S)-1) == 0) {              \
+                        tp = skip_whitespace(tp + sizeof(S)-1);      \
+                        total->X += currec.X = fast_strtoul_10(&tp); \
+                        continue;                                    \
+                }
+                if (cb) {
+                        SCAN("Pss:"  , smap_pss     );
+                        SCAN("Swap:" , smap_swap    );
+                }
+                SCAN("Private_Dirty:", private_dirty);
+                SCAN("Private_Clean:", private_clean);
+                SCAN("Shared_Dirty:" , shared_dirty );
+                SCAN("Shared_Clean:" , shared_clean );
+#undef SCAN
+                tp = strchr(buf, '-');
+                if (tp) {
+                        // We reached next mapping - the line of this form:
+                        // f7d29000-f7d39000 rw-s ADR M:m OFS FILE
+                        if (cb) {
+                                /* If we have a previous record, there's nothing more
+                                 * for it, call the callback and clear currec
+                                 */
+                                if (currec.smap_size)
+                                        cb(&currec, data);
+                                free(currec.smap_name);
+                        }
+                        memset(&currec, 0, sizeof(currec));
+                        *tp = ' ';
+                        tp = buf;
+                        currec.smap_start = fast_strtoul_16(&tp);
+                        currec.smap_size = (fast_strtoul_16(&tp) - currec.smap_start) >> 10;
+                        strncpy(currec.smap_mode, tp, sizeof(currec.smap_mode)-1);
+                        // skipping "rw-s ADR M:m OFS "
+                        tp = skip_whitespace(skip_fields(tp, 4));
+                        // filter out /dev/something (something != zero)
+                        if (strncmp(tp, "/dev/", 5) != 0 || strcmp(tp, "/dev/zero\n") == 0) {
+                                if (currec.smap_mode[1] == 'w') {
+                                        currec.mapped_rw = currec.smap_size;
+                                        total->mapped_rw += currec.smap_size;
+                                } else if (currec.smap_mode[1] == '-') {
+                                        currec.mapped_ro = currec.smap_size;
+                                        total->mapped_ro += currec.smap_size;
+                                }
+                        }
+                        if (strcmp(tp, "[stack]\n") == 0)
+                                total->stack += currec.smap_size;
+                        if (cb) {
+                                p = skip_non_whitespace(tp);
+                                if (p == tp) {
+                                        currec.smap_name = xstrdup("  [ anon ]");
+                                } else {
+                                        *p = '\0';
+                                        currec.smap_name = xstrdup(tp);
+                                }
+                        }
+                        total->smap_size += currec.smap_size;
+                }
+        }
+        fclose(file);
+        if (cb) {
+                if (currec.smap_size)
+                        cb(&currec, data);
+                free(currec.smap_name);
+        }
+        return 0;
+}
+#endif
 void BUG_comm_size(void);
 procps_status_t* FAST_FUNC procps_scan(procps_status_t* sp, int flags)
 {
@@ -365,54 +467,8 @@ procps_status_t* FAST_FUNC procps_scan(procps_status_t* sp, int flags)
                }
 #if ENABLE_FEATURE_TOPMEM
-                if (flags & (PSSCAN_SMAPS)) {
+                if (flags & PSSCAN_SMAPS)
-                        FILE *file;
+                        procps_read_smaps(pid, &sp->smaps, NULL, NULL);
-                        strcpy(filename_tail, "smaps");
-                        file = fopen_for_read(filename);
-                        if (file) {
-                                while (fgets(buf, sizeof(buf), file)) {
-                                        unsigned long sz;
-                                        char *tp;
-                                        char w;
-#define SCAN(str, name) \
-        if (strncmp(buf, str, sizeof(str)-1) == 0) { \
-                tp = skip_whitespace(buf + sizeof(str)-1); \
-                sp->name += fast_strtoul_10(&tp); \
-                continue; \
-        }
-                                        SCAN("Shared_Clean:" , shared_clean );
-                                        SCAN("Shared_Dirty:" , shared_dirty );
-                                        SCAN("Private_Clean:", private_clean);
-                                        SCAN("Private_Dirty:", private_dirty);
-#undef SCAN
-                                        // f7d29000-f7d39000 rw-s ADR M:m OFS FILE
-                                        tp = strchr(buf, '-');
-                                        if (tp) {
-                                                *tp = ' ';
-                                                tp = buf;
-                                                sz = fast_strtoul_16(&tp); /* start */
-                                                sz = (fast_strtoul_16(&tp) - sz) >> 10; /* end - start */
-                                                // tp -> "rw-s" string
-                                                w = tp[1];
-                                                // skipping "rw-s ADR M:m OFS "
-                                                tp = skip_whitespace(skip_fields(tp, 4));
-                                                // filter out /dev/something (something != zero)
-                                                if (strncmp(tp, "/dev/", 5) != 0 || strcmp(tp, "/dev/zero\n") == 0) {
-                                                        if (w == 'w') {
-                                                                sp->mapped_rw += sz;
-                                                        } else if (w == '-') {
-                                                                sp->mapped_ro += sz;
-                                                        }
-                                                }
-//else printf("DROPPING %s (%s)\n", buf, tp);
-                                                if (strcmp(tp, "[stack]\n") == 0)
-                                                        sp->stack += sz;
-                                        }
-                                }
-                                fclose(file);
-                        }
-                }
 #endif /* TOPMEM */
 #if ENABLE_FEATURE_PS_ADDITIONAL_COLUMNS
                if (flags & PSSCAN_RUIDGID) {
diff --git a/libbb/ptr_to_globals.c b/libbb/ptr_to_globals.c
index 5f30e2a64..1074538f3 100644
--- a/libbb/ptr_to_globals.c
+++ b/libbb/ptr_to_globals.c
@@ -2,7 +2,7 @@
 /*
 * Copyright (C) 2008 by 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 <errno.h>
diff --git a/libbb/pw_encrypt.c b/libbb/pw_encrypt.c
index 6fc0ba87c..c6c04d44a 100644
--- a/libbb/pw_encrypt.c
+++ b/libbb/pw_encrypt.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 *
- * 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/libbb/read.c b/libbb/read.c
index 1ed7c5f92..5906bc225 100644
--- a/libbb/read.c
+++ b/libbb/read.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 *
- * 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/libbb/read_key.c b/libbb/read_key.c
index 64557ab14..840325c99 100644
--- a/libbb/read_key.c
+++ b/libbb/read_key.c
@@ -5,7 +5,7 @@
 * Copyright (C) 2008 Rob Landley <rob@landley.net>
 * Copyright (C) 2008 Denys Vlasenko <vda.linux@googlemail.com>
 *
- * Licensed under GPL version 2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #include "libbb.h"
diff --git a/libbb/read_printf.c b/libbb/read_printf.c
index 1b215f97a..7ca3d68c3 100644
--- a/libbb/read_printf.c
+++ b/libbb/read_printf.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 *
- * 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/libbb/recursive_action.c b/libbb/recursive_action.c
index 57262cd43..b5cf7c0ab 100644
--- a/libbb/recursive_action.c
+++ b/libbb/recursive_action.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 *
- * 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/libbb/remove_file.c b/libbb/remove_file.c
index da1488544..c6531a0b9 100644
--- a/libbb/remove_file.c
+++ b/libbb/remove_file.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2001 Matt Kraai <kraai@alumni.carnegiemellon.edu>
 *
- * 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/libbb/rtc.c b/libbb/rtc.c
index 97d18ed53..97455e86a 100644
--- a/libbb/rtc.c
+++ b/libbb/rtc.c
@@ -1,7 +1,7 @@
 /*
 * Common RTC functions
 *
- * 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/libbb/safe_gethostname.c b/libbb/safe_gethostname.c
index 05e095448..bdb989631 100644
--- a/libbb/safe_gethostname.c
+++ b/libbb/safe_gethostname.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2008 Tito Ragusa <farmatito@tiscali.it>
 *
- * 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/libbb/safe_poll.c b/libbb/safe_poll.c
index 58c7bda5a..b492a8151 100644
--- a/libbb/safe_poll.c
+++ b/libbb/safe_poll.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2007 by 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/libbb/safe_strncpy.c b/libbb/safe_strncpy.c
index 4acd9766b..8eb6a014f 100644
--- a/libbb/safe_strncpy.c
+++ b/libbb/safe_strncpy.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 *
- * 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/libbb/safe_write.c b/libbb/safe_write.c
index e3561f3cf..8f7628016 100644
--- a/libbb/safe_write.c
+++ b/libbb/safe_write.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 *
- * 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/libbb/selinux_common.c b/libbb/selinux_common.c
index 2acb50e96..62910e285 100644
--- a/libbb/selinux_common.c
+++ b/libbb/selinux_common.c
@@ -4,7 +4,7 @@
 *
 * Copyright 2007 KaiGai Kohei <kaigai@kaigai.gr.jp>
 *
- * 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 <selinux/context.h>
diff --git a/libbb/sha1.c b/libbb/sha1.c
index 5f42532cd..beeb70cf6 100644
--- a/libbb/sha1.c
+++ b/libbb/sha1.c
@@ -7,7 +7,7 @@
 * Copyright (C) 2003 Glenn L. McGrath
 * Copyright (C) 2003 Erik Andersen
 *
- * 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.
 *
 * ---------------------------------------------------------------------------
 * Issue Date: 10/11/2002
diff --git a/libbb/signals.c b/libbb/signals.c
index a528756ff..cdc37b1ef 100644
--- a/libbb/signals.c
+++ b/libbb/signals.c
@@ -6,7 +6,7 @@
 * Copyright (C) 2006 Rob Landley
 * Copyright (C) 2006 Denys Vlasenko
 *
- * Licensed under GPL version 2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #include "libbb.h"
diff --git a/libbb/simplify_path.c b/libbb/simplify_path.c
index f80e3e8a5..3818d32be 100644
--- a/libbb/simplify_path.c
+++ b/libbb/simplify_path.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2001  Manuel Novoa III  <mjn3@codepoet.org>
 *
- * 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/libbb/single_argv.c b/libbb/single_argv.c
index 6173c884e..85137b40f 100644
--- a/libbb/single_argv.c
+++ b/libbb/single_argv.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2009 Denys Vlasenko
 *
- * 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/libbb/skip_whitespace.c b/libbb/skip_whitespace.c
index f5a61a3cf..8c7b674c3 100644
--- a/libbb/skip_whitespace.c
+++ b/libbb/skip_whitespace.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
 *
- * 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/libbb/speed_table.c b/libbb/speed_table.c
index af676e1eb..6f95c54e6 100644
--- a/libbb/speed_table.c
+++ b/libbb/speed_table.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
 *
- * 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/libbb/str_tolower.c b/libbb/str_tolower.c
index f402e8e6f..c2d563798 100644
--- a/libbb/str_tolower.c
+++ b/libbb/str_tolower.c
@@ -1,7 +1,7 @@
 /* vi set: sw=4 ts=4: */
 /* Convert string str to lowercase, return str.
 *
- * 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/libbb/strrstr.c b/libbb/strrstr.c
index d201f5172..d8823fc51 100644
--- a/libbb/strrstr.c
+++ b/libbb/strrstr.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2008 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.
 */
 #ifdef __DO_STRRSTR_TEST
diff --git a/libbb/time.c b/libbb/time.c
index 8d176e52e..2a74d34c2 100644
--- a/libbb/time.c
+++ b/libbb/time.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2007 Denys Vlasenko
 *
- * Licensed under GPL version 2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #include "libbb.h"
diff --git a/libbb/trim.c b/libbb/trim.c
index df00b846e..16cb4fbb0 100644
--- a/libbb/trim.c
+++ b/libbb/trim.c
@@ -5,7 +5,7 @@
 * Copyright (C) many different people.
 * If you wrote this, please acknowledge your work.
 *
- * 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/libbb/u_signal_names.c b/libbb/u_signal_names.c
index 915eea579..9263859f5 100644
--- a/libbb/u_signal_names.c
+++ b/libbb/u_signal_names.c
@@ -4,7 +4,7 @@
 *
 * Copyright 2006 Rob Landley <rob@landley.net>
 *
- * 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/libbb/udp_io.c b/libbb/udp_io.c
index 24237be99..b8fb6755d 100644
--- a/libbb/udp_io.c
+++ b/libbb/udp_io.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2007 Denys Vlasenko
 *
- * Licensed under GPL version 2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #include "libbb.h"
diff --git a/libbb/unicode.c b/libbb/unicode.c
index d6fcf7a43..c4b5f86ee 100644
--- a/libbb/unicode.c
+++ b/libbb/unicode.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2009 Denys Vlasenko
 *
- * Licensed under GPL version 2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #include "libbb.h"
 #include "unicode.h"
diff --git a/libbb/update_passwd.c b/libbb/update_passwd.c
index f5ce1f955..a2be0f155 100644
--- a/libbb/update_passwd.c
+++ b/libbb/update_passwd.c
@@ -11,7 +11,7 @@
 * Modified to be able to add or delete users, groups and users to/from groups
 * by Tito Ragusa <farmatito@tiscali.it>
 *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #include "libbb.h"
@@ -133,7 +133,7 @@ int FAST_FUNC update_passwd(const char *filename,
        goto close_old_fp;
 created:
-        if (!fstat(old_fd, &sb)) {
+        if (fstat(old_fd, &sb) == 0) {
                fchmod(new_fd, sb.st_mode & 0777); /* ignore errors */
                fchown(new_fd, sb.st_uid, sb.st_gid);
        }
diff --git a/libbb/utmp.c b/libbb/utmp.c
index 68c358e9a..2bf9c11f2 100644
--- a/libbb/utmp.c
+++ b/libbb/utmp.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2010 Denys Vlasenko
 *
- * Licensed under GPL version 2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #include "libbb.h"
 #include <utmp.h>
diff --git a/libbb/uuencode.c b/libbb/uuencode.c
index 67d98d598..181f49de0 100644
--- a/libbb/uuencode.c
+++ b/libbb/uuencode.c
@@ -2,7 +2,7 @@
 /*
 * Copyright 2006 Rob Landley <rob@landley.net>
 *
- * 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/libbb/vdprintf.c b/libbb/vdprintf.c
index 09fffbca8..feeb403a0 100644
--- a/libbb/vdprintf.c
+++ b/libbb/vdprintf.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 *
- * 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/libbb/verror_msg.c b/libbb/verror_msg.c
index c5fbc380c..ee95be3e3 100644
--- a/libbb/verror_msg.c
+++ b/libbb/verror_msg.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 *
- * 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"
 #if ENABLE_FEATURE_SYSLOG
diff --git a/libbb/vfork_daemon_rexec.c b/libbb/vfork_daemon_rexec.c
index 2b6ee9e74..1fbb1bba9 100644
--- a/libbb/vfork_daemon_rexec.c
+++ b/libbb/vfork_daemon_rexec.c
@@ -12,7 +12,7 @@
 *
 * Modified for uClibc by Erik Andersen <andersee@debian.org>
 *
- * 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 "busybox.h" /* uses applet tables */
diff --git a/libbb/warn_ignoring_args.c b/libbb/warn_ignoring_args.c
index fa33c258f..3f3025c03 100644
--- a/libbb/warn_ignoring_args.c
+++ b/libbb/warn_ignoring_args.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
 *
- * 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/libbb/wfopen.c b/libbb/wfopen.c
index deec79a28..76dc8b82a 100644
--- a/libbb/wfopen.c
+++ b/libbb/wfopen.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 *
- * 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/libbb/wfopen_input.c b/libbb/wfopen_input.c
index 46ff7a6de..422a58ecf 100644
--- a/libbb/wfopen_input.c
+++ b/libbb/wfopen_input.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
 *
- * 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.
 */
 /* A number of applets need to open a file for reading, where the filename
@@ -46,3 +46,11 @@ int FAST_FUNC open_or_warn_stdin(const char *filename)
        return fd;
 }
+int FAST_FUNC xopen_stdin(const char *filename)
+{
+        int fd = open_or_warn_stdin(filename);
+        if (fd >= 0)
+                return fd;
+        xfunc_die();    /* We already output an error message. */
+}
diff --git a/libbb/write.c b/libbb/write.c
index 116e4d153..2d67a7281 100644
--- a/libbb/write.c
+++ b/libbb/write.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2008 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/libbb/xatonum.c b/libbb/xatonum.c
index 60b65f525..62bbe53e7 100644
--- a/libbb/xatonum.c
+++ b/libbb/xatonum.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2003  Manuel Novoa III  <mjn3@codepoet.org>
 *
- * 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/libbb/xatonum_template.c b/libbb/xatonum_template.c
index c97a4b795..f67b50710 100644
--- a/libbb/xatonum_template.c
+++ b/libbb/xatonum_template.c
@@ -1,6 +1,6 @@
 /*
 *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 /*
 You need to define the following (example):
diff --git a/libbb/xconnect.c b/libbb/xconnect.c
index 2de6de7c5..3a6585caa 100644
--- a/libbb/xconnect.c
+++ b/libbb/xconnect.c
@@ -4,7 +4,7 @@
 *
 * Connect to host at port using address resolution from getaddrinfo
 *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #include <sys/types.h>
diff --git a/libbb/xfunc_die.c b/libbb/xfunc_die.c
index ba9fe935a..204e5e49d 100644
--- a/libbb/xfunc_die.c
+++ b/libbb/xfunc_die.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2008 by 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.
 */
 /* Keeping it separate allows to NOT suck in stdio for VERY small applets.
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
index 275dd4b62..07504b75b 100644
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -6,7 +6,7 @@
 * Copyright (C) 2006 Rob Landley
 * Copyright (C) 2006 Denys Vlasenko
 *
- * Licensed under GPL version 2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 /* We need to have separate xfuncs.c and xfuncs_printf.c because
diff --git a/libbb/xfuncs_printf.c b/libbb/xfuncs_printf.c
index 31a6d8e3c..ae950f94f 100644
--- a/libbb/xfuncs_printf.c
+++ b/libbb/xfuncs_printf.c
@@ -6,7 +6,7 @@
 * Copyright (C) 2006 Rob Landley
 * Copyright (C) 2006 Denys Vlasenko
 *
- * Licensed under GPL version 2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 /* We need to have separate xfuncs.c and xfuncs_printf.c because
@@ -450,6 +450,16 @@ void FAST_FUNC xstat(const char *name, struct stat *stat_buf)
                bb_perror_msg_and_die("can't stat '%s'", name);
 }
+void FAST_FUNC xfstat(int fd, struct stat *stat_buf, const char *errmsg)
+{
+        /* errmsg is usually a file name, but not always:
+         * xfstat may be called in a spot where file name is no longer
+         * available, and caller may give e.g. "can't stat input file" string.
+         */
+        if (fstat(fd, stat_buf))
+                bb_simple_perror_msg_and_die(errmsg);
+}
 // selinux_or_die() - die if SELinux is disabled.
 void FAST_FUNC selinux_or_die(void)
 {
diff --git a/libbb/xgetcwd.c b/libbb/xgetcwd.c
index 10febe32d..97367217e 100644
--- a/libbb/xgetcwd.c
+++ b/libbb/xgetcwd.c
@@ -6,7 +6,7 @@
 *
 * Special function for busybox written by Vladimir Oleynik <dzo@simtreas.ru>
 *
- * 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/libbb/xgethostbyname.c b/libbb/xgethostbyname.c
index 7afa9b696..89d0329cc 100644
--- a/libbb/xgethostbyname.c
+++ b/libbb/xgethostbyname.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2001 Matt Kraai <kraai@alumni.carnegiemellon.edu>.
 *
- * 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/libbb/xreadlink.c b/libbb/xreadlink.c
index 1a012456f..f2faa6d7a 100644
--- a/libbb/xreadlink.c
+++ b/libbb/xreadlink.c
@@ -3,7 +3,7 @@
 * xreadlink.c - safe implementation of readlink.
 * Returns a NULL on failure...
 *
- * 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/libbb/xrealloc_vector.c b/libbb/xrealloc_vector.c
index 98fa9678e..e8d31b7e4 100644
--- a/libbb/xrealloc_vector.c
+++ b/libbb/xrealloc_vector.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2008 Denys Vlasenko
 *
- * 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/libbb/xregcomp.c b/libbb/xregcomp.c
index 61efb5bc6..344028f44 100644
--- a/libbb/xregcomp.c
+++ b/libbb/xregcomp.c
@@ -5,7 +5,7 @@
 * Copyright (C) many different people.
 * If you wrote this, please acknowledge your work.
 *
- * 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/libpwdgrp/Kbuild.src b/libpwdgrp/Kbuild.src
index f9f1ddbf3..d15e3a2d1 100644
--- a/libpwdgrp/Kbuild.src
+++ b/libpwdgrp/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 := uidgid_get.o
diff --git a/libpwdgrp/pwd_grp.c b/libpwdgrp/pwd_grp.c
index 34690a738..06f3607a0 100644
--- a/libpwdgrp/pwd_grp.c
+++ b/libpwdgrp/pwd_grp.c
@@ -1,21 +1,20 @@
 /* vi: set sw=4 ts=4: */
-/*  Copyright (C) 2003     Manuel Novoa III
+/* Copyright (C) 2003     Manuel Novoa III
 *
- *  Licensed under GPL v2, or later.  See file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
 */
-/*  Nov 6, 2003  Initial version.
+/* Nov 6, 2003  Initial version.
 *
- *  NOTE: This implementation is quite strict about requiring all
+ * NOTE: This implementation is quite strict about requiring all
 *    field seperators.  It also does not allow leading whitespace
 *    except when processing the numeric fields.  glibc is more
 *    lenient.  See the various glibc difference comments below.
 *
- *  TODO:
+ * TODO:
 *    Move to dynamic allocation of (currently statically allocated)
 *      buffers; especially for the group-related functions since
 *      large group member lists will cause error returns.
- *
 */
 #include "libbb.h"
diff --git a/libpwdgrp/pwd_grp_internal.c b/libpwdgrp/pwd_grp_internal.c
index ffdc85e4e..04e436fae 100644
--- a/libpwdgrp/pwd_grp_internal.c
+++ b/libpwdgrp/pwd_grp_internal.c
@@ -1,21 +1,20 @@
 /* vi: set sw=4 ts=4: */
-/*  Copyright (C) 2003     Manuel Novoa III
+/* Copyright (C) 2003     Manuel Novoa III
 *
- *  Licensed under GPL v2, or later.  See file LICENSE in this tarball.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
 */
-/*  Nov 6, 2003  Initial version.
+/* Nov 6, 2003  Initial version.
 *
- *  NOTE: This implementation is quite strict about requiring all
+ * NOTE: This implementation is quite strict about requiring all
 *    field seperators.  It also does not allow leading whitespace
 *    except when processing the numeric fields.  glibc is more
 *    lenient.  See the various glibc difference comments below.
 *
- *  TODO:
+ * TODO:
 *    Move to dynamic allocation of (currently statically allocated)
 *      buffers; especially for the group-related functions since
 *      large group member lists will cause error returns.
- *
 */
 #ifndef GETXXKEY_R_FUNC
diff --git a/loginutils/Kbuild.src b/loginutils/Kbuild.src
index fd1ea06c1..ef416a76f 100644
--- a/loginutils/Kbuild.src
+++ b/loginutils/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/loginutils/addgroup.c b/loginutils/addgroup.c
index 78ca22585..5a0714501 100644
--- a/loginutils/addgroup.c
+++ b/loginutils/addgroup.c
@@ -6,7 +6,7 @@
 * Copyright (C) 1999,2000,2001 by John Beppu <beppu@codepoet.org>
 * Copyright (C) 2007 by Tito Ragusa <farmatito@tiscali.it>
 *
- * 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/loginutils/adduser.c b/loginutils/adduser.c
index f5dca929f..1a9949e97 100644
--- a/loginutils/adduser.c
+++ b/loginutils/adduser.c
@@ -5,7 +5,7 @@
 * Copyright (C) 1999 by Lineo, inc. and John Beppu
 * Copyright (C) 1999,2000,2001 by John Beppu <beppu@codepoet.org>
 *
- * 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/loginutils/chpasswd.c b/loginutils/chpasswd.c
index 181723169..101920c03 100644
--- a/loginutils/chpasswd.c
+++ b/loginutils/chpasswd.c
@@ -3,7 +3,7 @@
 * chpasswd.c
 *
 * Written for SLIND (from passwd.c) by Alexander Shishkin <virtuoso@slind.org>
- * 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/loginutils/cryptpw.c b/loginutils/cryptpw.c
index b44993f06..f32cbceb9 100644
--- a/loginutils/cryptpw.c
+++ b/loginutils/cryptpw.c
@@ -2,12 +2,12 @@
 /*
 * cryptpw.c - output a crypt(3)ed password to stdout.
 *
- * 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.
 *
 * Cooked from passwd.c by Thomas Lundquist <thomasez@zelow.no>
 * mkpasswd compatible options added by Bernhard Reutner-Fischer
 *
- * 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/loginutils/deluser.c b/loginutils/deluser.c
index 293e324b0..e234d6678 100644
--- a/loginutils/deluser.c
+++ b/loginutils/deluser.c
@@ -6,7 +6,7 @@
 * Copyright (C) 1999,2000,2001 by John Beppu <beppu@codepoet.org>
 * Copyright (C) 2007 by Tito Ragusa <farmatito@tiscali.it>
 *
- * Licensed under GPL version 2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 *
 */
 #include "libbb.h"
diff --git a/loginutils/getty.c b/loginutils/getty.c
index 7f04d33fb..b1cd235fb 100644
--- a/loginutils/getty.c
+++ b/loginutils/getty.c
@@ -12,7 +12,7 @@
 * 1999-05-05 Thorsten Kranzkowski <dl8bcu@gmx.net>
 * - enable hardware flow control before displaying /etc/issue
 *
- * 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"
@@ -216,9 +216,7 @@ static void parse_args(char **argv, struct options *op, char **fakehost_p)
                ts = argv[0];   /* baud rate(s) */
        }
        parse_speeds(op, ts);
+        applet_name = xasprintf("getty: %s", op->tty);
-// TODO: if applet_name is set to "getty: TTY", bb_error_msg's get simpler!
-// grep for "%s:"
        if (argv[2])
                xsetenv("TERM", argv[2]);
@@ -240,7 +238,7 @@ static void open_tty(const char *tty)
 //              xchdir("/dev");
 //              xstat(tty, &st);
 //              if (!S_ISCHR(st.st_mode))
-//                      bb_error_msg_and_die("%s: not a character device", tty);
+//                      bb_error_msg_and_die("not a character device");
                if (tty[0] != '/')
                        tty = xasprintf("/dev/%s", tty); /* will leak it */
@@ -434,7 +432,7 @@ static char *get_logname(char *logname, unsigned size_logname,
                        if (read(STDIN_FILENO, &c, 1) < 1) {
                                if (errno == EINTR || errno == EIO)
                                        exit(EXIT_SUCCESS);
-                                bb_perror_msg_and_die("%s: read", op->tty);
+                                bb_perror_msg_and_die(bb_msg_read_error);
                        }
                        /* BREAK. If we have speeds to try,
@@ -490,7 +488,7 @@ static char *get_logname(char *logname, unsigned size_logname,
                                if (ascval < ' ') {
                                        /* ignore garbage characters */
                                } else if ((int)(bp - logname) >= size_logname - 1) {
-                                        bb_error_msg_and_die("%s: input overrun", op->tty);
+                                        bb_error_msg_and_die("input overrun");
                                } else {
                                        full_write(STDOUT_FILENO, &c, 1); /* echo the character */
                                        *bp++ = ascval; /* and store it */
@@ -574,7 +572,7 @@ static void termios_final(struct options *op, struct termios *tp, struct chardat
        /* Finally, make the new settings effective */
        if (tcsetattr_stdin_TCSANOW(tp) < 0)
-                bb_perror_msg_and_die("%s: tcsetattr", op->tty);
+                bb_perror_msg_and_die("tcsetattr");
 }
 int getty_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -652,7 +650,7 @@ int getty_main(int argc UNUSED_PARAM, char **argv)
         * 5 seconds seems to be a good value.
         */
        if (tcgetattr(0, &termios) < 0)
-                bb_perror_msg_and_die("%s: tcgetattr", options.tty);
+                bb_perror_msg_and_die("tcgetattr");
        pid = getpid();
 #ifdef __linux__
@@ -733,5 +731,5 @@ int getty_main(int argc UNUSED_PARAM, char **argv)
         * and getty is not suid-root applet. */
        /* With -n, logname == NULL, and login will ask for username instead */
        BB_EXECLP(options.login, options.login, "--", logname, NULL);
-        bb_error_msg_and_die("%s: can't exec %s", options.tty, options.login);
+        bb_error_msg_and_die("can't execute '%s'", options.login);
 }
diff --git a/loginutils/login.c b/loginutils/login.c
index 10012486f..e104fbb93 100644
--- a/loginutils/login.c
+++ b/loginutils/login.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"
 #include <syslog.h>
diff --git a/loginutils/passwd.c b/loginutils/passwd.c
index b447af2f5..728e61867 100644
--- a/loginutils/passwd.c
+++ b/loginutils/passwd.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"
 #include <syslog.h>
diff --git a/loginutils/su.c b/loginutils/su.c
index 9bae37551..5bec4bc8b 100644
--- a/loginutils/su.c
+++ b/loginutils/su.c
@@ -1,8 +1,8 @@
 /* vi: set sw=4 ts=4: */
 /*
- *  Mini su implementation for busybox
+ * Mini su implementation for busybox
 *
- *  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/loginutils/sulogin.c b/loginutils/sulogin.c
index 3516013f1..307536721 100644
--- a/loginutils/sulogin.c
+++ b/loginutils/sulogin.c
@@ -2,7 +2,7 @@
 /*
 * Mini sulogin implementation for busybox
 *
- * 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/loginutils/vlock.c b/loginutils/vlock.c
index 59aeb54e8..216b317f1 100644
--- a/loginutils/vlock.c
+++ b/loginutils/vlock.c
@@ -5,7 +5,7 @@
 * Copyright (C) 2000 by spoon <spoon@ix.netcom.com>
 * Written by spoon <spon@ix.netcom.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.
 */
 /* Shoutz to Michael K. Johnson <johnsonm@redhat.com>, author of the
diff --git a/mailutils/Kbuild.src b/mailutils/Kbuild.src
index b2fb73515..20220dac8 100644
--- a/mailutils/Kbuild.src
+++ b/mailutils/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/mailutils/mail.c b/mailutils/mail.c
index bcd358302..8e52a3efc 100644
--- a/mailutils/mail.c
+++ b/mailutils/mail.c
@@ -4,7 +4,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"
 #include "mail.h"
diff --git a/mailutils/mime.c b/mailutils/mime.c
index 5eb8ef6f2..44c7d0216 100644
--- a/mailutils/mime.c
+++ b/mailutils/mime.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"
 #include "mail.h"
diff --git a/mailutils/popmaildir.c b/mailutils/popmaildir.c
index ab9ddbaed..f37db03d5 100644
--- a/mailutils/popmaildir.c
+++ b/mailutils/popmaildir.c
@@ -7,7 +7,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"
 #include "mail.h"
diff --git a/mailutils/sendmail.c b/mailutils/sendmail.c
index 4b58a78eb..59591ee4b 100644
--- a/mailutils/sendmail.c
+++ b/mailutils/sendmail.c
@@ -4,7 +4,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"
 #include "mail.h"
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"
diff --git a/modutils/Kbuild.src b/modutils/Kbuild.src
index a512f6066..1a7ac8751 100644
--- a/modutils/Kbuild.src
+++ b/modutils/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/modutils/depmod.c b/modutils/depmod.c
index 694f9ea5a..006a7bcc1 100644
--- a/modutils/depmod.c
+++ b/modutils/depmod.c
@@ -5,7 +5,7 @@
 * Copyrihgt (c) 2008 Timo Teras <timo.teras@iki.fi>
 * Copyright (c) 2008 Vladimir Dronnikov
 *
- * 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/modutils/insmod.c b/modutils/insmod.c
index b88446c10..17fc18c09 100644
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2008 Timo Teras <timo.teras@iki.fi>
 *
- * 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/modutils/lsmod.c b/modutils/lsmod.c
index 97954c71f..9558a2510 100644
--- a/modutils/lsmod.c
+++ b/modutils/lsmod.c
@@ -5,7 +5,7 @@
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 * Copyright (C) 2008 by Vladimir Dronnikov <dronnikov@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.
 */
 #include "libbb.h"
 #include "unicode.h"
diff --git a/modutils/modinfo.c b/modutils/modinfo.c
index 454a1b366..37ba77edf 100644
--- a/modutils/modinfo.c
+++ b/modutils/modinfo.c
@@ -3,7 +3,7 @@
 * modinfo - retrieve module info
 * Copyright (c) 2008 Pascal Bellard
 *
- * 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_MODINFO(APPLET(modinfo, _BB_DIR_SBIN, _BB_SUID_DROP))
diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c
index 0e1874ed4..05f2c34eb 100644
--- a/modutils/modprobe-small.c
+++ b/modutils/modprobe-small.c
@@ -5,7 +5,7 @@
 * Copyright (c) 2008 Vladimir Dronnikov
 * Copyright (c) 2008 Bernhard Reutner-Fischer (initial depmod code)
 *
- * 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/modutils/modprobe.c b/modutils/modprobe.c
index 0a9424293..ab35628f4 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -5,7 +5,7 @@
 * Copyright (c) 2008 Timo Teras <timo.teras@iki.fi>
 * Copyright (c) 2008 Vladimir Dronnikov
 *
- * 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.
 */
 /* Note that unlike older versions of modules.dep/depmod (busybox and m-i-t),
diff --git a/modutils/modutils-24.c b/modutils/modutils-24.c
index c42d3c0bb..7228954d6 100644
--- a/modutils/modutils-24.c
+++ b/modutils/modutils-24.c
@@ -55,7 +55,7 @@
 *   Restructured (and partly rewritten) by:
 *   Bj�rn Ekwall <bj0rn@blox.se> February 1999
 *
- * 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/modutils/modutils.c b/modutils/modutils.c
index 850a8683b..565d0d22f 100644
--- a/modutils/modutils.c
+++ b/modutils/modutils.c
@@ -3,7 +3,7 @@
 *
 * Copyright (C) 2008 by Timo Teras <timo.teras@iki.fi>
 *
- * 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 "modutils.h"
@@ -71,8 +71,12 @@ char* FAST_FUNC parse_cmdline_module_options(char **argv)
        optlen = 0;
        while (*++argv) {
                options = xrealloc(options, optlen + 2 + strlen(*argv) + 2);
-                /* Spaces handled by "" pairs, but no way of escaping quotes */
+                /* Older versions were enclosing space-containing *argv in "",
-                optlen += sprintf(options + optlen, (strchr(*argv, ' ') ? "\"%s\" " : "%s "), *argv);
+                 * but both modprobe and insmod from module-init-tools 3.11.1
+                 * don't do this anymore. (As to extra trailing space,
+                 * insmod adds it but modprobe does not. We do in both cases)
+                 */
+                optlen += sprintf(options + optlen, "%s ", *argv);
        }
        return options;
 }
diff --git a/modutils/modutils.h b/modutils/modutils.h
index d46870ca6..863bc26d3 100644
--- a/modutils/modutils.h
+++ b/modutils/modutils.h
@@ -3,7 +3,7 @@
 *
 * Copyright (C) 2008 by Timo Teras <timo.teras@iki.fi>
 *
- * 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.
 */
 #ifndef MODUTILS_H
diff --git a/modutils/rmmod.c b/modutils/rmmod.c
index ee32dfdef..aa1bb01d6 100644
--- a/modutils/rmmod.c
+++ b/modutils/rmmod.c
@@ -5,7 +5,7 @@
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 * Copyright (C) 2008 Timo Teras <timo.teras@iki.fi>
 *
- * 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/networking/Kbuild.src b/networking/Kbuild.src
index e1a4ebcb3..f41a2df70 100644
--- a/networking/Kbuild.src
+++ b/networking/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/networking/arping.c b/networking/arping.c
index effe418a6..f2b12ed04 100644
--- a/networking/arping.c
+++ b/networking/arping.c
@@ -2,7 +2,7 @@
 /*
 * arping.c - Ping hosts by ARP requests/replies
 *
- * 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.
 *
 * Author:      Alexey Kuznetsov <kuznet@ms2.inr.ac.ru>
 * Busybox port: Nick Fedchik <nick@fedchik.org.ua>
diff --git a/networking/brctl.c b/networking/brctl.c
index 0f56412ce..0defce46a 100644
--- a/networking/brctl.c
+++ b/networking/brctl.c
@@ -7,7 +7,7 @@
 * Some helper functions from bridge-utils are
 * Copyright (C) 2000 Lennert Buytenhek
 *
- * 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 applet currently uses only the ioctl interface and no sysfs at all.
 * At the time of this writing this was considered a feature.
diff --git a/networking/dnsd.c b/networking/dnsd.c
index 1a99040ac..92d4867aa 100644
--- a/networking/dnsd.c
+++ b/networking/dnsd.c
@@ -6,7 +6,7 @@
 * Copyright (C) 2005 Odd Arild Olsen (oao at fibula dot no)
 * Copyright (C) 2003 Paul Sheer
 *
- * 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.
 *
 * Odd Arild Olsen started out with the sheerdns [1] of Paul Sheer and rewrote
 * it into a shape which I believe is both easier to understand and maintain.
diff --git a/networking/ether-wake.c b/networking/ether-wake.c
index deeb68c09..121f15366 100644
--- a/networking/ether-wake.c
+++ b/networking/ether-wake.c
@@ -2,7 +2,7 @@
 /*
 * ether-wake.c - Send a magic packet to wake up sleeping machines.
 *
- * 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.
 *
 * Author:      Donald Becker, http://www.scyld.com/"; http://www.scyld.com/wakeonlan.html
 * Busybox port: Christian Volkmann <haveaniceday@online.de>
diff --git a/networking/ftpd.c b/networking/ftpd.c
index 0daf9f7a3..64068e467 100644
--- a/networking/ftpd.c
+++ b/networking/ftpd.c
@@ -4,7 +4,7 @@
 *
 * Author: Adam Tkac <vonsch@gmail.com>
 *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 *
 * Only subset of FTP protocol is implemented but vast majority of clients
 * should not have any problem.
diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c
index 120ccff83..c68d0ace2 100644
--- a/networking/ftpgetput.c
+++ b/networking/ftpgetput.c
@@ -10,7 +10,7 @@
 * Based on wget.c by Chip Rosenthal Covad Communications
 * <chip@laserlink.net>
 *
- * 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/networking/hostname.c b/networking/hostname.c
index 121ad40bb..66b52dd90 100644
--- a/networking/hostname.c
+++ b/networking/hostname.c
@@ -7,7 +7,7 @@
 * Adjusted by Erik Andersen <andersen@codepoet.org> to remove
 * use of long options and GNU getopt.  Improved the usage info.
 *
- * 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/networking/httpd.c b/networking/httpd.c
index 3fea3f04c..c174958e2 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -5,7 +5,7 @@
 * Copyright (C) 2002,2003 Glenn Engel <glenne@engel.org>
 * Copyright (C) 2003-2006 Vladimir Oleynik <dzo@simtreas.ru>
 *
- * 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/networking/httpd_indexcgi.c b/networking/httpd_indexcgi.c
index af4338006..7e0225e19 100644
--- a/networking/httpd_indexcgi.c
+++ b/networking/httpd_indexcgi.c
@@ -1,7 +1,7 @@
 /*
 * Copyright (c) 2007 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.
 */
 /*
diff --git a/networking/httpd_ssi.c b/networking/httpd_ssi.c
index 03f263397..87f43fcfa 100644
--- a/networking/httpd_ssi.c
+++ b/networking/httpd_ssi.c
@@ -1,7 +1,7 @@
 /*
 * Copyright (c) 2009 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.
 */
 /*
diff --git a/networking/ifconfig.c b/networking/ifconfig.c
index 1a56c1cd5..853910f67 100644
--- a/networking/ifconfig.c
+++ b/networking/ifconfig.c
@@ -10,7 +10,7 @@
 * Authors of the original ifconfig was:
 *              Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
 *
- * 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/networking/ifplugd.c b/networking/ifplugd.c
index 2f8c90ffc..58f56dbf1 100644
--- a/networking/ifplugd.c
+++ b/networking/ifplugd.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2009 Maksym Kryzhanovskyy <xmaks@email.cz>
 *
- * 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/networking/ifupdown.c b/networking/ifupdown.c
index 69c56e879..5d6994f6e 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -14,7 +14,7 @@
 *  (defined via CONFIG_IFUPDOWN_IFSTATE_PATH) and can be overridden by build
 *  configuration.
 *
- * 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/networking/interface.c b/networking/interface.c
index 7c6ed82df..83af62b7c 100644
--- a/networking/interface.c
+++ b/networking/interface.c
@@ -19,7 +19,7 @@
 * Author:      Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
 *              and others.  Copyright 1993 MicroWalt Corporation
 *
- * 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.
 *
 * Patched to support 'add' and 'del' keywords for INET(4) addresses
 * by Mrs. Brisby <mrs.brisby@nimh.org>
diff --git a/networking/ip.c b/networking/ip.c
index 004289667..7b1e2eb6a 100644
--- a/networking/ip.c
+++ b/networking/ip.c
@@ -2,7 +2,7 @@
 /*
 * "ip" utility frontend.
 *
- * 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.
 *
 * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
 *
diff --git a/networking/ipcalc.c b/networking/ipcalc.c
index 265009ad8..d4aa885c6 100644
--- a/networking/ipcalc.c
+++ b/networking/ipcalc.c
@@ -9,7 +9,7 @@
 * from Red Hat.  I didn't look at their source code, but there
 * is no denying that this is a loving reimplementation
 *
- * 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"
 /* After libbb.h, because on some systems it needs other includes */
diff --git a/networking/isrv.c b/networking/isrv.c
index 66bb3718e..1c6491edd 100644
--- a/networking/isrv.c
+++ b/networking/isrv.c
@@ -5,7 +5,7 @@
 *
 * Copyright (C) 2007 Denys Vlasenko
 *
- * Licensed under GPL version 2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #include "libbb.h"
diff --git a/networking/isrv.h b/networking/isrv.h
index f20714df8..4c7e01dd1 100644
--- a/networking/isrv.h
+++ b/networking/isrv.h
@@ -5,7 +5,7 @@
 *
 * Copyright (C) 2007 Denys Vlasenko
 *
- * Licensed under GPL version 2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
diff --git a/networking/isrv_identd.c b/networking/isrv_identd.c
index e8ba00766..18ce59aaf 100644
--- a/networking/isrv_identd.c
+++ b/networking/isrv_identd.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2007 Denys Vlasenko
 *
- * Licensed under GPL version 2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #include "libbb.h"
diff --git a/networking/libiproute/Kbuild.src b/networking/libiproute/Kbuild.src
index b0aa50a97..7c78f3c6a 100644
--- a/networking/libiproute/Kbuild.src
+++ b/networking/libiproute/Kbuild.src
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 #
-# 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.
 #
 lib-y:=
diff --git a/networking/libiproute/ipaddress.c b/networking/libiproute/ipaddress.c
index b6f469d0f..1be03a6c3 100644
--- a/networking/libiproute/ipaddress.c
+++ b/networking/libiproute/ipaddress.c
@@ -2,7 +2,7 @@
 /*
 * ipaddress.c          "ip address".
 *
- * 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.
 *
 * Authors:     Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
 *
diff --git a/networking/libiproute/iplink.c b/networking/libiproute/iplink.c
index 9f9218573..f9421fc68 100644
--- a/networking/libiproute/iplink.c
+++ b/networking/libiproute/iplink.c
@@ -4,7 +4,7 @@
 *
 * Authors: Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
 *
- * 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 <net/if.h>
 #include <net/if_packet.h>
@@ -15,6 +15,11 @@
 #include "rt_names.h"
 #include "utils.h"
+#ifndef IFLA_LINKINFO
+# define IFLA_LINKINFO 18
+# define IFLA_INFO_KIND 1
+#endif
 /* taken from linux/sockios.h */
 #define SIOCSIFNAME     0x8923          /* set interface name */
diff --git a/networking/libiproute/iproute.c b/networking/libiproute/iproute.c
index 8dba2bf3d..1696e6a34 100644
--- a/networking/libiproute/iproute.c
+++ b/networking/libiproute/iproute.c
@@ -2,7 +2,7 @@
 /*
 * iproute.c            "ip route".
 *
- * 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.
 *
 * Authors:     Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
 *
diff --git a/networking/libiproute/iptunnel.c b/networking/libiproute/iptunnel.c
index 8389ef348..bce373d05 100644
--- a/networking/libiproute/iptunnel.c
+++ b/networking/libiproute/iptunnel.c
@@ -2,7 +2,7 @@
 /*
 * iptunnel.c          "ip tunnel"
 *
- * 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.
 *
 * Authors:     Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
 *
diff --git a/networking/libiproute/utils.c b/networking/libiproute/utils.c
index 85034c0f6..5125617c7 100644
--- a/networking/libiproute/utils.c
+++ b/networking/libiproute/utils.c
@@ -2,7 +2,7 @@
 /*
 * utils.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.
 *
 * Authors:     Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
 *
diff --git a/networking/nameif.c b/networking/nameif.c
index 046e308c5..45a3229f4 100644
--- a/networking/nameif.c
+++ b/networking/nameif.c
@@ -7,7 +7,7 @@
 *                      Glenn McGrath
 * Extended matching support 2008 by Nico Erfurth <masta@perlgolf.de>
 *
- * 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/networking/nc.c b/networking/nc.c
index c77137480..31d450dda 100644
--- a/networking/nc.c
+++ b/networking/nc.c
@@ -1,10 +1,10 @@
 /* vi: set sw=4 ts=4: */
-/*  nc: mini-netcat - built from the ground up for LRP
+/* nc: mini-netcat - built from the ground up for LRP
 *
- *  Copyright (C) 1998, 1999  Charles P. Wright
+ * Copyright (C) 1998, 1999  Charles P. Wright
- *  Copyright (C) 1998  Dave Cinege
+ * Copyright (C) 1998  Dave Cinege
 *
- *  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/networking/nc_bloaty.c b/networking/nc_bloaty.c
index aebb9cb8c..dbcce8bf4 100644
--- a/networking/nc_bloaty.c
+++ b/networking/nc_bloaty.c
@@ -3,7 +3,7 @@
 *
 * Copyright (C) 2007 Denys Vlasenko.
 *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 /* Author's comments from nc 1.10:
diff --git a/networking/netstat.c b/networking/netstat.c
index 8b7a57405..3114a3902 100644
--- a/networking/netstat.c
+++ b/networking/netstat.c
@@ -11,7 +11,7 @@
 * 2008-07-10
 * optional '-p' flag support ported from net-tools by G. Somlo <somlo@cmu.edu>
 *
- * 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/networking/nslookup.c b/networking/nslookup.c
index 26287114c..dcac7379e 100644
--- a/networking/nslookup.c
+++ b/networking/nslookup.c
@@ -8,7 +8,7 @@
 * Correct default name server display and explicit name server option
 * added by Ben Zeckel <bzeckel@hmc.edu> June 2001
 *
- * 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 <resolv.h>
diff --git a/networking/ntpd.c b/networking/ntpd.c
index e9cfdbddd..6707e9bdb 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -3,7 +3,7 @@
 *
 * Author: Adam Tkac <vonsch@gmail.com>
 *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 *
 * Parts of OpenNTPD clock syncronization code is replaced by
 * code which is based on ntp-4.2.6, whuch carries the following
@@ -1920,9 +1920,28 @@ static NOINLINE void ntp_init(char **argv)
        if (opts & OPT_N)
                setpriority(PRIO_PROCESS, 0, -15);
-        bb_signals((1 << SIGTERM) | (1 << SIGINT), record_signo);
+        /* If network is up, syncronization occurs in ~10 seconds.
-        /* Removed SIGHUP here: */
+         * We give "ntpd -q" a full minute to finish, then we exit.
-        bb_signals((1 << SIGPIPE) | (1 << SIGCHLD), SIG_IGN);
+         *
+         * I tested ntpd 4.2.6p1 and apparently it never exits
+         * (will try forever), but it does not feel right.
+         * The goal of -q is to act like ntpdate: set time
+         * after a reasonably small period of polling, or fail.
+         */
+        if (opts & OPT_q)
+                alarm(60);
+        bb_signals(0
+                | (1 << SIGTERM)
+                | (1 << SIGINT)
+                | (1 << SIGALRM)
+                , record_signo
+        );
+        bb_signals(0
+                | (1 << SIGPIPE)
+                | (1 << SIGCHLD)
+                , SIG_IGN
+        );
 }
 int ntpd_main(int argc UNUSED_PARAM, char **argv) MAIN_EXTERNALLY_VISIBLE;
diff --git a/networking/ntpd_simple.c b/networking/ntpd_simple.c
index 5e48306c7..5905e54e9 100644
--- a/networking/ntpd_simple.c
+++ b/networking/ntpd_simple.c
@@ -3,7 +3,7 @@
 *
 * Author: Adam Tkac <vonsch@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"
 #include <netinet/ip.h> /* For IPTOS_LOWDELAY definition */
diff --git a/networking/ping.c b/networking/ping.c
index 6a766a437..e18d88e39 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -11,7 +11,7 @@
 * This code is derived from software contributed to Berkeley by
 * Mike Muuss.
 *
- * 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.
 */
 /* from ping6.c:
 * Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
diff --git a/networking/pscan.c b/networking/pscan.c
index 5fb6af0b3..a8194d1a8 100644
--- a/networking/pscan.c
+++ b/networking/pscan.c
@@ -3,7 +3,7 @@
 *
 * Copyright 2007 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/networking/route.c b/networking/route.c
index a3199621a..c72e9457f 100644
--- a/networking/route.c
+++ b/networking/route.c
@@ -10,7 +10,7 @@
 *              Fred N. van Kempen, <waltje@uwalt.nl.mugnet.org>
 *              (derived from FvK's 'route.c     1.70    01/04/94')
 *
- * 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.
 *
 *
 * displayroute() code added by Vladimir N. Oleynik <dzo@simtreas.ru>
diff --git a/networking/tc.c b/networking/tc.c
index 6a5a8504f..48d164285 100644
--- a/networking/tc.c
+++ b/networking/tc.c
@@ -2,7 +2,7 @@
 /*
 * tc.c         "tc" utility frontend.
 *
- * 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.
 *
 * Authors:     Alexey Kuznetsov, <kuznet@ms2.inr.ac.ru>
 *
diff --git a/networking/tcpudp.c b/networking/tcpudp.c
index 40f68258e..b532e43cd 100644
--- a/networking/tcpudp.c
+++ b/networking/tcpudp.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2007 Denys Vlasenko.
 *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 /* Based on ipsvd-0.12.1. This tcpsvd accepts all options
diff --git a/networking/tcpudp_perhost.c b/networking/tcpudp_perhost.c
index 3005f12c0..105410883 100644
--- a/networking/tcpudp_perhost.c
+++ b/networking/tcpudp_perhost.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2007 Denys Vlasenko.
 *
- * 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/networking/tcpudp_perhost.h b/networking/tcpudp_perhost.h
index d370036a7..3e5757678 100644
--- a/networking/tcpudp_perhost.h
+++ b/networking/tcpudp_perhost.h
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2007 Denys Vlasenko.
 *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
diff --git a/networking/telnet.c b/networking/telnet.c
index e0022b2cb..12d1970fa 100644
--- a/networking/telnet.c
+++ b/networking/telnet.c
@@ -8,7 +8,7 @@
 * Created: Thu Apr  7 13:29:41 1994 too
 * Last modified: Fri Jun  9 14:34:24 2000 too
 *
- * 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.
 *
 * HISTORY
 * Revision 3.1  1994/04/17  11:31:54  too
diff --git a/networking/telnetd.c b/networking/telnetd.c
index ea66a25c0..5c011e15d 100644
--- a/networking/telnetd.c
+++ b/networking/telnetd.c
@@ -3,7 +3,7 @@
 * Simple telnet server
 * Bjorn Wesen, Axis Communications AB (bjornw@axis.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.
 *
 * ---------------------------------------------------------------------------
 * (C) Copyright 2000, Axis Communications AB, LUND, SWEDEN
diff --git a/networking/tftp.c b/networking/tftp.c
index 43ae13647..0269a93ab 100644
--- a/networking/tftp.c
+++ b/networking/tftp.c
@@ -16,7 +16,7 @@
 *
 * tftpd added by Denys Vlasenko & Vladimir Dronnikov
 *
- * 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/networking/tunctl.c b/networking/tunctl.c
index 02ff71dce..e17a9db64 100644
--- a/networking/tunctl.c
+++ b/networking/tunctl.c
@@ -7,7 +7,7 @@
 * Original code:
 *      Jeff Dike
 *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #include <netinet/in.h>
 #include <net/if.h>
diff --git a/networking/udhcp/Kbuild.src b/networking/udhcp/Kbuild.src
index f845bc1d9..b8767baea 100644
--- a/networking/udhcp/Kbuild.src
+++ b/networking/udhcp/Kbuild.src
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 #
-# 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.
 #
 lib-y:=
diff --git a/networking/udhcp/arpping.c b/networking/udhcp/arpping.c
index 7c8c24446..ff6347847 100644
--- a/networking/udhcp/arpping.c
+++ b/networking/udhcp/arpping.c
@@ -3,7 +3,7 @@
 * Mostly stolen from: dhcpcd - DHCP client daemon
 * by Yoichi Hariguchi <yoichi@fore.com>
 *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #include <netinet/if_ether.h>
 #include <net/if_arp.h>
diff --git a/networking/udhcp/common.c b/networking/udhcp/common.c
index 90a07ed09..97ab4cdbb 100644
--- a/networking/udhcp/common.c
+++ b/networking/udhcp/common.c
@@ -2,7 +2,7 @@
 /*
 * Rewrite by Russ Dill <Russ.Dill@asu.edu> July 2001
 *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #include "common.h"
diff --git a/networking/udhcp/common.h b/networking/udhcp/common.h
index ce81d1807..c5abf17d5 100644
--- a/networking/udhcp/common.h
+++ b/networking/udhcp/common.h
@@ -3,7 +3,7 @@
 * Russ Dill <Russ.Dill@asu.edu> September 2001
 * Rewritten by Vladimir Oleynik <dzo@simtreas.ru> (C) 2003
 *
- * 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.
 */
 #ifndef UDHCP_COMMON_H
 #define UDHCP_COMMON_H 1
diff --git a/networking/udhcp/dhcpc.h b/networking/udhcp/dhcpc.h
index 6bef562c7..9ef053a1b 100644
--- a/networking/udhcp/dhcpc.h
+++ b/networking/udhcp/dhcpc.h
@@ -1,6 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #ifndef UDHCP_DHCPC_H
 #define UDHCP_DHCPC_H 1
diff --git a/networking/udhcp/dhcpd.h b/networking/udhcp/dhcpd.h
index eea90177f..7c801bf6b 100644
--- a/networking/udhcp/dhcpd.h
+++ b/networking/udhcp/dhcpd.h
@@ -1,6 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #ifndef UDHCP_DHCPD_H
 #define UDHCP_DHCPD_H 1
diff --git a/networking/udhcp/dhcprelay.c b/networking/udhcp/dhcprelay.c
index d194a989b..a2c7f359d 100644
--- a/networking/udhcp/dhcprelay.c
+++ b/networking/udhcp/dhcprelay.c
@@ -1,7 +1,7 @@
 /* vi: set sw=4 ts=4: */
 /* Port to Busybox Copyright (C) 2006 Jesse Dutton <jessedutton@gmail.com>
 *
- * Licensed under GPL v2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 *
 * DHCP Relay for 'DHCPv4 Configuration of IPSec Tunnel Mode' support
 * Copyright (C) 2002 Mario Strasser <mast@gmx.net>,
diff --git a/networking/udhcp/domain_codec.c b/networking/udhcp/domain_codec.c
index 2dd5347ae..c1325d8be 100644
--- a/networking/udhcp/domain_codec.c
+++ b/networking/udhcp/domain_codec.c
@@ -4,7 +4,7 @@
 *
 * Loosely based on the isc-dhcpd implementation by dhankins@isc.org
 *
- * 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.
 */
 #ifdef DNS_COMPR_TESTING
 # define FAST_FUNC /* nothing */
diff --git a/networking/udhcp/dumpleases.c b/networking/udhcp/dumpleases.c
index fb6219fba..2eaadb6eb 100644
--- a/networking/udhcp/dumpleases.c
+++ b/networking/udhcp/dumpleases.c
@@ -1,6 +1,6 @@
 /* vi: set sw=4 ts=4: */
 /*
- * 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 "common.h"
 #include "dhcpd.h"
diff --git a/networking/udhcp/files.c b/networking/udhcp/files.c
index ff63111c9..f5348f658 100644
--- a/networking/udhcp/files.c
+++ b/networking/udhcp/files.c
@@ -4,7 +4,7 @@
 *
 * Rewrite by Russ Dill <Russ.Dill@asu.edu> July 2001
 *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #include <netinet/ether.h>
diff --git a/networking/udhcp/leases.c b/networking/udhcp/leases.c
index fad71ec6c..7aeb37bae 100644
--- a/networking/udhcp/leases.c
+++ b/networking/udhcp/leases.c
@@ -2,7 +2,7 @@
 /*
 * Russ Dill <Russ.Dill@asu.edu> July 2001
 *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #include "common.h"
 #include "dhcpd.h"
diff --git a/networking/udhcp/packet.c b/networking/udhcp/packet.c
index 4badc9cbc..d8f9c5daa 100644
--- a/networking/udhcp/packet.c
+++ b/networking/udhcp/packet.c
@@ -4,7 +4,7 @@
 *
 * Rewrite by Russ Dill <Russ.Dill@asu.edu> July 2001
 *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #include <netinet/in.h>
 #if (defined(__GLIBC__) && __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1) || defined _NEWLIB_VERSION
diff --git a/networking/udhcp/static_leases.c b/networking/udhcp/static_leases.c
index b334a5888..f4a24ab62 100644
--- a/networking/udhcp/static_leases.c
+++ b/networking/udhcp/static_leases.c
@@ -4,7 +4,7 @@
 *
 * Wade Berrier <wberrier@myrealbox.com> September 2004
 *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #include "common.h"
 #include "dhcpd.h"
diff --git a/networking/vconfig.c b/networking/vconfig.c
index 00379fc2f..1f574d2ad 100644
--- a/networking/vconfig.c
+++ b/networking/vconfig.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2001  Manuel Novoa III  <mjn3@codepoet.org>
 *
- * 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.
 */
 /* BB_AUDIT SUSv3 N/A */
diff --git a/networking/wget.c b/networking/wget.c
index 784e405da..88bb09eb2 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -3,7 +3,7 @@
 * wget - retrieve a file using HTTP or FTP
 *
 * Chip Rosenthal Covad Communications <chip@laserlink.net>
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 *
 * Copyright (C) 2010 Bradley M. Kuhn <bkuhn@ebb.org>
 *   Kuhn's copyrights are licensed GPLv2-or-later.  File as a whole remains GPLv2.
diff --git a/networking/zcip.c b/networking/zcip.c
index 6b0b1c491..6fa265ad4 100644
--- a/networking/zcip.c
+++ b/networking/zcip.c
@@ -6,7 +6,7 @@
 * Copyright (C) 2003 by Arthur van Hoff (avh@strangeberry.com)
 * Copyright (C) 2004 by David Brownell
 *
- * 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/printutils/Kbuild.src b/printutils/Kbuild.src
index 008290ee9..194fe01d6 100644
--- a/printutils/Kbuild.src
+++ b/printutils/Kbuild.src
@@ -1,6 +1,6 @@
 # Makefile for busybox
 #
-# 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/printutils/lpd.c b/printutils/lpd.c
index 54ff2227e..157cbe8ae 100644
--- a/printutils/lpd.c
+++ b/printutils/lpd.c
@@ -4,7 +4,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/printutils/lpr.c b/printutils/lpr.c
index f21cffddf..fb7860d41 100644
--- a/printutils/lpr.c
+++ b/printutils/lpr.c
@@ -7,7 +7,7 @@
 * Original idea and code:
 *      Walter Harms <WHarms@bfs.de>
 *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 *
 * See RFC 1179 for protocol description.
 */
diff --git a/procps/Kbuild.src b/procps/Kbuild.src
index c41f12b15..791d65670 100644
--- a/procps/Kbuild.src
+++ b/procps/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/procps/free.c b/procps/free.c
index db70712cf..be65f46f1 100644
--- a/procps/free.c
+++ b/procps/free.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 1999-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.
 */
 /* getopt not needed */
diff --git a/procps/fuser.c b/procps/fuser.c
index 85523c31c..addf1a7d8 100644
--- a/procps/fuser.c
+++ b/procps/fuser.c
@@ -4,7 +4,7 @@
 *
 * Copyright 2004 Tony J. White
 *
- * 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/procps/iostat.c b/procps/iostat.c
index 05c758b6c..5d829861e 100644
--- a/procps/iostat.c
+++ b/procps/iostat.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2010 Marek Polacek <mmpolacek@gmail.com>
 *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 //applet:IF_IOSTAT(APPLET(iostat, _BB_DIR_BIN, _BB_SUID_DROP))
diff --git a/procps/kill.c b/procps/kill.c
index 1d343edff..b51d44a70 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -5,7 +5,7 @@
 * Copyright (C) 1995, 1996 by Bruce Perens <bruce@pixar.com>.
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 *
- * 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"
@@ -153,7 +153,7 @@ int kill_main(int argc, char **argv)
                                        arg = argv[i];
                                omit = bb_strtoi(arg, NULL, 10);
                                if (errno) {
-                                        bb_error_msg("bad pid '%s'", arg);
+                                        bb_error_msg("invalid number '%s'", arg);
                                        ret = 1;
                                        goto resume;
                                }
@@ -211,7 +211,7 @@ int kill_main(int argc, char **argv)
                        arg++;
                pid = bb_strtoi(arg, NULL, 10);
                if (errno) {
-                        bb_error_msg("bad pid '%s'", arg);
+                        bb_error_msg("invalid number '%s'", arg);
                        errors++;
                } else if (kill(pid, signo) != 0) {
                        bb_perror_msg("can't kill pid %d", (int)pid);
diff --git a/procps/mpstat.c b/procps/mpstat.c
index bf0f593f7..f1a0b00b8 100644
--- a/procps/mpstat.c
+++ b/procps/mpstat.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2010 Marek Polacek <mmpolacek@gmail.com>
 *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 //applet:IF_MPSTAT(APPLET(mpstat, _BB_DIR_BIN, _BB_SUID_DROP))
@@ -61,7 +61,7 @@ typedef long idata_t;
 struct stats_irqcpu {
-        unsigned interrupt;
+        unsigned interrupts;
        char irq_name[MAX_IRQNAME_LEN];
 };
@@ -265,7 +265,7 @@ static void write_irqcpu_stats(struct stats_irqcpu *per_cpu_stats[],
                                        p = &per_cpu_stats[current][(cpu - 1) * total_irqs + j];
                                        q = &per_cpu_stats[prev][(cpu - 1) * total_irqs + offset];
                                        printf("%"INTRATE_SCRWIDTH_STR".2f",
-                                                (double)(p->interrupt - q->interrupt) / itv * G.hz);
+                                                (double)(p->interrupts - q->interrupts) / itv * G.hz);
                                } else {
                                        printf("        N/A");
                                }
@@ -617,12 +617,12 @@ static void get_irqs_from_interrupts(const char *fname,
                        char *next;
                        ic = &per_cpu_stats[current][cpu_index[cpu] * irqs_per_cpu + irq];
                        irq_i = &G.st_irq[current][cpu_index[cpu] + 1];
-                        ic->interrupt = strtoul(cp, &next, 10);
+                        ic->interrupts = strtoul(cp, &next, 10);
                        /* Count only numerical IRQs */
                        if (isdigit(last_char)) {
-                                irq_i->irq_nr += ic->interrupt;
+                                irq_i->irq_nr += ic->interrupts;
                                //bb_error_msg("G.st_irq[%u][%u].irq_nr + %u = %lld",
-                                // current, cpu_index[cpu] + 1, ic->interrupt, irq_i->irq_nr);
+                                // current, cpu_index[cpu] + 1, ic->interrupts, irq_i->irq_nr);
                        }
                        cp = next;
                }
diff --git a/procps/nmeter.c b/procps/nmeter.c
index 930585695..7836a90d5 100644
--- a/procps/nmeter.c
+++ b/procps/nmeter.c
@@ -1,9 +1,10 @@
 /*
-** Licensed under the GPL v2, see the file LICENSE in this tarball
+ * Licensed under GPLv2, see file LICENSE in this source tree.
-**
+ *
-** Based on nanotop.c from floppyfw project
+ * Based on nanotop.c from floppyfw project
-**
+ *
-** Contact me: vda.linux@googlemail.com */
+ * Contact me: vda.linux@googlemail.com
+ */
 //TODO:
 // simplify code
diff --git a/procps/pgrep.c b/procps/pgrep.c
index 45de8bcda..5d388a87d 100644
--- a/procps/pgrep.c
+++ b/procps/pgrep.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2007 Loic Grenie <loic.grenie@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"
 #include "xregex.h"
diff --git a/procps/pidof.c b/procps/pidof.c
index bf5e7841a..49e469ca5 100644
--- a/procps/pidof.c
+++ b/procps/pidof.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 1999-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/procps/pmap.c b/procps/pmap.c
new file mode 100644
index 000000000..cfa94ed82
--- /dev/null
+++ b/procps/pmap.c
@@ -0,0 +1,111 @@
+/*
+ * pmap implementation for busybox
+ *
+ * Copyright (C) 2010 Nokia Corporation. All rights reserved.
+ * Written by Alexander Shishkin <virtuoso@slind.org>
+ *
+ * Licensed under GPLv2 or later, see the LICENSE file in this source tree
+ * for details.
+ */
+//applet:IF_PMAP(APPLET(pmap, _BB_DIR_USR_BIN, _BB_SUID_DROP))
+//kbuild:lib-$(CONFIG_PMAP)     += pmap.o
+//config:config PMAP
+//config:       bool "pmap"
+//config:       default y
+//config:       help
+//config:         Display processes' memory mappings.
+//usage:#define pmap_trivial_usage
+//usage:       "[-x][-q] PID"
+//usage:#define pmap_full_usage "\n\n"
+//usage:       "Display detailed precesses' memory usage\n"
+//usage:       "\nOptions:"
+//usage:       "\n     -x              show details"
+//usage:       "\n     -q              quiet"
+#include "libbb.h"
+#if ULONG_MAX == 0xffffffff
+# define TABS "\t"
+# define AFMT "8"
+# define DASHES ""
+#else
+# define TABS "\t\t"
+# define AFMT "16"
+# define DASHES "--------"
+#endif
+enum {
+        OPT_x = 1 << 0,
+        OPT_q = 1 << 1,
+};
+static void print_smaprec(struct smaprec *currec, void *data)
+{
+        unsigned opt = (unsigned)data;
+        printf("%0" AFMT "lx ", currec->smap_start);
+        if (opt & OPT_x)
+                printf("%7lu %7lu %7lu %7lu ",
+                        currec->smap_size,
+                        currec->smap_pss,
+                        currec->private_dirty,
+                        currec->smap_swap);
+        else
+                printf("%7luK", currec->smap_size);
+        printf(" %.4s  %s\n", currec->smap_mode, currec->smap_name);
+}
+static int procps_get_maps(pid_t pid, unsigned opt)
+{
+        struct smaprec total;
+        int ret;
+        char buf[256];
+        read_cmdline(buf, sizeof(buf), pid, "no such process");
+        printf("%u: %s\n", (int)pid, buf);
+        if (!(opt & OPT_q) && (opt & OPT_x))
+                puts("Address" TABS "  Kbytes     PSS   Dirty    Swap  Mode  Mapping");
+        memset(&total, 0, sizeof(total));
+        ret = procps_read_smaps(pid, &total, print_smaprec, (void*)opt);
+        if (ret)
+                return ret;
+        if (!(opt & OPT_q)) {
+                if (opt & OPT_x)
+                        printf("--------" DASHES "  ------  ------  ------  ------\n"
+                                "total" TABS " %7lu %7lu %7lu %7lu\n",
+                                total.smap_size, total.smap_pss, total.private_dirty, total.smap_swap);
+                else
+                        printf("mapped: %luK\n", total.smap_size);
+        }
+        return 0;
+}
+int pmap_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int pmap_main(int argc UNUSED_PARAM, char **argv)
+{
+        unsigned opts;
+        int ret;
+        opts = getopt32(argv, "xq");
+        argv += optind;
+        ret = 0;
+        while (*argv) {
+                pid_t pid = xatoi_positive(*argv++);
+                /* GNU pmap returns 42 if any of the pids failed */
+                if (procps_get_maps(pid, opts) != 0)
+                        ret = 42;
+        }
+        return ret;
+}
diff --git a/procps/ps.c b/procps/ps.c
index a3220a926..305381eb9 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -6,7 +6,7 @@
 * Fix for SELinux Support:(c)2007 Hiroshi Shinji <shiroshi@my.email.ne.jp>
 *                         (c)2007 Yuichi Nakamura <ynakam@hitachisoft.jp>
 *
- * 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/procps/renice.c b/procps/renice.c
index ea5fc703e..0a73cbeeb 100644
--- a/procps/renice.c
+++ b/procps/renice.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2005  Manuel Novoa III  <mjn3@codepoet.org>
 *
- * 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.
 */
 /* Notes:
@@ -91,7 +91,7 @@ int renice_main(int argc UNUSED_PARAM, char **argv)
                } else {
                        who = bb_strtou(arg, NULL, 10);
                        if (errno) {
-                                bb_error_msg("bad value: %s", arg);
+                                bb_error_msg("invalid number '%s'", arg);
                                goto HAD_ERROR;
                        }
                }
diff --git a/procps/sysctl.c b/procps/sysctl.c
index fc601d637..20b372c54 100644
--- a/procps/sysctl.c
+++ b/procps/sysctl.c
@@ -4,7 +4,7 @@
 *
 * Copyright 1999 George Staikos
 *
- * 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.
 *
 * Changelog:
 * v1.01   - added -p <preload> to preload values from a file
diff --git a/procps/top.c b/procps/top.c
index ec8437442..4f37878de 100644
--- a/procps/top.c
+++ b/procps/top.c
@@ -28,7 +28,7 @@
 * Copyright (C) 1994-1996 Charles L. Blake.
 * Copyright (C) 1992-1998 Michael K. Johnson
 *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #include "libbb.h"
@@ -942,20 +942,20 @@ int top_main(int argc UNUSED_PARAM, char **argv)
                        }
 #if ENABLE_FEATURE_TOPMEM
                        else { /* TOPMEM */
-                                if (!(p->mapped_ro | p->mapped_rw))
+                                if (!(p->smaps.mapped_ro | p->smaps.mapped_rw))
                                        continue; /* kernel threads are ignored */
                                n = ntop;
                                /* No bug here - top and topmem are the same */
                                top = xrealloc_vector(topmem, 6, ntop++);
                                strcpy(topmem[n].comm, p->comm);
                                topmem[n].pid      = p->pid;
-                                topmem[n].vsz      = p->mapped_rw + p->mapped_ro;
+                                topmem[n].vsz      = p->smaps.mapped_rw + p->smaps.mapped_ro;
-                                topmem[n].vszrw    = p->mapped_rw;
+                                topmem[n].vszrw    = p->smaps.mapped_rw;
-                                topmem[n].rss_sh   = p->shared_clean + p->shared_dirty;
+                                topmem[n].rss_sh   = p->smaps.shared_clean + p->smaps.shared_dirty;
-                                topmem[n].rss      = p->private_clean + p->private_dirty + topmem[n].rss_sh;
+                                topmem[n].rss      = p->smaps.private_clean + p->smaps.private_dirty + topmem[n].rss_sh;
-                                topmem[n].dirty    = p->private_dirty + p->shared_dirty;
+                                topmem[n].dirty    = p->smaps.private_dirty + p->smaps.shared_dirty;
-                                topmem[n].dirty_sh = p->shared_dirty;
+                                topmem[n].dirty_sh = p->smaps.shared_dirty;
-                                topmem[n].stack    = p->stack;
+                                topmem[n].stack    = p->smaps.stack;
                        }
 #endif
                } /* end of "while we read /proc" */
diff --git a/procps/uptime.c b/procps/uptime.c
index d9aa1d037..5c48795bf 100644
--- a/procps/uptime.c
+++ b/procps/uptime.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 1999-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.
 */
 /* This version of uptime doesn't display the number of users on the system,
diff --git a/procps/watch.c b/procps/watch.c
index a1cde9ea0..36f71c469 100644
--- a/procps/watch.c
+++ b/procps/watch.c
@@ -5,7 +5,7 @@
 * Copyright (C) 2001 by Michael Habermann <mhabermann@gmx.de>
 * Copyrigjt (C) Mar 16, 2003 Manuel Novoa III   (mjn3@codepoet.org)
 *
- * 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.
 */
 /* BB_AUDIT SUSv3 N/A */
diff --git a/runit/Kbuild.src b/runit/Kbuild.src
index 4d85372df..d38bad20f 100644
--- a/runit/Kbuild.src
+++ b/runit/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/scripts/echo.c b/scripts/echo.c
index 3c45e339c..cb207ae05 100644
--- a/scripts/echo.c
+++ b/scripts/echo.c
@@ -6,7 +6,7 @@
 * Copyright (c) 1991, 1993
 *      The Regents of the University of California.  All rights reserved.
 *
- * 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.
 *
 * Original copyright notice is retained at the end of this file.
 */
diff --git a/scripts/mkconfigs b/scripts/mkconfigs
index ef6ae8aaf..47ac53330 100755
--- a/scripts/mkconfigs
+++ b/scripts/mkconfigs
@@ -26,26 +26,51 @@
 #      - Retain lines that begin with "# CONFIG_"
 #      - lines that use double-quotes must \\-escape-quote them
-config="$1"
+config=.config
-if [ $# -lt 1 ]
-then
-        config=.config
-fi
+{
 echo "\
 #ifndef _BBCONFIGOPTS_H
 #define _BBCONFIGOPTS_H
 /*
 * busybox configuration settings.
 *
- * 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 file is generated automatically by scripts/mkconfigs.
 * Do not edit.
 */
-static const char bbconfig_config[] ="
+static const char bbconfig_config[] ALIGN1 ="
-sed 's/\"/\\\"/g' $config | grep "^#\? \?CONFIG_" | awk '{print "\"" $0 "\\n\"";}'
+grep '^#\? \?CONFIG_' "$config" \
+| sed -e 's/\"/\\\"/g' -e 's/^/"/' -e 's/$/\\n"/'
 echo ";"
-echo "#endif /* _BBCONFIGOPTS_H */"
+echo "#endif"
+} >"$1"
+{
+echo "\
+#ifndef _BBCONFIGOPTS_BZ2_H
+#define _BBCONFIGOPTS_BZ2_H
+/*
+ * busybox configuration settings.
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+ *
+ * This file is generated automatically by scripts/mkconfigs.
+ * Do not edit.
+ */
+static const char bbconfig_config_bz2[] ALIGN1 = {"
+grep '^#\? \?CONFIG_' "$config" \
+| bzip2 -1 | dd bs=2 skip=1 2>/dev/null \
+| od -v -t x1 \
+| sed -e 's/^[^ ]*//' \
+        -e 's/ //g' \
+        -e '/^$/d' \
+        -e 's/\(..\)/0x\1,/g'
+echo "};"
+echo "#endif"
+} >"$2"
diff --git a/scripts/showasm b/scripts/showasm
index dc2cd705d..b61ab98d0 100755
--- a/scripts/showasm
+++ b/scripts/showasm
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Copyright 2006 Rob Landley <rob@landley.net>
-# 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.
 # Dumb little utility function to print out the assembly dump of a single
 # function, or list the functions so dumpable in an executable.  You'd think
diff --git a/selinux/Kbuild.src b/selinux/Kbuild.src
index 6567e3c07..cdd5f2adf 100644
--- a/selinux/Kbuild.src
+++ b/selinux/Kbuild.src
@@ -3,7 +3,7 @@
 # Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org>
 # Copyright (C) 2007 by KaiGai Kohei <kaigai@kaigai.gr.jp>
 #
-# 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/selinux/chcon.c b/selinux/chcon.c
index c6be37f44..e00cdda1b 100644
--- a/selinux/chcon.c
+++ b/selinux/chcon.c
@@ -5,7 +5,7 @@
 *
 * Copyright (C) 2006 - 2007 KaiGai Kohei <kaigai@kaigai.gr.jp>
 *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #include <getopt.h>
 #include <selinux/context.h>
diff --git a/selinux/getenforce.c b/selinux/getenforce.c
index 3d3eef14c..d9d9d0f65 100644
--- a/selinux/getenforce.c
+++ b/selinux/getenforce.c
@@ -4,7 +4,7 @@
 * Based on libselinux 1.33.1
 * Port to BusyBox  Hiroshi Shinji <shiroshi@my.email.ne.jp>
 *
- * 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/selinux/getsebool.c b/selinux/getsebool.c
index 7478b79e1..924356cae 100644
--- a/selinux/getsebool.c
+++ b/selinux/getsebool.c
@@ -4,7 +4,7 @@
 * Based on libselinux 1.33.1
 * Port to BusyBox  Hiroshi Shinji <shiroshi@my.email.ne.jp>
 *
- * 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/selinux/load_policy.c b/selinux/load_policy.c
index ea7c9132a..8fc92dbf3 100644
--- a/selinux/load_policy.c
+++ b/selinux/load_policy.c
@@ -2,7 +2,7 @@
 * load_policy
 * Author: Yuichi Nakamura <ynakam@hitachisoft.jp>
 *
- * 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/selinux/matchpathcon.c b/selinux/matchpathcon.c
index 1532429b6..ec49077c8 100644
--- a/selinux/matchpathcon.c
+++ b/selinux/matchpathcon.c
@@ -3,7 +3,7 @@
 *                  based on libselinux-1.32
 * Port to busybox: KaiGai Kohei <kaigai@kaigai.gr.jp>
 *
- * 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/selinux/runcon.c b/selinux/runcon.c
index f8ca9a6aa..b70a5e396 100644
--- a/selinux/runcon.c
+++ b/selinux/runcon.c
@@ -26,7 +26,7 @@
 * Port to busybox: KaiGai Kohei <kaigai@kaigai.gr.jp>
 *                  - based on coreutils-5.97 (in Fedora Core 6)
 *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #include <getopt.h>
 #include <selinux/context.h>
diff --git a/selinux/selinuxenabled.c b/selinux/selinuxenabled.c
index 1cf93c3f3..aa4e63f74 100644
--- a/selinux/selinuxenabled.c
+++ b/selinux/selinuxenabled.c
@@ -4,7 +4,7 @@
 * Based on libselinux 1.33.1
 * Port to BusyBox  Hiroshi Shinji <shiroshi@my.email.ne.jp>
 *
- * 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/selinux/sestatus.c b/selinux/sestatus.c
index 1a02a6b0c..7fb2b470b 100644
--- a/selinux/sestatus.c
+++ b/selinux/sestatus.c
@@ -5,7 +5,7 @@
 *
 * Copyright (C) KaiGai Kohei <kaigai@ak.jp.nec.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/selinux/setenforce.c b/selinux/setenforce.c
index 45f82238c..be5432147 100644
--- a/selinux/setenforce.c
+++ b/selinux/setenforce.c
@@ -4,7 +4,7 @@
 * Based on libselinux 1.33.1
 * Port to BusyBox  Hiroshi Shinji <shiroshi@my.email.ne.jp>
 *
- * 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/selinux/setsebool.c b/selinux/setsebool.c
index b615ce783..a8cc00407 100644
--- a/selinux/setsebool.c
+++ b/selinux/setsebool.c
@@ -5,7 +5,7 @@
 * omitted in this version
 * Yuichi Nakamura <ynakam@hitachisoft.jp>
 *
- * 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/shell/Kbuild.src b/shell/Kbuild.src
index a669bdfb0..c00aec92a 100644
--- a/shell/Kbuild.src
+++ b/shell/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/shell/ash.c b/shell/ash.c
index f7fad88cd..6d67a1f8a 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -13,7 +13,7 @@
 * Copyright (c) 1997-2005 Herbert Xu <herbert@gondor.apana.org.au>
 * was re-ported from NetBSD and debianized.
 *
- * 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.
 */
 /*
@@ -5204,9 +5204,13 @@ noclobberopen(const char *fname)
         * revealed that it was a regular file, and the file has not been
         * replaced, return the file descriptor.
         */
-        if (fstat(fd, &finfo2) == 0 && !S_ISREG(finfo2.st_mode)
+        if (fstat(fd, &finfo2) == 0
-         && finfo.st_dev == finfo2.st_dev && finfo.st_ino == finfo2.st_ino)
+         && !S_ISREG(finfo2.st_mode)
+         && finfo.st_dev == finfo2.st_dev
+         && finfo.st_ino == finfo2.st_ino
+        ) {
                return fd;
+        }
        /* The file has been replaced.  badness. */
        close(fd);
@@ -11611,10 +11615,9 @@ readtoken1(int c, int syntax, char *eofmark, int striptabs)
                                        if (dqvarnest > 0) {
                                                dqvarnest--;
                                        }
-                                        USTPUTC(CTLENDVAR, out);
+                                        c = CTLENDVAR;
-                                } else {
-                                        USTPUTC(c, out);
                                }
+                                USTPUTC(c, out);
                                break;
 #if ENABLE_SH_MATH_SUPPORT
                        case CLP:       /* '(' in arithmetic */
@@ -11623,25 +11626,23 @@ readtoken1(int c, int syntax, char *eofmark, int striptabs)
                                break;
                        case CRP:       /* ')' in arithmetic */
                                if (parenlevel > 0) {
-                                        USTPUTC(c, out);
+                                        parenlevel--;
-                                        --parenlevel;
                                } else {
                                        if (pgetc() == ')') {
                                                if (--arinest == 0) {
-                                                        USTPUTC(CTLENDARI, out);
                                                        syntax = prevsyntax;
                                                        dblquote = (syntax == DQSYNTAX);
-                                                } else
+                                                        c = CTLENDARI;
-                                                        USTPUTC(')', out);
+                                                }
                                        } else {
                                                /*
                                                 * unbalanced parens
                                                 * (don't 2nd guess - no error)
                                                 */
                                                pungetc();
-                                                USTPUTC(')', out);
                                        }
                                }
+                                USTPUTC(c, out);
                                break;
 #endif
                        case CBQUOTE:   /* '`' */
diff --git a/shell/ash_ptr_hack.c b/shell/ash_ptr_hack.c
index 68d907292..f69840825 100644
--- a/shell/ash_ptr_hack.c
+++ b/shell/ash_ptr_hack.c
@@ -2,7 +2,7 @@
 /*
 * Copyright (C) 2008 by 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.
 */
 struct globals_misc;
diff --git a/shell/ash_test/ash-vars/var_bash5.right b/shell/ash_test/ash-vars/var_bash5.right
new file mode 100644
index 000000000..278ed3228
--- /dev/null
+++ b/shell/ash_test/ash-vars/var_bash5.right
@@ -0,0 +1,4 @@
+a/
+a/d
+a/e/f
+Done: 0
diff --git a/shell/ash_test/ash-vars/var_bash5.tests b/shell/ash_test/ash-vars/var_bash5.tests
new file mode 100755
index 000000000..3f49321e1
--- /dev/null
+++ b/shell/ash_test/ash-vars/var_bash5.tests
@@ -0,0 +1,11 @@
+# This testcase checks whether slashes in ${v/a/b} are parsed before or after expansions
+# in a part
+v='a/b/c'
+s='b/c'
+r='e/f'
+echo "${v/$s}"
+echo "${v/$s/d}"
+echo "${v/$s/$r}"
+echo Done: $?
diff --git a/shell/bbsh.c b/shell/bbsh.c
index 83132f928..8e25db458 100644
--- a/shell/bbsh.c
+++ b/shell/bbsh.c
@@ -4,7 +4,7 @@
 *
 * Copyright 2006 Rob Landley <rob@landley.net>
 *
- * 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.
 */
 // A section of code that gets repeatedly or conditionally executed is stored
diff --git a/shell/cttyhack.c b/shell/cttyhack.c
index 7a5e1ffd2..d1cb7fcc3 100644
--- a/shell/cttyhack.c
+++ b/shell/cttyhack.c
@@ -1,8 +1,8 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Licensed under GPLv2
- *
 * Copyright (c) 2007 Denys Vlasenko <vda.linux@googlemail.com>
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #include "libbb.h"
diff --git a/shell/hush.c b/shell/hush.c
index df4058998..e8dfb2499 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -79,7 +79,7 @@
 *              $ "export" i=`echo 'aaa  bbb'`; echo "$i"
 *              aaa
 *
- * 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 "busybox.h"  /* for APPLET_IS_NOFORK/NOEXEC */
 #include <malloc.h>   /* for malloc_trim */
diff --git a/shell/match.c b/shell/match.c
index fb6a38ef1..8b1ddacd5 100644
--- a/shell/match.c
+++ b/shell/match.c
@@ -4,7 +4,7 @@
 * This code is derived from software contributed to Berkeley by
 * Kenneth Almquist.
 *
- * 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) 1989, 1991, 1993, 1994
 *      The Regents of the University of California.  All rights reserved.
diff --git a/shell/math.c b/shell/math.c
index 91fb28f05..f0cc2e35d 100644
--- a/shell/math.c
+++ b/shell/math.c
@@ -23,7 +23,7 @@
 * rewrote arith (see notes to this), added locale support,
 * rewrote dynamic variables.
 *
- * 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) 2001 Aaron Lehmann <aaronl@vitelus.com>
diff --git a/shell/random.c b/shell/random.c
index 7f5821cbc..853ab085a 100644
--- a/shell/random.c
+++ b/shell/random.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2009 Denys Vlasenko
 *
- * 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 "random.h"
diff --git a/shell/random.h b/shell/random.h
index 08563402c..180c48abb 100644
--- a/shell/random.h
+++ b/shell/random.h
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2009 Denys Vlasenko
 *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #ifndef SHELL_RANDOM_H
 #define SHELL_RANDOM_H 1
diff --git a/shell/shell_common.c b/shell/shell_common.c
index 957d71928..0b9d4ebe6 100644
--- a/shell/shell_common.c
+++ b/shell/shell_common.c
@@ -14,7 +14,7 @@
 * Copyright (c) 2010 Denys Vlasenko
 * Split from ash.c
 *
- * 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 "shell_common.h"
@@ -429,7 +429,7 @@ shell_builtin_ulimit(char **argv)
                                                else
                                                        val = bb_strtoull(val_str, NULL, 10);
                                                if (errno) {
-                                                        bb_error_msg("bad number");
+                                                        bb_error_msg("invalid number '%s'", val_str);
                                                        return EXIT_FAILURE;
                                                }
                                                val <<= l->factor_shift;
diff --git a/shell/shell_common.h b/shell/shell_common.h
index 1e9f6a691..f06bc4120 100644
--- a/shell/shell_common.h
+++ b/shell/shell_common.h
@@ -14,7 +14,7 @@
 * Copyright (c) 2010 Denys Vlasenko
 * Split from ash.c
 *
- * 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.
 */
 #ifndef SHELL_COMMON_H
 #define SHELL_COMMON_H 1
diff --git a/sysklogd/Kbuild.src b/sysklogd/Kbuild.src
index faaac110c..d386cc291 100644
--- a/sysklogd/Kbuild.src
+++ b/sysklogd/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/sysklogd/klogd.c b/sysklogd/klogd.c
index 3468656cc..6766b649d 100644
--- a/sysklogd/klogd.c
+++ b/sysklogd/klogd.c
@@ -14,7 +14,7 @@
 *
 * Maintainer: Gennady Feldman <gfeldman@gena01.com> as of Mar 12, 2001
 *
- * 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/sysklogd/logger.c b/sysklogd/logger.c
index def833070..ff1519192 100644
--- a/sysklogd/logger.c
+++ b/sysklogd/logger.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 *
- * 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/sysklogd/logread.c b/sysklogd/logread.c
index 1e8d6bcc0..52c97aa77 100644
--- a/sysklogd/logread.c
+++ b/sysklogd/logread.c
@@ -6,7 +6,7 @@
 *
 * Maintainer: Gennady Feldman <gfeldman@gena01.com> as of Mar 12, 2001
 *
- * 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/sysklogd/syslogd.c b/sysklogd/syslogd.c
index 37a119b3d..fb7309538 100644
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -10,7 +10,7 @@
 *
 * Maintainer: Gennady Feldman <gfeldman@gena01.com> as of Mar 12, 2001
 *
- * 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/sysklogd/syslogd_and_logger.c b/sysklogd/syslogd_and_logger.c
index 51573bd92..0964f239c 100644
--- a/sysklogd/syslogd_and_logger.c
+++ b/sysklogd/syslogd_and_logger.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2008 by Denys Vlasenko <vda.linux@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/testsuite/all_sourcecode.tests b/testsuite/all_sourcecode.tests
index 071399c28..7dcbbe8f5 100755
--- a/testsuite/all_sourcecode.tests
+++ b/testsuite/all_sourcecode.tests
@@ -2,7 +2,7 @@
 # Tests for the sourcecode base itself.
 # Copyright 2006 by Mike Frysinger <vapier@gentoo.org>
-# Licensed under GPL v2, see file LICENSE for details.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 [ -n "$srcdir" ] || srcdir=$(pwd)
 . ./testing.sh
diff --git a/testsuite/ar.tests b/testsuite/ar.tests
index 4630d08a4..0a8eb9b32 100755
--- a/testsuite/ar.tests
+++ b/testsuite/ar.tests
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Copyright 2010 Nokia Corporation
 # Written by Alexander Shishkin
-# Licensed under GPL v2 or later, see file LICENSE for details
+# Licensed under GPLv2 or later, see file LICENSE in this source tree.
 . ./testing.sh
diff --git a/testsuite/ash.tests b/testsuite/ash.tests
index 2eeb746e4..2a99245a9 100755
--- a/testsuite/ash.tests
+++ b/testsuite/ash.tests
@@ -3,7 +3,7 @@
 # These are not ash tests, we use ash as a way to test lineedit!
 #
 # Copyright 2010 by Denys Vlasenko
-# Licensed under GPL v2, see file LICENSE for details.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 . ./testing.sh
 test -f "$bindir/.config" && . "$bindir/.config"
diff --git a/testsuite/awk.tests b/testsuite/awk.tests
index 0691a7972..9e5e5a0f1 100755
--- a/testsuite/awk.tests
+++ b/testsuite/awk.tests
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Copyright 2007 by Denys Vlasenko <vda.linux@googlemail.com>
-# Licensed under GPL v2, see file LICENSE for details.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 . ./testing.sh
diff --git a/testsuite/bunzip2.tests b/testsuite/bunzip2.tests
index 734acbb75..827aee867 100755
--- a/testsuite/bunzip2.tests
+++ b/testsuite/bunzip2.tests
@@ -1,6 +1,8 @@
 #!/bin/sh
 # Used by both gunzip and bunzip2 tests
+FAILCOUNT=0
 if test "${0##*/}" = "gunzip.tests"; then
    unpack=gunzip
    ext=gz
@@ -473,6 +475,7 @@ check() {
        echo "PASS: $1"
    else
        echo "FAIL: $1"
+        FAILCOUNT=$((FAILCOUNT + 1))
    fi
 }
@@ -520,5 +523,8 @@ if test "${0##*/}" = "bunzip2.tests"; then
        echo "PASS: $unpack: test bz2 file"
    else
        echo "FAIL: $unpack: test bz2 file"
+        FAILCOUNT=$((FAILCOUNT + 1))
    fi
 fi
+exit $((FAILCOUNT <= 255 ? FAILCOUNT : 255))
diff --git a/testsuite/busybox.tests b/testsuite/busybox.tests
index 0c740530d..04fea3ea2 100755
--- a/testsuite/busybox.tests
+++ b/testsuite/busybox.tests
@@ -2,7 +2,7 @@
 # Tests for busybox applet itself.
 # Copyright 2005 by Rob Landley <rob@landley.net>
-# Licensed under GPL v2, see file LICENSE for details.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 . ./testing.sh
diff --git a/testsuite/bzcat.tests b/testsuite/bzcat.tests
index 78d74f229..5b4f3f4b3 100755
--- a/testsuite/bzcat.tests
+++ b/testsuite/bzcat.tests
@@ -1,5 +1,7 @@
 #!/bin/sh
+FAILCOUNT=0
 ext=bz2
 bb="busybox "
@@ -35,6 +37,7 @@ check() {
        echo "PASS: $1"
    else
        echo "FAIL: $1"
+        FAILCOUNT=$((FAILCOUNT + 1))
    fi
 }
@@ -47,3 +50,5 @@ prep; check "bzcat: dont delete src" "${bb}bzcat t2.bz2; test -f t2.bz2 && echo
 )
 rm -rf testdir
+exit $((FAILCOUNT <= 255 ? FAILCOUNT : 255))
diff --git a/testsuite/cal.tests b/testsuite/cal.tests
index db693ee59..5509cf0ef 100755
--- a/testsuite/cal.tests
+++ b/testsuite/cal.tests
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Copyright 2010 by Denys Vlasenko
-# Licensed under GPL v2, see file LICENSE for details.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 . ./testing.sh
 test -f "$bindir/.config" && . "$bindir/.config"
diff --git a/testsuite/comm.tests b/testsuite/comm.tests
index 753db217c..2f4816893 100755
--- a/testsuite/comm.tests
+++ b/testsuite/comm.tests
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Copyright 2008 by Denys Vlasenko <vda.linux@googlemail.com>
-# Licensed under GPL v2, see file LICENSE for details.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 . ./testing.sh
diff --git a/testsuite/cp.tests b/testsuite/cp.tests
index e81939df5..33cd876be 100755
--- a/testsuite/cp.tests
+++ b/testsuite/cp.tests
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Copyright 2010 by Denys Vlasenko
-# Licensed under GPL v2, see file LICENSE for details.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 . ./testing.sh
diff --git a/testsuite/cpio.tests b/testsuite/cpio.tests
index 44c17e693..05b92dbe4 100755
--- a/testsuite/cpio.tests
+++ b/testsuite/cpio.tests
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Copyright 2008 by Denys Vlasenko
-# Licensed under GPL v2, see file LICENSE for details.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 . ./testing.sh
diff --git a/testsuite/cut.tests b/testsuite/cut.tests
index 0fd79f2df..110340277 100755
--- a/testsuite/cut.tests
+++ b/testsuite/cut.tests
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Copyright 2007 by Denys Vlasenko <vda.linux@googlemail.com>
-# Licensed under GPL v2, see file LICENSE for details.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 . ./testing.sh
diff --git a/testsuite/diff.tests b/testsuite/diff.tests
index 27a4b33a7..6de46483b 100755
--- a/testsuite/diff.tests
+++ b/testsuite/diff.tests
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Copyright 2008 by Denys Vlasenko
-# Licensed under GPL v2, see file LICENSE for details.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 . ./testing.sh
diff --git a/testsuite/expand.tests b/testsuite/expand.tests
index 631ab4db3..0682c2950 100755
--- a/testsuite/expand.tests
+++ b/testsuite/expand.tests
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Copyright 2008 by Denys Vlasenko
-# Licensed under GPL v2, see file LICENSE for details.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 . ./testing.sh
 test -f "$bindir/.config" && . "$bindir/.config"
diff --git a/testsuite/fold.tests b/testsuite/fold.tests
index e5700cc2b..ecf8b9caa 100755
--- a/testsuite/fold.tests
+++ b/testsuite/fold.tests
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Copyright 2009 by Denys Vlasenko
-# Licensed under GPL v2, see file LICENSE for details.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 . ./testing.sh
 test -f "$bindir/.config" && . "$bindir/.config"
diff --git a/testsuite/grep.tests b/testsuite/grep.tests
index d4bf80d83..ffce033e6 100755
--- a/testsuite/grep.tests
+++ b/testsuite/grep.tests
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Copyright 2005 by Rob Landley <rob@landley.net>
-# Licensed under GPL v2, see file LICENSE for details.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 # AUDIT:
@@ -98,5 +98,9 @@ testing "grep -o does not loop forever" \
        'grep -o "[^/]*$"' \
        "test\n" \
        "" "/var/test\n"
+testing "grep -o does not loop forever on zero-length match" \
+        'grep -o "" | head -n1' \
+        "" \
+        "" "test\n"
 exit $FAILCOUNT
diff --git a/testsuite/ls.tests b/testsuite/ls.tests
index dc842123d..1669579e7 100755
--- a/testsuite/ls.tests
+++ b/testsuite/ls.tests
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Copyright 2010 by Denys Vlasenko
-# Licensed under GPL v2, see file LICENSE for details.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 . ./testing.sh
 test -f "$bindir/.config" && . "$bindir/.config"
diff --git a/testsuite/makedevs.tests b/testsuite/makedevs.tests
index f19af8a52..eb51410b3 100755
--- a/testsuite/makedevs.tests
+++ b/testsuite/makedevs.tests
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Copyright 2008 by Denys Vlasenko
-# Licensed under GPL v2, see file LICENSE for details.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 . ./testing.sh
diff --git a/testsuite/mdev.tests b/testsuite/mdev.tests
index c375fc774..7320e17dd 100755
--- a/testsuite/mdev.tests
+++ b/testsuite/mdev.tests
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Copyright 2008 by Denys Vlasenko
-# Licensed under GPL v2, see file LICENSE for details.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 . ./testing.sh
@@ -38,6 +38,16 @@ brw-rw---- 1 0 0 8,0 sda
 SKIP=
 # continuing to use directory structure from prev test
+optional STATIC FEATURE_MDEV_CONF FEATURE_LS_TIMESTAMPS FEATURE_LS_USERNAME
+testing "mdev deletes /block/sda" \
+        "env - PATH=$PATH ACTION=remove DEVPATH=/block/sda chroot mdev.testdir /mdev 2>&1;
+        ls -ln mdev.testdir/dev | $FILTER_LS" \
+"\
+" \
+        "" ""
+SKIP=
+# continuing to use directory structure from prev test
 rm -rf mdev.testdir/dev/*
 echo ".* 1:1 666" >mdev.testdir/etc/mdev.conf
 echo "sda 2:2 444" >>mdev.testdir/etc/mdev.conf
diff --git a/testsuite/mkfs.minix.tests b/testsuite/mkfs.minix.tests
index 7cad7daa6..8a33c1681 100755
--- a/testsuite/mkfs.minix.tests
+++ b/testsuite/mkfs.minix.tests
@@ -2,7 +2,7 @@
 # mkfs.minix tests.
 # Copyright 2007 by Denys Vlasenko
-# Licensed under GPL v2, see file LICENSE for details.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 . ./testing.sh
diff --git a/testsuite/mount.testroot b/testsuite/mount.testroot
index e18d0461d..4f34c5719 100755
--- a/testsuite/mount.testroot
+++ b/testsuite/mount.testroot
@@ -2,7 +2,7 @@
 # SUSv3 compliant mount and umount tests.
 # Copyright 2005 by Rob Landley <rob@landley.net>
-# Licensed under GPL v2, see file LICENSE for details.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 if [ -z "$TESTDIR" ]
 then
diff --git a/testsuite/mount.tests b/testsuite/mount.tests
index ce1a6006b..d3d2400e8 100755
--- a/testsuite/mount.tests
+++ b/testsuite/mount.tests
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Copyright 2007 by Denys Vlasenko <vda.linux@googlemail.com>
-# Licensed under GPL v2, see file LICENSE for details.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 . ./testing.sh
 test -f "$bindir/.config" && . "$bindir/.config"
diff --git a/testsuite/od.tests b/testsuite/od.tests
index a2d015ad7..138efedea 100755
--- a/testsuite/od.tests
+++ b/testsuite/od.tests
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Copyright 2008 by Denys Vlasenko
-# Licensed under GPL v2, see file LICENSE for details.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 . ./testing.sh
diff --git a/testsuite/parse.tests b/testsuite/parse.tests
index 999efef1c..9899b73bf 100755
--- a/testsuite/parse.tests
+++ b/testsuite/parse.tests
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Copyright 2008 by Denys Vlasenko <vda.linux@googlemail.com>
-# Licensed under GPL v2, see file LICENSE for details.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 . ./testing.sh
diff --git a/testsuite/patch.tests b/testsuite/patch.tests
index f55b53f61..e482304f6 100755
--- a/testsuite/patch.tests
+++ b/testsuite/patch.tests
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Copyright 2008 by Denys Vlasenko
-# Licensed under GPL v2, see file LICENSE for details.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 . ./testing.sh
@@ -129,7 +129,6 @@ abc
 " \
 # testing "test name" "command(s)" "expected result" "file input" "stdin"
 testing "patch -N ignores already applied hunk" \
        'patch -N 2>&1; echo $?; cat input' \
 "\
@@ -153,6 +152,29 @@ def
 123
 " \
+# testing "test name" "command(s)" "expected result" "file input" "stdin"
+testing "patch FILE PATCH" \
+        'cat >a.patch; patch input a.patch 2>&1; echo $?; cat input; rm a.patch' \
+"\
+patching file input
+0
+abc
+def
+123
+" \
+"\
+abc
+123
+" \
+"\
+--- foo.old
+++ foo
+@@ -1,2 +1,3 @@
+ abc
+def
+ 123
+" \
 rm input.orig 2>/dev/null
 exit $FAILCOUNT
diff --git a/testsuite/pidof.tests b/testsuite/pidof.tests
index 624b0a720..2a06d2b1c 100755
--- a/testsuite/pidof.tests
+++ b/testsuite/pidof.tests
@@ -2,7 +2,7 @@
 # pidof tests.
 # Copyright 2005 by Bernhard Reutner-Fischer
-# Licensed under GPL v2, see file LICENSE for details.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 # AUDIT:
diff --git a/testsuite/printf.tests b/testsuite/printf.tests
index 95f8110ad..b48e293f4 100755
--- a/testsuite/printf.tests
+++ b/testsuite/printf.tests
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Copyright 2008 by Denys Vlasenko
-# Licensed under GPL v2, see file LICENSE for details.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 . ./testing.sh
diff --git a/testsuite/readlink.tests b/testsuite/readlink.tests
index ecc3ad03e..c7fc8adf0 100755
--- a/testsuite/readlink.tests
+++ b/testsuite/readlink.tests
@@ -2,7 +2,7 @@
 # Readlink tests.
 # Copyright 2006 by Natanael Copa <n@tanael.org>
-# Licensed under GPL v2, see file LICENSE for details.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 . ./testing.sh
@@ -29,3 +29,5 @@ testing "readlink -f on a wierd dir" "readlink -f $TESTDIR/../$TESTFILE" "$PWD/$
 # clean up
 rm -r "$TESTLINK" "$TESTDIR"
+exit $((FAILCOUNT <= 255 ? FAILCOUNT : 255))
diff --git a/testsuite/runtest b/testsuite/runtest
index c300233cd..9a4fccbbf 100755
--- a/testsuite/runtest
+++ b/testsuite/runtest
@@ -4,6 +4,8 @@
 . ./testing.sh
+total_failed=0
 # Run one old-style test.
 # Tests are stored in applet/testcase shell scripts.
 # They are run using "sh -x -e applet/testcase".
@@ -73,6 +75,7 @@ run_oldstyle_applet_tests()
                        *.r[0-9]*) continue ;; # svn-produced junk
                esac
                run_applet_testcase "$applet" "$testcase" || status=1
+                total_failed=$((total_failed + status))
        done
        return $status
 }
@@ -150,7 +153,10 @@ for applet in $applets; do
                fi
 #               echo "Running test $tsdir/$applet.tests"
                PATH="$LINKSDIR:$tsdir:$bindir:$PATH" \
-                        "$tsdir/$applet.tests" || status=1
+                        "$tsdir/$applet.tests"
+                rc=$?
+                total_failed=$((total_failed + rc))
+                test $rc -ne 0 && status=1
        fi
 done
@@ -158,6 +164,6 @@ done
 #rm -rf "$LINKSDIR"
 if [ $status -ne 0 ] && [ x"$VERBOSE" = x ]; then
-        echo "Failures detected, running with -v (verbose) will give more info"
+        echo "$total_failed failure(s) detected; running with -v (verbose) will give more info"
 fi
 exit $status
diff --git a/testsuite/rx.tests b/testsuite/rx.tests
index 985fcdc01..37fa02e5e 100755
--- a/testsuite/rx.tests
+++ b/testsuite/rx.tests
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Copyright 2009 by Denys Vlasenko
-# Licensed under GPL v2, see file LICENSE for details.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 . ./testing.sh
diff --git a/testsuite/sed.tests b/testsuite/sed.tests
index 880fc2118..395372ae6 100755
--- a/testsuite/sed.tests
+++ b/testsuite/sed.tests
@@ -2,7 +2,7 @@
 # SUSv3 compliant sed tests.
 # Copyright 2005 by Rob Landley <rob@landley.net>
-# Licensed under GPL v2, see file LICENSE for details.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 . ./testing.sh
@@ -80,10 +80,18 @@ test x"$SKIP_KNOWN_BUGS" = x"" && {
 # Query: how does this interact with no newline at EOF?
 testing "sed n (flushes pattern space, terminates early)" "sed -e 'n;p'" \
        "a\nb\nb\nc\n" "" "a\nb\nc\n"
-# N does _not_ flush pattern space, therefore c is still in there @ script end.
-testing "sed N (doesn't flush pattern space when terminating)" "sed -e 'N;p'" \
-        "a\nb\na\nb\nc\n" "" "a\nb\nc\n"
 }
+# non-GNU sed: N does _not_ flush pattern space, therefore c is eaten @ script end
+# GNU sed: N flushes pattern space, therefore c is printed too @ script end
+testing "sed N (flushes pattern space (GNU behavior))" "sed -e 'N;p'" \
+        "a\nb\na\nb\nc\n" "" "a\nb\nc\n"
+testing "sed N test2" "sed ':a;N;s/\n/ /;ta'" \
+        "a b c\n" "" "a\nb\nc\n"
+testing "sed N test3" "sed 'N;s/\n/ /'" \
+        "a b\nc\n" "" "a\nb\nc\n"
 testing "sed address match newline" 'sed "/b/N;/b\\nc/i woo"' \
        "a\nwoo\nb\nc\nd\n" "" "a\nb\nc\nd\n"
diff --git a/testsuite/seq.tests b/testsuite/seq.tests
index 7a5537427..1e1116c7d 100755
--- a/testsuite/seq.tests
+++ b/testsuite/seq.tests
@@ -2,7 +2,7 @@
 # SUSv3 compliant seq tests.
 # Copyright 2006 by Rob Landley <rob@landley.net>
-# Licensed under GPL v2, see file LICENSE for details.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 # AUDIT: Full SUSv3 coverage (except internationalization).
diff --git a/testsuite/sort.tests b/testsuite/sort.tests
index 8a810f8d4..91b282ea0 100755
--- a/testsuite/sort.tests
+++ b/testsuite/sort.tests
@@ -2,7 +2,7 @@
 # SUSv3 compliant sort tests.
 # Copyright 2005 by Rob Landley <rob@landley.net>
-# Licensed under GPL v2, see file LICENSE for details.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 . ./testing.sh
diff --git a/testsuite/start-stop-daemon.tests b/testsuite/start-stop-daemon.tests
index 76b0be08c..d07aeef0e 100755
--- a/testsuite/start-stop-daemon.tests
+++ b/testsuite/start-stop-daemon.tests
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Copyright 2008 by Denys Vlasenko
-# Licensed under GPL v2, see file LICENSE for details.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 . ./testing.sh
diff --git a/testsuite/sum.tests b/testsuite/sum.tests
index da278c787..b9f4cbfa8 100755
--- a/testsuite/sum.tests
+++ b/testsuite/sum.tests
@@ -2,7 +2,7 @@
 # unit test for sum.
 # Copyright 2007 by Bernhard Reutner-Fischer
-# Licensed under GPL v2 or later, see file LICENSE for details.
+# Licensed under GPLv2 or later, see file LICENSE in this source tree.
 # AUDIT: Unit tests for sum
diff --git a/testsuite/tail.tests b/testsuite/tail.tests
index d2427d430..7140da262 100755
--- a/testsuite/tail.tests
+++ b/testsuite/tail.tests
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Copyright 2009 by Denys Vlasenko <vda.linux@googlemail.com>
-# Licensed under GPL v2, see file LICENSE for details.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 . ./testing.sh
diff --git a/testsuite/tar.tests b/testsuite/tar.tests
index 6604b4d22..cef16b65e 100755
--- a/testsuite/tar.tests
+++ b/testsuite/tar.tests
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Copyright 2009 by Denys Vlasenko
-# Licensed under GPL v2, see file LICENSE for details.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 . ./testing.sh
diff --git a/testsuite/taskset.tests b/testsuite/taskset.tests
index 1a19285d7..3fb5c90d0 100755
--- a/testsuite/taskset.tests
+++ b/testsuite/taskset.tests
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Copyright 2006 Bernhard Reutner-Fischer
-# Licensed under GPL v2 or later, see file LICENSE for details.
+# Licensed under GPLv2 or later, see file LICENSE in this source tree.
 . ./testing.sh
 a="taskset"
diff --git a/testsuite/test.tests b/testsuite/test.tests
index 7d8044467..2c92e34ba 100755
--- a/testsuite/test.tests
+++ b/testsuite/test.tests
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Copyright 2007 by Denys Vlasenko <vda.linux@googlemail.com>
-# Licensed under GPL v2, see file LICENSE for details.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 . ./testing.sh
diff --git a/testsuite/tr.tests b/testsuite/tr.tests
index 5dabbb52f..5cca299ac 100755
--- a/testsuite/tr.tests
+++ b/testsuite/tr.tests
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Copyright 2009 by Denys Vlasenko <vda.linux@googlemail.com>
-# Licensed under GPL v2, see file LICENSE for details.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 . ./testing.sh
diff --git a/testsuite/unexpand.tests b/testsuite/unexpand.tests
index 8dbe3eb27..7b326dc2c 100755
--- a/testsuite/unexpand.tests
+++ b/testsuite/unexpand.tests
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Copyright 2008 by Denys Vlasenko
-# Licensed under GPL v2, see file LICENSE for details.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 . ./testing.sh
 test -f "$bindir/.config" && . "$bindir/.config"
diff --git a/testsuite/uniq.tests b/testsuite/uniq.tests
index 02c595a0e..83bf382cd 100755
--- a/testsuite/uniq.tests
+++ b/testsuite/uniq.tests
@@ -2,7 +2,7 @@
 # SUSv3 compliant uniq tests.
 # Copyright 2005 by Rob Landley <rob@landley.net>
-# Licensed under GPL v2, see file LICENSE for details.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 # AUDIT: Full SUSv3 coverage (except internationalization).
diff --git a/testsuite/unzip.tests b/testsuite/unzip.tests
index 0ce5da26c..8677a0306 100755
--- a/testsuite/unzip.tests
+++ b/testsuite/unzip.tests
@@ -3,7 +3,7 @@
 # Tests for unzip.
 # Copyright 2006 Rob Landley <rob@landley.net>
 # Copyright 2006 Glenn McGrath
-# Licensed under GPL v2, see file LICENSE for details.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 . ./testing.sh
diff --git a/testsuite/uuencode.tests b/testsuite/uuencode.tests
index adb2d3390..cd6191b1b 100755
--- a/testsuite/uuencode.tests
+++ b/testsuite/uuencode.tests
@@ -2,7 +2,7 @@
 # unit test for uuencode to test functionality.
 # Copyright 2006 by Erik Hovland <erik@hovland.org>
-# Licensed under GPL v2, see file LICENSE for details.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 # AUDIT: Unit tests for uuencode
diff --git a/testsuite/xargs.tests b/testsuite/xargs.tests
index 6463252bf..2d0a201b7 100755
--- a/testsuite/xargs.tests
+++ b/testsuite/xargs.tests
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Copyright 2008 by Denys Vlasenko
-# Licensed under GPL v2, see file LICENSE for details.
+# Licensed under GPLv2, see file LICENSE in this source tree.
 . ./testing.sh
diff --git a/util-linux/Kbuild.src b/util-linux/Kbuild.src
index afc0db50e..c06d911ec 100644
--- a/util-linux/Kbuild.src
+++ b/util-linux/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/util-linux/acpid.c b/util-linux/acpid.c
index 11a9f624a..c3b3c8b0b 100644
--- a/util-linux/acpid.c
+++ b/util-linux/acpid.c
@@ -4,7 +4,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/util-linux/blkid.c b/util-linux/blkid.c
index ec699d167..4ce44b144 100644
--- a/util-linux/blkid.c
+++ b/util-linux/blkid.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2008 Denys Vlasenko.
 *
- * 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/util-linux/dmesg.c b/util-linux/dmesg.c
index b0dc592d2..06a03d3fb 100644
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@@ -6,7 +6,7 @@
 * Copyright 2006 Rob Landley <rob@landley.net>
 * Copyright 2006 Bernhard Reutner-Fischer <rep.nop@aon.at>
 *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #include <sys/klog.h>
 #include "libbb.h"
diff --git a/util-linux/fbset.c b/util-linux/fbset.c
index 2769a371a..07c8f55d1 100644
--- a/util-linux/fbset.c
+++ b/util-linux/fbset.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 1999 by Randolph Chung <tausq@debian.org>
 *
- * 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 is a from-scratch implementation of fbset; but the de facto fbset
 * implementation was a good reference. fbset (original) is released under
diff --git a/util-linux/fdformat.c b/util-linux/fdformat.c
index 3831ab44e..f5c386c46 100644
--- a/util-linux/fdformat.c
+++ b/util-linux/fdformat.c
@@ -2,7 +2,7 @@
 /* fdformat.c  -  Low-level formats a floppy disk - Werner Almesberger
 * 5 July 2003 -- modified for Busybox by Erik Andersen
 *
- * 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/util-linux/fdisk.c b/util-linux/fdisk.c
index fc02000e5..b6417a355 100644
--- a/util-linux/fdisk.c
+++ b/util-linux/fdisk.c
@@ -4,7 +4,7 @@
 * Copyright (C) 1992  A. V. Le Blanc (LeBlanc@mcc.ac.uk)
 * Copyright (C) 2001,2002 Vladimir Oleynik <dzo@simtreas.ru> (initial bb port)
 *
- * 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.
 */
 #ifndef _LARGEFILE64_SOURCE
diff --git a/util-linux/fdisk_aix.c b/util-linux/fdisk_aix.c
index 2a0ab1744..ee5df50e5 100644
--- a/util-linux/fdisk_aix.c
+++ b/util-linux/fdisk_aix.c
@@ -2,7 +2,7 @@
 /*
 * Copyright (C) Andreas Neuper, Sep 1998.
 *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 typedef struct {
diff --git a/util-linux/fdisk_sgi.c b/util-linux/fdisk_sgi.c
index 0e3cff50c..785fc661b 100644
--- a/util-linux/fdisk_sgi.c
+++ b/util-linux/fdisk_sgi.c
@@ -1,7 +1,7 @@
 /*
 * Copyright (C) Andreas Neuper, Sep 1998.
 *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #if ENABLE_FEATURE_SGI_LABEL
diff --git a/util-linux/fdisk_sun.c b/util-linux/fdisk_sun.c
index 463082f6a..6b7940c54 100644
--- a/util-linux/fdisk_sun.c
+++ b/util-linux/fdisk_sun.c
@@ -9,7 +9,7 @@
 * Sat Mar 20 EST 1999 Arnaldo Carvalho de Melo <acme@conectiva.com.br>
 *      Internationalization
 *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #if ENABLE_FEATURE_SUN_LABEL
diff --git a/util-linux/findfs.c b/util-linux/findfs.c
index 1e9c68752..e1ec41f1b 100644
--- a/util-linux/findfs.c
+++ b/util-linux/findfs.c
@@ -5,7 +5,7 @@
 * Copyright (C) 2006 by Jason Schoon <floydpink@gmail.com>
 * Some portions cribbed from e2fsprogs, util-linux, dosfstools
 *
- * 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/util-linux/freeramdisk.c b/util-linux/freeramdisk.c
index 4949056a6..7ad443086 100644
--- a/util-linux/freeramdisk.c
+++ b/util-linux/freeramdisk.c
@@ -6,7 +6,7 @@
 * Adjusted a bit by Erik Andersen <andersen@codepoet.org>
 * Unified with fdflush by Tito Ragusa <farmatito@tiscali.it>
 *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #include <sys/mount.h>
 #include "libbb.h"
diff --git a/util-linux/fsck_minix.c b/util-linux/fsck_minix.c
index 970f5f79f..e02e05fa4 100644
--- a/util-linux/fsck_minix.c
+++ b/util-linux/fsck_minix.c
@@ -4,7 +4,7 @@
 *
 * (C) 1991, 1992 Linus Torvalds.
 *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 /*
diff --git a/util-linux/getopt.c b/util-linux/getopt.c
index adb96751f..7c498538f 100644
--- a/util-linux/getopt.c
+++ b/util-linux/getopt.c
@@ -3,7 +3,7 @@
 * getopt.c - Enhanced implementation of BSD getopt(1)
 *   Copyright (c) 1997, 1998, 1999, 2000  Frodo Looijaard <frodol@dds.nl>
 *
- * 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/util-linux/hexdump.c b/util-linux/hexdump.c
index 3db91113d..8c4d521ab 100644
--- a/util-linux/hexdump.c
+++ b/util-linux/hexdump.c
@@ -6,7 +6,7 @@
 * Copyright (c) 1989
 *      The Regents of the University of California.  All rights reserved.
 *
- * 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/util-linux/hwclock.c b/util-linux/hwclock.c
index 3da2e23c3..922dd0578 100644
--- a/util-linux/hwclock.c
+++ b/util-linux/hwclock.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2002 Robert Griebl <griebl@gmx.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 "libbb.h"
diff --git a/util-linux/ipcrm.c b/util-linux/ipcrm.c
index 8b0b226d3..6360c706f 100644
--- a/util-linux/ipcrm.c
+++ b/util-linux/ipcrm.c
@@ -5,7 +5,7 @@
 * 01 Sept 2004 - Rodney Radford <rradford@mindspring.com>
 * Adapted for busybox from util-linux-2.12a.
 *
- * 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/util-linux/ipcs.c b/util-linux/ipcs.c
index c1103b093..14df65280 100644
--- a/util-linux/ipcs.c
+++ b/util-linux/ipcs.c
@@ -5,7 +5,7 @@
 * 01 Sept 2004 - Rodney Radford <rradford@mindspring.com>
 * Adapted for busybox from util-linux-2.12a.
 *
- * 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.
 */
 /* X/OPEN tells us to use <sys/{types,ipc,sem}.h> for semctl() */
diff --git a/util-linux/losetup.c b/util-linux/losetup.c
index 3873be399..776f784f5 100644
--- a/util-linux/losetup.c
+++ b/util-linux/losetup.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2002  Matt Kraai.
 *
- * 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/util-linux/lspci.c b/util-linux/lspci.c
index 514c3a4e0..46e93b04d 100644
--- a/util-linux/lspci.c
+++ b/util-linux/lspci.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2009  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"
diff --git a/util-linux/lsusb.c b/util-linux/lsusb.c
index 23b03495f..6f9b54daa 100644
--- a/util-linux/lsusb.c
+++ b/util-linux/lsusb.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 2009  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"
diff --git a/util-linux/mdev.c b/util-linux/mdev.c
index b4042c07e..a970f91f2 100644
--- a/util-linux/mdev.c
+++ b/util-linux/mdev.c
@@ -5,7 +5,7 @@
 * Copyright 2005 Rob Landley <rob@landley.net>
 * Copyright 2005 Frank Sorenson <frank@tuxrocks.com>
 *
- * Licensed under GPL version 2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #include "libbb.h"
 #include "xregex.h"
@@ -132,6 +132,7 @@ static void make_device(char *path, int delete)
                        major = -1;
                }
        }
+        /* else: for delete, -1 still deletes the node, but < -1 suppresses that */
        /* Determine device name, type, major and minor */
        device_name = (char*) bb_basename(path);
@@ -279,7 +280,7 @@ static void make_device(char *path, int delete)
                                if (aliaslink == '!' && s == a+1) {
                                        val = st;
                                        /* "!": suppress node creation/deletion */
-                                        major = -1;
+                                        major = -2;
                                }
                                else if (aliaslink == '>' || aliaslink == '=') {
                                        val = st;
@@ -379,7 +380,7 @@ static void make_device(char *path, int delete)
                                free(command);
                        }
-                        if (delete && major >= 0) {
+                        if (delete && major >= -1) {
                                if (ENABLE_FEATURE_MDEV_RENAME && alias) {
                                        if (aliaslink == '>')
                                                unlink(device_name);
diff --git a/util-linux/mkfs_ext2.c b/util-linux/mkfs_ext2.c
index 14feb9288..6dccd3a5d 100644
--- a/util-linux/mkfs_ext2.c
+++ b/util-linux/mkfs_ext2.c
@@ -5,7 +5,7 @@
 *
 * Busybox'ed (2009) 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"
 #include <linux/fs.h>
@@ -221,7 +221,7 @@ int mkfs_ext2_main(int argc UNUSED_PARAM, char **argv)
        // open the device, check the device is a block device
        xmove_fd(xopen(argv[0], O_WRONLY), fd);
-        fstat(fd, &st);
+        xfstat(fd, &st, argv[0]);
        if (!S_ISBLK(st.st_mode) && !(option_mask32 & OPT_F))
                bb_error_msg_and_die("%s: not a block device", argv[0]);
diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c
index abfb94226..95499ba17 100644
--- a/util-linux/mkfs_minix.c
+++ b/util-linux/mkfs_minix.c
@@ -4,7 +4,7 @@
 *
 * (C) 1991 Linus Torvalds.
 *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 /*
@@ -686,8 +686,7 @@ int mkfs_minix_main(int argc UNUSED_PARAM, char **argv)
                bb_error_msg_and_die("can't format mounted filesystem");
        xmove_fd(xopen(G.device_name, O_RDWR), dev_fd);
-        if (fstat(dev_fd, &statbuf) < 0)
+        xfstat(dev_fd, &statbuf, G.device_name);
-                bb_error_msg_and_die("can't stat '%s'", G.device_name);
        if (!S_ISBLK(statbuf.st_mode))
                opt &= ~1; // clear -c (check)
diff --git a/util-linux/mkfs_reiser.c b/util-linux/mkfs_reiser.c
index f9a0ca82a..00ce8f1d1 100644
--- a/util-linux/mkfs_reiser.c
+++ b/util-linux/mkfs_reiser.c
@@ -4,7 +4,7 @@
 *
 * Busybox'ed (2009) 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"
 #include <linux/fs.h>
@@ -168,9 +168,9 @@ int mkfs_reiser_main(int argc UNUSED_PARAM, char **argv)
        // check the device is a block device
        fd = xopen(argv[0], O_WRONLY | O_EXCL);
-        fstat(fd, &st);
+        xfstat(fd, &st, argv[0]);
        if (!S_ISBLK(st.st_mode) && !(option_mask32 & OPT_f))
-                bb_error_msg_and_die("not a block device");
+                bb_error_msg_and_die("%s: not a block device", argv[0]);
        // check if it is mounted
        // N.B. what if we format a file? find_mount_point will return false negative since
diff --git a/util-linux/mkfs_vfat.c b/util-linux/mkfs_vfat.c
index c57cd9d5a..45760f7c5 100644
--- a/util-linux/mkfs_vfat.c
+++ b/util-linux/mkfs_vfat.c
@@ -5,7 +5,7 @@
 *
 * Busybox'ed (2009) 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"
@@ -245,8 +245,7 @@ int mkfs_vfat_main(int argc UNUSED_PARAM, char **argv)
        volume_id = time(NULL);
        dev = xopen(device_name, O_RDWR);
-        if (fstat(dev, &st) < 0)
+        xfstat(dev, &st, device_name);
-                bb_simple_perror_msg_and_die(device_name);
        //
        // Get image size and sector size
diff --git a/util-linux/mkswap.c b/util-linux/mkswap.c
index 7e32d91ed..53537fcd9 100644
--- a/util-linux/mkswap.c
+++ b/util-linux/mkswap.c
@@ -3,7 +3,7 @@
 *
 * Copyright 2006 Rob Landley <rob@landley.net>
 *
- * Licensed under GPL version 2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #include "libbb.h"
@@ -15,8 +15,7 @@ static void mkswap_selinux_setcontext(int fd, const char *path)
        if (!is_selinux_enabled())
                return;
-        if (fstat(fd, &stbuf) < 0)
+        xfstat(fd, &stbuf, argv[0]);
-                bb_perror_msg_and_die("fstat failed");
        if (S_ISREG(stbuf.st_mode)) {
                security_context_t newcon;
                security_context_t oldcon = NULL;
@@ -102,7 +101,15 @@ int mkswap_main(int argc UNUSED_PARAM, char **argv)
        printf("Setting up swapspace version 1, size = %"OFF_FMT"u bytes\n", len);
        mkswap_selinux_setcontext(fd, argv[0]);
-        /* Make a header. hdr is zero-filled so far... */
+        /* hdr is zero-filled so far. Clear the first kbyte, or else
+         * mkswap-ing former FAT partition does NOT erase its signature.
+         *
+         * util-linux-ng 2.17.2 claims to erase it only if it does not see
+         * a partition table and is not run on whole disk. -f forces it.
+         */
+        xwrite(fd, hdr, 1024);
+        /* Fill the header. */
        hdr->version = 1;
        hdr->last_page = (uoff_t)len / pagesize;
@@ -123,7 +130,6 @@ int mkswap_main(int argc UNUSED_PARAM, char **argv)
        /* Write the header.  Sync to disk because some kernel versions check
         * signature on disk (not in cache) during swapon. */
-        xlseek(fd, 1024, SEEK_SET);
        xwrite(fd, hdr, NWORDS * 4);
        xlseek(fd, pagesize - 10, SEEK_SET);
        xwrite(fd, SWAPSPACE2, 10);
diff --git a/util-linux/more.c b/util-linux/more.c
index 00a427a6f..1fd6f9ee8 100644
--- a/util-linux/more.c
+++ b/util-linux/more.c
@@ -11,7 +11,7 @@
 *
 * Termios corrects by Vladimir Oleynik <dzo@simtreas.ru>
 *
- * 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/util-linux/mount.c b/util-linux/mount.c
index aa17872da..5e85f9986 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -6,7 +6,7 @@
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 * Copyright (C) 2005-2006 by Rob Landley <rob@landley.net>
 *
- * 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.
 */
 // Design notes: There is no spec for mount.  Remind me to write one.
 //
@@ -532,7 +532,7 @@ static int mount_it_now(struct mntent *mp, long vfsflags, char *filteropts)
 * Linux NFS mount
 * Copyright (C) 1993 Rick Sladkey <jrs@world.std.com>
 *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 *
 * Wed Feb  8 12:51:48 1995, biro@yggdrasil.com (Ross Biro): allow all port
 * numbers to be specified on the command line.
diff --git a/util-linux/pivot_root.c b/util-linux/pivot_root.c
index 28af00cc1..ac52a7aed 100644
--- a/util-linux/pivot_root.c
+++ b/util-linux/pivot_root.c
@@ -6,7 +6,7 @@
 * pivot_root syscall stubbed by Erik Andersen, so it will compile
 *     regardless of the kernel being used.
 *
- * Licensed under GPL version 2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #include "libbb.h"
diff --git a/util-linux/rdate.c b/util-linux/rdate.c
index f5df2f794..2c3de74bc 100644
--- a/util-linux/rdate.c
+++ b/util-linux/rdate.c
@@ -5,7 +5,7 @@
 *
 * by Sterling Huxley <sterling@europa.com>
 *
- * Licensed under GPL v2 or later, see file LICENSE for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
 */
 #include "libbb.h"
diff --git a/util-linux/rdev.c b/util-linux/rdev.c
index 33abd39dc..2fbb4d377 100644
--- a/util-linux/rdev.c
+++ b/util-linux/rdev.c
@@ -5,7 +5,7 @@
 * Copyright (c) 2008 Nuovation System Designs, LLC
 *   Grant Erickson <gerickson@nuovations.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/util-linux/readprofile.c b/util-linux/readprofile.c
index 219654496..00b3382d8 100644
--- a/util-linux/readprofile.c
+++ b/util-linux/readprofile.c
@@ -4,7 +4,7 @@
 *
 *  Copyright (C) 1994,1996 Alessandro Rubini (rubini@ipvvis.unipv.it)
 *
- * 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/util-linux/rev.c b/util-linux/rev.c
index 8d5ac2f2d..e1e004437 100644
--- a/util-linux/rev.c
+++ b/util-linux/rev.c
@@ -3,7 +3,7 @@
 *
 * Copyright (C) 2010 Marek Polacek <mmpolacek@gmail.com>
 *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 //applet:IF_REV(APPLET(rev, _BB_DIR_BIN, _BB_SUID_DROP))
diff --git a/util-linux/rtcwake.c b/util-linux/rtcwake.c
index b16376655..26e5b4724 100644
--- a/util-linux/rtcwake.c
+++ b/util-linux/rtcwake.c
@@ -3,7 +3,7 @@
 *
 * This version was taken from util-linux and scrubbed down for busybox.
 *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 *
 * This uses cross-platform Linux interfaces to enter a system sleep state,
 * and leave it no later than a specified time.  It uses any RTC framework
diff --git a/util-linux/script.c b/util-linux/script.c
index ba90b065d..0860bb083 100644
--- a/util-linux/script.c
+++ b/util-linux/script.c
@@ -8,7 +8,7 @@
 * Copyright (c) 1980
 *      The Regents of the University of California.  All rights reserved.
 *
- * 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/util-linux/scriptreplay.c b/util-linux/scriptreplay.c
index c87e44dfb..6eaba43fa 100644
--- a/util-linux/scriptreplay.c
+++ b/util-linux/scriptreplay.c
@@ -4,7 +4,7 @@
 *
 * pascal.bellard@ads-lu.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/util-linux/setarch.c b/util-linux/setarch.c
index 776caf909..7d5dc247c 100644
--- a/util-linux/setarch.c
+++ b/util-linux/setarch.c
@@ -4,7 +4,7 @@
 *
 * Copyright 2002 Andi Kleen, SuSE Labs.
 *
- * Licensed under GPL v2 or later, see file LICENSE for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
 */
 #include <sys/personality.h>
diff --git a/util-linux/swaponoff.c b/util-linux/swaponoff.c
index f2f52fb88..e2c060f30 100644
--- a/util-linux/swaponoff.c
+++ b/util-linux/swaponoff.c
@@ -4,7 +4,7 @@
 *
 * Copyright (C) 1999-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/util-linux/switch_root.c b/util-linux/switch_root.c
index e2da119de..d471437fd 100644
--- a/util-linux/switch_root.c
+++ b/util-linux/switch_root.c
@@ -3,7 +3,7 @@
 *
 * Switch from rootfs to another filesystem as the root of the mount tree.
 *
- * Licensed under GPL version 2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #include <sys/vfs.h>
 #include <sys/mount.h>
diff --git a/util-linux/umount.c b/util-linux/umount.c
index a19f86c3a..7ba46eeb0 100644
--- a/util-linux/umount.c
+++ b/util-linux/umount.c
@@ -5,7 +5,7 @@
 * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
 * Copyright (C) 2005 by Rob Landley <rob@landley.net>
 *
- * Licensed under GPL version 2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
 */
 #include <mntent.h>
 #include <sys/mount.h>
diff --git a/util-linux/volume_id/Kbuild.src b/util-linux/volume_id/Kbuild.src
index 8af3ccd81..70da65482 100644
--- a/util-linux/volume_id/Kbuild.src
+++ b/util-linux/volume_id/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/util-linux/volume_id/get_devname.c b/util-linux/volume_id/get_devname.c
index 4d9f9ecd0..bf32e6a8c 100644
--- a/util-linux/volume_id/get_devname.c
+++ b/util-linux/volume_id/get_devname.c
@@ -5,7 +5,7 @@
 * Copyright (C) 2006 by Jason Schoon <floydpink@gmail.com>
 * Some portions cribbed from e2fsprogs, util-linux, dosfstools
 *
- * 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/mount.h> /* BLKGETSIZE64 */
 #if !defined(BLKGETSIZE64)
author	Nguyễn Thái Ngọc Duy <pclouds@gmail.com>	2010-09-14 13:57:26 +1000
committer	Nguyễn Thái Ngọc Duy <pclouds@gmail.com>	2010-09-14 13:57:26 +1000
commit	0c9d2455301ed633826e222aacd930126990913e (patch)
tree	2353a480f55dfa41d9e6d2fa328af1b60dd3653e
parent	e8db4fe96b3a68b6f971d88084ef2fd2c8513e78 (diff)
parent	9dc04124d5a3f0c9be249287817a964691e187b0 (diff)
download	busybox-w32-0c9d2455301ed633826e222aacd930126990913e.tar.gz busybox-w32-0c9d2455301ed633826e222aacd930126990913e.tar.bz2 busybox-w32-0c9d2455301ed633826e222aacd930126990913e.zip