diff options
| author | Ron Yorston <rmy@pobox.com> | 2020-11-12 08:27:51 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2020-11-12 08:27:51 +0000 |
| commit | ead8b92e3d66ab45235e137f85fb3a529dcc64ef (patch) | |
| tree | af268270382dad969218063d4a8120fc91a9e631 /procps | |
| parent | 567728c22dddea4ed33b8a69641ba2e0c3f1f600 (diff) | |
| parent | 64981b4c8e88812c322bee3832f1d421ff670ed5 (diff) | |
| download | busybox-w32-ead8b92e3d66ab45235e137f85fb3a529dcc64ef.tar.gz busybox-w32-ead8b92e3d66ab45235e137f85fb3a529dcc64ef.tar.bz2 busybox-w32-ead8b92e3d66ab45235e137f85fb3a529dcc64ef.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'procps')
| -rw-r--r-- | procps/mpstat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/procps/mpstat.c b/procps/mpstat.c index 3e07edc5c..883c4d52d 100644 --- a/procps/mpstat.c +++ b/procps/mpstat.c | |||
| @@ -923,7 +923,7 @@ int mpstat_main(int argc UNUSED_PARAM, char **argv) | |||
| 923 | char *t; | 923 | char *t; |
| 924 | G.p_option = 1; | 924 | G.p_option = 1; |
| 925 | 925 | ||
| 926 | for (t = strtok(opt_set_cpu, ","); t; t = strtok(NULL, ",")) { | 926 | for (t = strtok_r(opt_set_cpu, ",", &opt_set_cpu); t; t = strtok_r(NULL, ",", &opt_set_cpu)) { |
| 927 | if (strcmp(t, "ALL") == 0) { | 927 | if (strcmp(t, "ALL") == 0) { |
| 928 | /* Select every CPU */ | 928 | /* Select every CPU */ |
| 929 | memset(G.cpu_bitmap, 0xff, G.cpu_bitmap_len); | 929 | memset(G.cpu_bitmap, 0xff, G.cpu_bitmap_len); |