JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* environ.cc (strbrk): New function.

Browse Source 
(parse_options): Use strbrk to parse CYGWIN environment variable.
This commit is contained in:
Christopher Faylor 2014-02-09 20:30:24 +00:00
parent ab7165e43b
commit 16be32590d
2 changed files with 49 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,8 @@
2014-02-09 Christopher Faylor <me.cygwin2014@cgf.cx>
* environ.cc (strbrk): New function.
(parse_options): Use strbrk to parse CYGWIN environment variable.
2014-02-09 Corinna Vinschen <corinna@vinschen.de> 2014-02-09 Corinna Vinschen <corinna@vinschen.de>
Introduce reading passwd/group entries from SAM/AD. Introduce Introduce reading passwd/group entries from SAM/AD. Introduce

48
winsup/cygwin/environ.cc
View File

@ -137,13 +137,54 @@ static struct parse_thing
{NULL, {0}, setdword, 0, {{0}, {0}}} {NULL, {0}, setdword, 0, {{0}, {0}}}
}; };
/* Return a possibly-quoted token.
Returns NULL when no more tokens available. */
static char *
strbrk(char *&buf)
{
buf += strspn(buf, " \t");
if (!*buf)
return NULL;
char *tok = buf;
char *sep = buf + strcspn(buf, " \t");
char *quotestart = strchr(buf, '"');
if (quotestart > sep)
{
quotestart = NULL;
buf = sep + 1;
}
else
{
char *quote = quotestart;
sep = NULL;
while (!sep)
{
char *clquote = strchr (quote + 1, '"');
if (!clquote)
sep = strchr (quote, '\0');
else if (clquote[-1] != '\\')
sep = clquote;
else
{
memmove (clquote - 1, clquote, 1 + strchr (clquote, '\0') - clquote);
quote = clquote - 1;
}
}
buf = sep + 1;
memmove (quotestart, quotestart + 1, sep - quotestart);
sep--;
}
*sep = '\0';
return tok;
}
/* Parse a string of the form "something=stuff somethingelse=more-stuff", /* Parse a string of the form "something=stuff somethingelse=more-stuff",
silently ignoring unknown "somethings". */ silently ignoring unknown "somethings". */
static void __stdcall static void __stdcall
parse_options (const char *inbuf) parse_options (const char *inbuf)
{ {
int istrue; int istrue;
char *p, *lasts;
parse_thing *k; parse_thing *k;
if (inbuf == NULL) if (inbuf == NULL)
@ -168,9 +209,8 @@ parse_options (const char *inbuf)
} }
char *buf = strcpy ((char *) alloca (strlen (inbuf) + 1), inbuf); char *buf = strcpy ((char *) alloca (strlen (inbuf) + 1), inbuf);
for (p = strtok_r (buf, " \t", &lasts);
p != NULL; while (char *p = strbrk (buf))
p = strtok_r (NULL, " \t", &lasts))
{ {
char *keyword_here = p; char *keyword_here = p;
if (!(istrue = !ascii_strncasematch (p, "no", 2))) if (!(istrue = !ascii_strncasematch (p, "no", 2)))