Merge branch 'busybox' into merge

2 files changed, 5 insertions, 8 deletions

diff --git a/libbb/kernel_version.c b/libbb/kernel_version.c
index a168a1e4e..738ed022b 100644
--- a/libbb/kernel_version.c
+++ b/libbb/kernel_version.c
@@ -20,18 +20,15 @@
 int FAST_FUNC get_linux_version_code(void)
 {
         struct utsname name;
-        char *s;
+        char *s, *t;
         int i, r;
 
-        if (uname(&name) == -1) {
-                bb_perror_msg("can't get system information");
-                return 0;
-        }
-
+        uname(&name); /* never fails */
         s = name.release;
         r = 0;
         for (i = 0; i < 3; i++) {
-                r = r * 256 + atoi(strtok(s, "."));
+                t = strtok(s, ".");
+                r = r * 256 + (t ? atoi(t) : 0);
                 s = NULL;
         }
         return r;
diff --git a/libbb/remove_file.c b/libbb/remove_file.c
index c6531a0b9..5b75f7f30 100644
--- a/libbb/remove_file.c
+++ b/libbb/remove_file.c
@@ -33,7 +33,7 @@ int FAST_FUNC remove_file(const char *path, int flags)
                 int status = 0;
 
                 if (!(flags & FILEUTILS_RECUR)) {
-                        bb_error_msg("%s: is a directory", path);
+                        bb_error_msg("'%s' is a directory", path);
                         return -1;
                 }