Merge branch 'origin/master' (early part)

4 files changed, 43 insertions, 22 deletions

diff --git a/libbb/Config.src b/libbb/Config.src
index a0aeb3683..80b1e0d21 100644
--- a/libbb/Config.src
+++ b/libbb/Config.src
@@ -5,6 +5,8 @@
 
 menu "Busybox Library Tuning"
 
+INSERT
+
 config PASSWORD_MINLEN
         int "Minimum password length"
         default 6
diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
index 9374feb17..2a50a1ae3 100644
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -6,6 +6,8 @@
 
 lib-y:=
 
+INSERT
+
 lib-y += appletlib.o
 lib-y += ask_confirmation.o
 lib-y += bb_askpass.o
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index cb18a688e..922f7d26b 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -98,13 +98,6 @@ static const char *unpack_usage_messages(void)
 #endif /* FEATURE_COMPRESS_USAGE */
 
 
-static void full_write2_str(const char *str)
-{
-        // This uses stdio:
-        //xwrite_str(STDERR_FILENO, str);
-        write(STDERR_FILENO, str, strlen(str));
-}
-
 void FAST_FUNC bb_show_usage(void)
 {
         if (ENABLE_SHOW_USAGE) {
diff --git a/libbb/xfuncs.c b/libbb/xfuncs.c
index 6200fc600..65437211d 100644
--- a/libbb/xfuncs.c
+++ b/libbb/xfuncs.c
@@ -49,23 +49,35 @@ char* FAST_FUNC strncpy_IFNAMSIZ(char *dst, const char *src)
 }
 
 
-// Convert unsigned integer to ascii, writing into supplied buffer.
-// A truncated result contains the first few digits of the result ala strncpy.
-// Returns a pointer past last generated digit, does _not_ store NUL.
-void BUG_sizeof_unsigned_not_4(void);
+/* Convert unsigned integer to ascii, writing into supplied buffer.
+ * A truncated result contains the first few digits of the result ala strncpy.
+ * Returns a pointer past last generated digit, does _not_ store NUL.
+ */
+void BUG_sizeof(void);
 char* FAST_FUNC utoa_to_buf(unsigned n, char *buf, unsigned buflen)
 {
         unsigned i, out, res;
-        if (sizeof(unsigned) != 4)
-                BUG_sizeof_unsigned_not_4();
+
         if (buflen) {
                 out = 0;
-                for (i = 1000000000; i; i /= 10) {
+                if (sizeof(n) == 4)
+                // 2^32-1 = 4294967295
+                        i = 1000000000;
+#if UINT_MAX > 4294967295 /* prevents warning about "const too large" */
+                else
+                if (sizeof(n) == 8)
+                // 2^64-1 = 18446744073709551615
+                        i = 10000000000000000000;
+#endif
+                else
+                        BUG_sizeof();
+                for (; i; i /= 10) {
                         res = n / i;
+                        n = n % i;
                         if (res || out || i == 1) {
-                                if (!--buflen) break;
+                                if (--buflen == 0)
+                                        break;
                                 out++;
-                                n -= res*i;
                                 *buf++ = '0' + res;
                         }
                 }
@@ -76,7 +88,9 @@ char* FAST_FUNC utoa_to_buf(unsigned n, char *buf, unsigned buflen)
 /* Convert signed integer to ascii, like utoa_to_buf() */
 char* FAST_FUNC itoa_to_buf(int n, char *buf, unsigned buflen)
 {
-        if (buflen && n < 0) {
+        if (!buflen)
+                return buf;
+        if (n < 0) {
                 n = -n;
                 *buf++ = '-';
                 buflen--;
@@ -87,16 +101,16 @@ char* FAST_FUNC itoa_to_buf(int n, char *buf, unsigned buflen)
 // The following two functions use a static buffer, so calling either one a
 // second time will overwrite previous results.
 //
-// The largest 32 bit integer is -2 billion plus null terminator, or 12 bytes.
-// It so happens that sizeof(int) * 3 is enough for 32+ bits.
+// The largest 32 bit integer is -2 billion plus NUL, or 1+10+1=12 bytes.
+// It so happens that sizeof(int) * 3 is enough for 32+ bit ints.
 // (sizeof(int) * 3 + 2 is correct for any width, even 8-bit)
 
 static char local_buf[sizeof(int) * 3];
 
-// Convert unsigned integer to ascii using a static buffer (returned).
+/* Convert unsigned integer to ascii using a static buffer (returned). */
 char* FAST_FUNC utoa(unsigned n)
 {
-        *(utoa_to_buf(n, local_buf, sizeof(local_buf))) = '\0';
+        *(utoa_to_buf(n, local_buf, sizeof(local_buf) - 1)) = '\0';
 
         return local_buf;
 }
@@ -104,7 +118,7 @@ char* FAST_FUNC utoa(unsigned n)
 /* Convert signed integer to ascii using a static buffer (returned). */
 char* FAST_FUNC itoa(int n)
 {
-        *(itoa_to_buf(n, local_buf, sizeof(local_buf))) = '\0';
+        *(itoa_to_buf(n, local_buf, sizeof(local_buf) - 1)) = '\0';
 
         return local_buf;
 }
@@ -204,6 +218,16 @@ int FAST_FUNC bb_putchar_stderr(char ch)
         return write(STDERR_FILENO, &ch, 1);
 }
 
+ssize_t FAST_FUNC full_write1_str(const char *str)
+{
+        return full_write(STDOUT_FILENO, str, strlen(str));
+}
+
+ssize_t FAST_FUNC full_write2_str(const char *str)
+{
+        return full_write(STDERR_FILENO, str, strlen(str));
+}
+
 static int wh_helper(int value, int def_val, const char *env_name, int *err)
 {
         if (value == 0) {