Contents of /trunk/busybox/patches/busybox-1.20.2-kernel_ver.patch
Parent Directory | Revision Log
Revision 1942 -
(show annotations)
(download)
Tue Nov 6 12:50:29 2012 UTC (11 years, 10 months ago) by niro
File size: 540 byte(s)
Tue Nov 6 12:50:29 2012 UTC (11 years, 10 months ago) by niro
File size: 540 byte(s)
-more upstream patches
1 | --- busybox-1.20.2/libbb/kernel_version.c |
2 | +++ busybox-1.20.2-kernel_ver/libbb/kernel_version.c |
3 | @@ -20,18 +20,15 @@ |
4 | int FAST_FUNC get_linux_version_code(void) |
5 | { |
6 | struct utsname name; |
7 | - char *s; |
8 | + char *s, *t; |
9 | int i, r; |
10 | |
11 | - if (uname(&name) == -1) { |
12 | - bb_perror_msg("can't get system information"); |
13 | - return 0; |
14 | - } |
15 | - |
16 | + uname(&name); /* never fails */ |
17 | s = name.release; |
18 | r = 0; |
19 | for (i = 0; i < 3; i++) { |
20 | - r = r * 256 + atoi(strtok(s, ".")); |
21 | + t = strtok(s, "."); |
22 | + r = r * 256 + (t ? atoi(t) : 0); |
23 | s = NULL; |
24 | } |
25 | return r; |