Merge branch 'busybox' into merge

3 files changed, 7 insertions, 13 deletions

diff --git a/libbb/Config.src b/libbb/Config.src
index 312aa1831..f97de8ef7 100644
--- a/libbb/Config.src
+++ b/libbb/Config.src
@@ -334,7 +334,6 @@ config FEATURE_VERBOSE_CP_MESSAGE
 config FEATURE_USE_SENDFILE
         bool "Use sendfile system call"
         default y
-        select PLATFORM_LINUX
         help
         When enabled, busybox will use the kernel sendfile() function
         instead of read/write loops to copy data between file descriptors
@@ -376,7 +375,6 @@ config FEATURE_SKIP_ROOTFS
 config MONOTONIC_SYSCALL
         bool "Use clock_gettime(CLOCK_MONOTONIC) syscall"
         default y
-        select PLATFORM_LINUX
         help
         Use clock_gettime(CLOCK_MONOTONIC) syscall for measuring
         time intervals (time, ping, traceroute etc need this).
diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
index dab1e6dae..d7cbb7ff1 100644
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -116,7 +116,8 @@ lib-$(CONFIG_PLATFORM_POSIX) += warn_ignoring_args.o
 lib-$(CONFIG_PLATFORM_POSIX) += write.o
 lib-$(CONFIG_PLATFORM_POSIX) += xgethostbyname.o
 
-lib-$(CONFIG_PLATFORM_LINUX) += match_fstype.o
+lib-$(CONFIG_MOUNT) += match_fstype.o
+lib-$(CONFIG_UMOUNT) += match_fstype.o
 
 lib-$(CONFIG_FEATURE_UTMP) += utmp.o
 
diff --git a/libbb/last_char_is.c b/libbb/last_char_is.c
index 918526e6c..fba05f974 100644
--- a/libbb/last_char_is.c
+++ b/libbb/last_char_is.c
@@ -11,14 +11,9 @@
 /* Find out if the last character of a string matches the one given */
 char* FAST_FUNC last_char_is(const char *s, int c)
 {
-        if (s) {
-                size_t sz = strlen(s);
-                /* Don't underrun the buffer if the string length is 0 */
-                if (sz != 0) {
-                        s += sz - 1;
-                        if ((unsigned char)*s == c)
-                                return (char*)s;
-                }
-        }
-        return NULL;
+        if (!s[0])
+                return NULL;
+        while (s[1])
+                s++;
+        return (*s == (char)c) ? (char *) s : NULL;
 }