diff options
author | Denys Vlasenko <vda.linux@googlemail.com> | 2020-10-06 02:36:47 +0200 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2020-10-06 02:36:47 +0200 |
commit | 2496616b0a8d1c80cd1416b73a4847b59b9f969a (patch) | |
tree | dc52a8f9bbbf33d507ecf0b808614b7923786567 /util-linux/switch_root.c | |
parent | 535a509846be5087ddd0d6e8fc6399f919942639 (diff) | |
download | busybox-w32-2496616b0a8d1c80cd1416b73a4847b59b9f969a.tar.gz busybox-w32-2496616b0a8d1c80cd1416b73a4847b59b9f969a.tar.bz2 busybox-w32-2496616b0a8d1c80cd1416b73a4847b59b9f969a.zip |
avoid using strok - eliminates use of hidden global variable
function old new delta
udhcp_str2optset 616 650 +34
setpriv_main 950 975 +25
switch_root_main 688 706 +18
parse 958 970 +12
getopt_main 622 628 +6
parse_resolvconf 302 306 +4
mpstat_main 1139 1142 +3
static.p 4 - -4
cdcmd 717 702 -15
strtok 148 - -148
------------------------------------------------------------------------------
(add/remove: 0/3 grow/shrink: 7/1 up/down: 102/-167) Total: -65 bytes
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'util-linux/switch_root.c')
-rw-r--r-- | util-linux/switch_root.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/util-linux/switch_root.c b/util-linux/switch_root.c index c65096c27..f2674b5ac 100644 --- a/util-linux/switch_root.c +++ b/util-linux/switch_root.c | |||
@@ -164,7 +164,7 @@ static void drop_capabilities(char *string) | |||
164 | { | 164 | { |
165 | char *cap; | 165 | char *cap; |
166 | 166 | ||
167 | cap = strtok(string, ","); | 167 | cap = strtok_r(string, ",", &string); |
168 | while (cap) { | 168 | while (cap) { |
169 | unsigned cap_idx; | 169 | unsigned cap_idx; |
170 | 170 | ||
@@ -174,7 +174,7 @@ static void drop_capabilities(char *string) | |||
174 | drop_bounding_set(cap_idx); | 174 | drop_bounding_set(cap_idx); |
175 | drop_capset(cap_idx); | 175 | drop_capset(cap_idx); |
176 | bb_error_msg("dropped capability: %s", cap); | 176 | bb_error_msg("dropped capability: %s", cap); |
177 | cap = strtok(NULL, ","); | 177 | cap = strtok_r(NULL, ",", &string); |
178 | } | 178 | } |
179 | } | 179 | } |
180 | #endif | 180 | #endif |