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/mount.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'util-linux/mount.c') diff --git a/util-linux/mount.c b/util-linux/mount.c index 19ac13930..fc5161d7f 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c @@ -1230,6 +1230,7 @@ static NOINLINE int nfsmount(struct mntent *mp, unsigned long vfsflags, char *fi * then data pointer is interpreted as a string. */ struct nfs_mount_data data; char *opt; + char *tokstate; struct hostent *hp; struct sockaddr_in server_addr; struct sockaddr_in mount_server_addr; @@ -1348,7 +1349,7 @@ static NOINLINE int nfsmount(struct mntent *mp, unsigned long vfsflags, char *fi nfsvers = 0; /* parse options */ - if (filteropts) for (opt = strtok(filteropts, ","); opt; opt = strtok(NULL, ",")) { + if (filteropts) for (opt = strtok_r(filteropts, ",", &tokstate); opt; opt = strtok_r(NULL, ",", &tokstate)) { char *opteq = strchr(opt, '='); if (opteq) { int val, idx; -- cgit v1.2.3