diff options
-rw-r--r-- | libbb/kernel_version.c | 8 | ||||
-rw-r--r-- | shell/ash.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libbb/kernel_version.c b/libbb/kernel_version.c index 738ed022b..9b6c62299 100644 --- a/libbb/kernel_version.c +++ b/libbb/kernel_version.c | |||
@@ -20,16 +20,16 @@ | |||
20 | int FAST_FUNC get_linux_version_code(void) | 20 | int FAST_FUNC get_linux_version_code(void) |
21 | { | 21 | { |
22 | struct utsname name; | 22 | struct utsname name; |
23 | char *s, *t; | 23 | char *t; |
24 | int i, r; | 24 | int i, r; |
25 | 25 | ||
26 | uname(&name); /* never fails */ | 26 | uname(&name); /* never fails */ |
27 | s = name.release; | 27 | t = name.release; |
28 | r = 0; | 28 | r = 0; |
29 | for (i = 0; i < 3; i++) { | 29 | for (i = 0; i < 3; i++) { |
30 | t = strtok(s, "."); | 30 | t = strtok(t, "."); |
31 | r = r * 256 + (t ? atoi(t) : 0); | 31 | r = r * 256 + (t ? atoi(t) : 0); |
32 | s = NULL; | 32 | t = NULL; |
33 | } | 33 | } |
34 | return r; | 34 | return r; |
35 | } | 35 | } |
diff --git a/shell/ash.c b/shell/ash.c index 8a1628e81..17121aa9b 100644 --- a/shell/ash.c +++ b/shell/ash.c | |||
@@ -2556,7 +2556,7 @@ updatepwd(const char *dir) | |||
2556 | new = stack_putstr(p, new); | 2556 | new = stack_putstr(p, new); |
2557 | USTPUTC('/', new); | 2557 | USTPUTC('/', new); |
2558 | } | 2558 | } |
2559 | p = strtok(0, "/"); | 2559 | p = strtok(NULL, "/"); |
2560 | } | 2560 | } |
2561 | if (new > lim) | 2561 | if (new > lim) |
2562 | STUNPUTC(new); | 2562 | STUNPUTC(new); |