libbb: move nuke_str() from passwd into libbb

[oweals/busybox.git] / libbb / kernel_version.c

diff --git a/libbb/kernel_version.c b/libbb/kernel_version.c
index 8b9c4ec2065f2b360497c30f2f1cdb4aa4fcef7a..738ed022b3bb16313ee6e65b576caef789ae8358 100644 (file)
--- a/libbb/kernel_version.c
+++ b/libbb/kernel_version.c
@@ -4,12 +4,13 @@
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
-#include <sys/utsname.h>               /* for uname(2) */
-
 #include "libbb.h"
+/* After libbb.h, since it needs sys/types.h on some systems */
+#include <sys/utsname.h>  /* for uname(2) */
+
 
 /* Returns current kernel version encoded as major*65536 + minor*256 + patch,
  * so, for example,  to check if the kernel is greater than 2.2.11:
@@ -19,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("cannot 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;