ChildProcessDataIO.cpp (muscle7.61) | : | ChildProcessDataIO.cpp (muscle7.62) | ||
---|---|---|---|---|
skipping to change at line 168 | skipping to change at line 168 | |||
char * oldEnvs = GetEnvironmentStrings(); | char * oldEnvs = GetEnvironmentStrings(); | |||
if (oldEnvs) | if (oldEnvs) | |||
{ | { | |||
const char * s = oldEnvs; | const char * s = oldEnvs; | |||
while(s) | while(s) | |||
{ | { | |||
if (*s) | if (*s) | |||
{ | { | |||
const char * equals = strchr(s, '='); | const char * equals = strchr(s, '='); | |||
if ((equals ? curEnvVars.Put(String(s, equals-s), equ | if ((equals ? curEnvVars.Put(String(s, (uint32)(equal | |||
als+1) : curEnvVars.Put(s, GetEmptyString())).IsOK(ret)) s = strchr(s, '\0')+1; | s-s)), equals+1) : curEnvVars.Put(s, GetEmptyString())).IsOK(ret)) s = strchr(s, | |||
'\0')+1; | ||||
else break; | ||||
else break; | ||||
} | } | |||
else break; | else break; | |||
} | } | |||
FreeEnvironmentStringsA(oldEnvs); | FreeEnvironmentStringsA(oldEnvs); | |||
} | } | |||
(void) curEnvVars.Put(*optEnvironmentVariables); // update ou r existing vars with the specified ones | (void) curEnvVars.Put(*optEnvironmentVariables); // update ou r existing vars with the specified ones | |||
// Now we can make a new environment-variables-block out of (c urEnvVars) | // Now we can make a new environment-variables-block out of (c urEnvVars) | |||
End of changes. 1 change blocks. | ||||
4 lines changed or deleted | 5 lines changed or added |