From 2496616b0a8d1c80cd1416b73a4847b59b9f969a Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Tue, 6 Oct 2020 02:36:47 +0200 Subject: 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 --- util-linux/switch_root.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'util-linux/switch_root.c') 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) { char *cap; - cap = strtok(string, ","); + cap = strtok_r(string, ",", &string); while (cap) { unsigned cap_idx; @@ -174,7 +174,7 @@ static void drop_capabilities(char *string) drop_bounding_set(cap_idx); drop_capset(cap_idx); bb_error_msg("dropped capability: %s", cap); - cap = strtok(NULL, ","); + cap = strtok_r(NULL, ",", &string); } } #endif -- cgit v1.2.3