Merge branch 'origin/master' (early part)

118 files changed, 300 insertions, 216 deletions

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)) {
-                        bb_simple_perror_msg_and_die(fname);
-                }
+                xfstat(STDIN_FILENO, &sbuf, 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
- *          definition of MD5 in RFC 1321 from April 1992.
+ * md5.c - Compute MD5 checksum of strings according to the
+ *         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) 2001 Manuel Novoa III
- *  Copyright (C) 2003 Glenn L. McGrath
- *  Copyright (C) 2003 Erik Andersen
+ * Copyright (C) 1995-1999 Free Software Foundation, Inc.
+ * Copyright (C) 2001 Manuel Novoa III
+ * Copyright (C) 2003 Glenn L. McGrath
+ * 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--) {
-                *p = p1[size];
-                p++;
+        /* reverse string */
+        i = size = strlen(p1);
+        while (--i >= 0) {
+                *p++ = p1[i];
         }
-        /* restore pointer */
-        p -= strlen(p1);
+        p -= size; /* restore pointer */
+
         /* 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 UPPERCASE          2
-#define NUMBERS            4
-#define SPECIAL            8
+#define CATEGORIES  4
+
+#define LOWERCASE   1
+#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;
-        int c;
-        int length;
-        int mixed = 0;
-        /* Add 2 for each type of characters to the minlen of password */
-        int size = CONFIG_PASSWORD_MINLEN + 8;
+        unsigned length;
+        unsigned size;
+        unsigned mixed;
+        unsigned c;
+        unsigned i;
         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) {
-                                break; /* move past the matched char if possible */
+                        p++;
+                        if (!*p) {
+                                break;
                         }
                 }
-
-                if (c >= (length / 2)) {
+                /* More than 50% similar characters ? */
+                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)) {
-                        FILE *file;
-
-                        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);
-                        }
-                }
+                if (flags & PSSCAN_SMAPS)
+                        procps_read_smaps(pid, &sp->smaps, NULL, NULL);
 #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"