Merge branch 'busybox' into merge

5 files changed, 36 insertions, 6 deletions

diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index fb06ab9a5..f0df4e080 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -752,7 +752,7 @@ void FAST_FUNC run_applet_no_and_exit(int applet_no, char **argv)
 //TODO: just compare applet_no with APPLET_NO_test
                 if (!ENABLE_TEST || strcmp(applet_name, "test") != 0) {
                         /* If you want "foo --help" to return 0: */
-                        /*xfunc_error_retval = 0;*/
+                        xfunc_error_retval = 0;
                         bb_show_usage();
                 }
         }
diff --git a/libbb/endofname.c b/libbb/endofname.c
new file mode 100644
index 000000000..305f0932b
--- /dev/null
+++ b/libbb/endofname.c
@@ -0,0 +1,26 @@
+/*
+ * Utility routines.
+ *
+ * Copyright (C) 2013 Denys Vlasenko
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+
+//kbuild:lib-y += endofname.o
+
+#include "libbb.h"
+
+#define is_name(c)      ((c) == '_' || isalpha((unsigned char)(c)))
+#define is_in_name(c)   ((c) == '_' || isalnum((unsigned char)(c)))
+
+const char* FAST_FUNC
+endofname(const char *name)
+{
+        if (!is_name(*name))
+                return name;
+        while (*++name) {
+                if (!is_in_name(*name))
+                        break;
+        }
+        return name;
+}
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 8a276d941..09e203159 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -187,6 +187,7 @@ extern struct lineedit_statics *const lineedit_ptr_to_statics;
         cmdedit_termw = 80; \
         IF_FEATURE_EDITING_FANCY_PROMPT(num_ok_lines = 1;) \
         IF_USERNAME_OR_HOMEDIR(home_pwd_buf = (char*)null_str;) \
+        IF_FEATURE_EDITING_VI(delptr = delbuf;) \
 } while (0)
 
 static void deinit_S(void)
diff --git a/libbb/platform.c b/libbb/platform.c
index 2bf34f5bc..19734517b 100644
--- a/libbb/platform.c
+++ b/libbb/platform.c
@@ -28,14 +28,16 @@ int FAST_FUNC vasprintf(char **string_ptr, const char *format, va_list p)
         r = vsnprintf(buf, 128, format, p);
         va_end(p);
 
+        /* Note: can't use xstrdup/xmalloc, they call vasprintf (us) on failure! */
+
         if (r < 128) {
                 va_end(p2);
-                *string_ptr = xstrdup(buf);
-                return r;
+                *string_ptr = strdup(buf);
+                return (*string_ptr ? r : -1);
         }
 
-        *string_ptr = xmalloc(r+1);
-        r = vsnprintf(*string_ptr, r+1, format, p2);
+        *string_ptr = malloc(r+1);
+        r = (*string_ptr ? vsnprintf(*string_ptr, r+1, format, p2) : -1);
         va_end(p2);
 
         return r;
diff --git a/libbb/xreadlink.c b/libbb/xreadlink.c
index f2faa6d7a..bc1d0e665 100644
--- a/libbb/xreadlink.c
+++ b/libbb/xreadlink.c
@@ -102,7 +102,8 @@ char* FAST_FUNC xmalloc_readlink_or_warn(const char *path)
 
 char* FAST_FUNC xmalloc_realpath(const char *path)
 {
-#if defined(__GLIBC__) && !defined(__UCLIBC__)
+#if defined(__GLIBC__) || \
+    (defined(__UCLIBC__) && UCLIBC_VERSION >= KERNEL_VERSION(0, 9, 31))
         /* glibc provides a non-standard extension */
         /* new: POSIX.1-2008 specifies this behavior as well */
         return realpath(path, NULL);