Merge branch 'busybox' into merge

7 files changed, 83 insertions, 14 deletions

diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 4a9d363dd..c528c8a2c 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -835,7 +835,8 @@ static int busybox_main(char **argv)
                         full_write2_str(a);
                         full_write2_str("\n");
                         i++;
-                        a += strlen(a) + 1;
+                        while (*a++ != '\0')
+                                continue;
                 }
                 return 0;
         }
diff --git a/libbb/common_bufsiz.c b/libbb/common_bufsiz.c
new file mode 100644
index 000000000..1a3585169
--- /dev/null
+++ b/libbb/common_bufsiz.c
@@ -0,0 +1,74 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * Utility routines.
+ *
+ * Copyright (C) 2016 Denys Vlasenko
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+//config:config FEATURE_USE_BSS_TAIL
+//config:       bool "Use the end of BSS page"
+//config:       default n
+//config:       help
+//config:         Attempt to reclaim a small unused part of BSS.
+//config:
+//config:         Executables have the following parts:
+//config:         = read-only executable code and constants, also known as "text"
+//config:         = read-write data
+//config:         = non-initialized (zeroed on demand) data, also known as "bss"
+//config:
+//config:         At link time, "text" is padded to a full page. At runtime, all "text"
+//config:         pages are mapped RO and executable.
+//config:         "Data" starts on the next page boundary, but is not padded
+//config:         to a full page at the end. "Bss" starts wherever "data" ends.
+//config:         At runtime, "data" pages are mapped RW and they are file-backed
+//config:         (this includes a small portion of "bss" which may live in the last
+//config:         partial page of "data").
+//config:         Pages which are fully in "bss" are mapped to anonymous memory.
+//config:
+//config:         "Bss" end is usually not page-aligned. There is an unused space
+//config:         in the last page. Linker marks its start with the "_end" symbol.
+//config:
+//config:         This option will attempt to use that space for bb_common_bufsiz1[]
+//config:         array. If it fits after _end, it will be used, and COMMON_BUFSIZE
+//config:         will be enlarged from its guaranteed minimum size of 1 kbyte.
+//config:         This may require recompilation a second time, since value of _end
+//config:         is known only after final link.
+//config:
+//config:         If you are getting a build error like this:
+//config:               appletlib.c:(.text.main+0xd): undefined reference to '_end'
+//config:         disable this option.
+
+//kbuild:lib-y += common_bufsiz.o
+
+#include "libbb.h"
+#include "common_bufsiz.h"
+
+#if !ENABLE_FEATURE_USE_BSS_TAIL
+
+/* We use it for "global" data via *(struct global*)bb_common_bufsiz1.
+ * Since gcc insists on aligning struct global's members, it would be a pity
+ * (and an alignment fault on some CPUs) to mess it up. */
+char bb_common_bufsiz1[COMMON_BUFSIZE] ALIGNED(sizeof(long long));
+
+#else
+
+# ifndef setup_common_bufsiz
+/*
+ * It is not defined as a dummy macro.
+ * It means we have to provide this function.
+ */
+char *const bb_common_bufsiz1 __attribute__ ((section (".data")));
+void setup_common_bufsiz(void)
+{
+        if (!bb_common_bufsiz1)
+                *(char**)&bb_common_bufsiz1 = xzalloc(COMMON_BUFSIZE);
+}
+# else
+#  ifndef bb_common_bufsiz1
+   /* bb_common_bufsiz1[] is not aliased to _end[] */
+char bb_common_bufsiz1[COMMON_BUFSIZE] ALIGNED(sizeof(long long));
+#  endif
+# endif
+
+#endif
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index e7b9ddfa1..6c91f1794 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -829,12 +829,11 @@ static NOINLINE unsigned complete_cmd_dir_file(const char *command, int type)
         if (type == FIND_EXE_ONLY) {
                 const char *p = applet_names;
 
-                i = 0;
-                while (i < NUM_APPLETS) {
+                while (*p) {
                         if (strncmp(pfind, p, pf_len) == 0)
                                 add_match(xstrdup(p));
-                        p += strlen(p) + 1;
-                        i++;
+                        while (*p++ != '\0')
+                                continue;
                 }
         }
 #endif
diff --git a/libbb/messages.c b/libbb/messages.c
index 2aa3f175d..d74c237e7 100644
--- a/libbb/messages.c
+++ b/libbb/messages.c
@@ -61,8 +61,3 @@ const char bb_path_wtmp_file[] ALIGN1 =
 #  error unknown path to wtmp file
 # endif
 #endif
-
-/* We use it for "global" data via *(struct global*)&bb_common_bufsiz1.
- * Since gcc insists on aligning struct global's members, it would be a pity
- * (and an alignment fault on some CPUs) to mess it up. */
-char bb_common_bufsiz1[COMMON_BUFSIZE] ALIGNED(sizeof(long long));
diff --git a/libbb/mode_string.c b/libbb/mode_string.c
index f1afe7d61..934eb6dc7 100644
--- a/libbb/mode_string.c
+++ b/libbb/mode_string.c
@@ -87,9 +87,9 @@ const char* FAST_FUNC bb_mode_string(mode_t mode)
 
 /* The previous version used "0pcCd?bB-?l?s???".  However, the '0', 'C',
  * and 'B' types don't appear to be available on linux.  So I removed them. */
-static const char type_chars[16] = "?pc?d?b?-?l?s???";
+static const char type_chars[16] ALIGN1 = "?pc?d?b?-?l?s???";
 /********************************** 0123456789abcdef */
-static const char mode_chars[7] = "rwxSTst";
+static const char mode_chars[7] ALIGN1 = "rwxSTst";
 
 const char* FAST_FUNC bb_mode_string(mode_t mode)
 {
diff --git a/libbb/pw_encrypt.c b/libbb/pw_encrypt.c
index dbc15e5fc..4cdc2de76 100644
--- a/libbb/pw_encrypt.c
+++ b/libbb/pw_encrypt.c
@@ -9,7 +9,7 @@
 
 #include "libbb.h"
 
-/* static const uint8_t ascii64[] =
+/* static const uint8_t ascii64[] ALIGN1 =
  * "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
  */
 
diff --git a/libbb/u_signal_names.c b/libbb/u_signal_names.c
index 8c78f5e20..b49714f2a 100644
--- a/libbb/u_signal_names.c
+++ b/libbb/u_signal_names.c
@@ -19,7 +19,7 @@
 /* Believe it or not, but some arches have more than 32 SIGs!
  * HPPA: SIGSTKFLT == 36. */
 
-static const char signals[][7] = {
+static const char signals[][7] ALIGN1 = {
         // SUSv3 says kill must support these, and specifies the numerical values,
         // http://www.opengroup.org/onlinepubs/009695399/utilities/kill.html
         // {0, "EXIT"}, {1, "HUP"}, {2, "INT"}, {3, "QUIT"},