From e212576dba4a3d9983dd5211b2cdb1e427d35fbb Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Wed, 14 Mar 2001 15:32:49 +0000 Subject: * environ.cc (parse_options): Use strtok_r instead of strtok. * security.cc (convert_string_sid_to_sid): Ditto. (aclfromtext): Ditto. Fix buffer usage. --- winsup/cygwin/environ.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'winsup/cygwin/environ.cc') diff --git a/winsup/cygwin/environ.cc b/winsup/cygwin/environ.cc index 77cf8da8d..a83c06e7e 100644 --- a/winsup/cygwin/environ.cc +++ b/winsup/cygwin/environ.cc @@ -465,7 +465,7 @@ static void __stdcall parse_options (char *buf) { int istrue; - char *p; + char *p, *lasts; parse_thing *k; if (buf == NULL) @@ -487,7 +487,9 @@ parse_options (char *buf) } buf = strcpy ((char *) alloca (strlen (buf) + 1), buf); - for (p = strtok (buf, " \t"); p != NULL; p = strtok (NULL, " \t")) + for (p = strtok_r (buf, " \t", &lasts); + p != NULL; + p = strtok_r (NULL, " \t", &lasts)) { if (!(istrue = !strncasematch (p, "no", 2))) p += 2; -- cgit v1.2.3