9 files changed, 38 insertions, 19 deletions

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;
-        unsigned long mapped_ro;
-        unsigned long shared_clean;
-        unsigned long shared_dirty;
-        unsigned long private_clean;
-        unsigned long private_dirty;
-        unsigned long stack;
+        struct smaprec smaps;
 #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