diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2001-03-14 18:32:49 +0300 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2001-03-14 18:32:49 +0300 |
| commit | e212576dba4a3d9983dd5211b2cdb1e427d35fbb (patch) | |
| tree | 4e2dd1fff1eb3ad7a1f5324ad1dac8f43777cd18 /winsup/cygwin/security.cc | |
| parent | 78d2c08cd9126d39c43c6110eca65bb53c798bd2 (diff) | |
* environ.cc (parse_options): Use strtok_r instead of strtok.
* security.cc (convert_string_sid_to_sid): Ditto.
(aclfromtext): Ditto. Fix buffer usage.
Diffstat (limited to 'winsup/cygwin/security.cc')
| -rw-r--r-- | winsup/cygwin/security.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/winsup/cygwin/security.cc b/winsup/cygwin/security.cc index a92236549..def5685f6 100644 --- a/winsup/cygwin/security.cc +++ b/winsup/cygwin/security.cc @@ -92,7 +92,7 @@ PSID convert_string_sid_to_sid (PSID psid, const char *sid_str) { char sid_buf[256]; - char *t; + char *t, *lasts; DWORD cnt = 0; DWORD s = 0; DWORD i, r[8]; @@ -102,7 +102,9 @@ convert_string_sid_to_sid (PSID psid, const char *sid_str) strcpy (sid_buf, sid_str); - for (t = sid_buf + 4, i = 0; cnt < 8 && (t = strtok (t, "-")); t = NULL, ++i) + for (t = sid_buf + 4, i = 0; + cnt < 8 && (t = strtok_r (t, "-", &lasts)); + t = NULL, ++i) if (i == 0) s = strtoul (t, NULL, 10); else @@ -2110,7 +2112,11 @@ aclfromtext (char *acltextp, int *) aclent_t lacl[MAX_ACL_ENTRIES]; memset (lacl, 0, sizeof lacl); int pos = 0; - for (char *c = strtok (buf, ","); c; c = strtok (NULL, ",")) + strcpy (buf, acltextp); + char *lasts; + for (char *c = strtok_r (buf, ",", &lasts); + c; + c = strtok_r (NULL, ",", &lasts)) { if (!strncmp (c, "default", 7)) { |