drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* environ.cc (parse_options): Use strtok_r instead of strtok. 

* security.cc (convert_string_sid_to_sid): Ditto.
        (aclfromtext): Ditto. Fix buffer usage.
This commit is contained in:
Corinna Vinschen 2001-03-14 15:32:49 +00:00
parent 78d2c08cd9
commit e212576dba
3 changed files with 19 additions and 5 deletions

6
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,9 @@
Wed Mar 14 16:30:00 2001 Corinna Vinschen <corinna@vinschen.de>
* environ.cc (parse_options): Use strtok_r instead of strtok.
* security.cc (convert_string_sid_to_sid): Ditto.
(aclfromtext): Ditto. Fix buffer usage.
Wed Mar 14 10:11:00 2001 Corinna Vinschen <corinna@vinschen.de> Wed Mar 14 10:11:00 2001 Corinna Vinschen <corinna@vinschen.de>
* path.cc (lnk_suffixes): Remove. * path.cc (lnk_suffixes): Remove.

6
winsup/cygwin/environ.cc
View File

@ -465,7 +465,7 @@ static void __stdcall
parse_options (char *buf) parse_options (char *buf)
{ {
int istrue; int istrue;
char *p; char *p, *lasts;
parse_thing *k; parse_thing *k;
if (buf == NULL) if (buf == NULL)
@ -487,7 +487,9 @@ parse_options (char *buf)
} }
buf = strcpy ((char *) alloca (strlen (buf) + 1), 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))) if (!(istrue = !strncasematch (p, "no", 2)))
p += 2; p += 2;

12
winsup/cygwin/security.cc
View File

@ -92,7 +92,7 @@ PSID
convert_string_sid_to_sid (PSID psid, const char *sid_str) convert_string_sid_to_sid (PSID psid, const char *sid_str)
{ {
char sid_buf[256]; char sid_buf[256];
char *t; char *t, *lasts;
DWORD cnt = 0; DWORD cnt = 0;
DWORD s = 0; DWORD s = 0;
DWORD i, r[8]; DWORD i, r[8];
@ -102,7 +102,9 @@ convert_string_sid_to_sid (PSID psid, const char *sid_str)
strcpy (sid_buf, 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) if (i == 0)
s = strtoul (t, NULL, 10); s = strtoul (t, NULL, 10);
else else
@ -2110,7 +2112,11 @@ aclfromtext (char *acltextp, int *)
aclent_t lacl[MAX_ACL_ENTRIES]; aclent_t lacl[MAX_ACL_ENTRIES];
memset (lacl, 0, sizeof lacl); memset (lacl, 0, sizeof lacl);
int pos = 0; 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)) if (!strncmp (c, "default", 7))
{ {