From 4aca87515a5083ae0e31ce3177189fd43b6d05ac Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 3 Jan 2015 13:58:15 +0100 Subject: patch to Vanilla Tomato 1.28 --- release/src/router/busybox/libbb/kernel_version.c | 47 +++++------------------ 1 file changed, 9 insertions(+), 38 deletions(-) (limited to 'release/src/router/busybox/libbb/kernel_version.c') diff --git a/release/src/router/busybox/libbb/kernel_version.c b/release/src/router/busybox/libbb/kernel_version.c index 09cd582c..8b9c4ec2 100644 --- a/release/src/router/busybox/libbb/kernel_version.c +++ b/release/src/router/busybox/libbb/kernel_version.c @@ -2,65 +2,36 @@ /* * Utility routines. * - * Copyright (C) tons of folks. Tracking down who wrote what - * isn't something I'm going to worry about... If you wrote something - * here, please feel free to acknowledge your work. - * - * 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 - * - * Based in part on code from sash, Copyright (c) 1999 by David I. Bell - * Permission has been granted to redistribute this code under the GPL. + * Copyright (C) 1999-2004 by Erik Andersen * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include -#include -#include #include /* for uname(2) */ #include "libbb.h" -/* 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) { } + * + * if (get_linux_version_code() > KERNEL_VERSION(2,2,11)) { } */ -extern int get_kernel_revision(void) +int FAST_FUNC get_linux_version_code(void) { struct utsname name; char *s; int i, r; if (uname(&name) == -1) { - perror_msg("cannot get system information"); - return (0); + bb_perror_msg("cannot get system information"); + return 0; } s = name.release; r = 0; - for (i=0 ; i<3 ; i++) { + for (i = 0; i < 3; i++) { r = r * 256 + atoi(strtok(s, ".")); s = NULL; } return r; } - -/* END CODE */ -/* -Local Variables: -c-file-style: "linux" -c-basic-offset: 4 -tab-width: 4 -End: -*/ -- cgit v1.2.3-54-g00ecf