Bump to version 1.22.1

[platform/upstream/busybox.git] / libbb / kernel_version.c

diff --git a/libbb/kernel_version.c b/libbb/kernel_version.c
index e01aafa..738ed02 100644 (file)
--- a/libbb/kernel_version.c
+++ b/libbb/kernel_version.c
@@ -4,57 +4,32 @@
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#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 kernel version encoded as major*65536 + minor*256 + patch,
+
+/* 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:
- *     if (get_kernel_revision() <= 2*65536+2*256+11) { <stuff> }
+ *
+ *     if (get_linux_version_code() > KERNEL_VERSION(2,2,11)) { <stuff> }
  */
-extern int get_kernel_revision(void)
+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, "."));
+       for (i = 0; i < 3; i++) {
+               t = strtok(s, ".");
+               r = r * 256 + (t ? atoi(t) : 0);
                s = NULL;
        }
        return r;
 }
-
-/* END CODE */
-/*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/