|
|
@ -3007,16 +3007,16 @@ SplitIdentifierString(char *rawstring, char separator, |
|
|
|
char *curname; |
|
|
|
char *curname; |
|
|
|
char *endp; |
|
|
|
char *endp; |
|
|
|
|
|
|
|
|
|
|
|
if (*nextp == '\"') |
|
|
|
if (*nextp == '"') |
|
|
|
{ |
|
|
|
{ |
|
|
|
/* Quoted name --- collapse quote-quote pairs, no downcasing */ |
|
|
|
/* Quoted name --- collapse quote-quote pairs, no downcasing */ |
|
|
|
curname = nextp + 1; |
|
|
|
curname = nextp + 1; |
|
|
|
for (;;) |
|
|
|
for (;;) |
|
|
|
{ |
|
|
|
{ |
|
|
|
endp = strchr(nextp + 1, '\"'); |
|
|
|
endp = strchr(nextp + 1, '"'); |
|
|
|
if (endp == NULL) |
|
|
|
if (endp == NULL) |
|
|
|
return false; /* mismatched quotes */ |
|
|
|
return false; /* mismatched quotes */ |
|
|
|
if (endp[1] != '\"') |
|
|
|
if (endp[1] != '"') |
|
|
|
break; /* found end of quoted name */ |
|
|
|
break; /* found end of quoted name */ |
|
|
|
/* Collapse adjacent quotes into one quote, and look again */ |
|
|
|
/* Collapse adjacent quotes into one quote, and look again */ |
|
|
|
memmove(endp, endp + 1, strlen(endp)); |
|
|
|
memmove(endp, endp + 1, strlen(endp)); |
|
|
@ -3132,16 +3132,16 @@ SplitDirectoriesString(char *rawstring, char separator, |
|
|
|
char *curname; |
|
|
|
char *curname; |
|
|
|
char *endp; |
|
|
|
char *endp; |
|
|
|
|
|
|
|
|
|
|
|
if (*nextp == '\"') |
|
|
|
if (*nextp == '"') |
|
|
|
{ |
|
|
|
{ |
|
|
|
/* Quoted name --- collapse quote-quote pairs */ |
|
|
|
/* Quoted name --- collapse quote-quote pairs */ |
|
|
|
curname = nextp + 1; |
|
|
|
curname = nextp + 1; |
|
|
|
for (;;) |
|
|
|
for (;;) |
|
|
|
{ |
|
|
|
{ |
|
|
|
endp = strchr(nextp + 1, '\"'); |
|
|
|
endp = strchr(nextp + 1, '"'); |
|
|
|
if (endp == NULL) |
|
|
|
if (endp == NULL) |
|
|
|
return false; /* mismatched quotes */ |
|
|
|
return false; /* mismatched quotes */ |
|
|
|
if (endp[1] != '\"') |
|
|
|
if (endp[1] != '"') |
|
|
|
break; /* found end of quoted name */ |
|
|
|
break; /* found end of quoted name */ |
|
|
|
/* Collapse adjacent quotes into one quote, and look again */ |
|
|
|
/* Collapse adjacent quotes into one quote, and look again */ |
|
|
|
memmove(endp, endp + 1, strlen(endp)); |
|
|
|
memmove(endp, endp + 1, strlen(endp)); |
|
|
|