openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "adb: handle some edge cases with process environments."

This commit is contained in:
Josh Gao 2015-12-12 00:43:38 +00:00 committed by Gerrit Code Review
parent 5e15568c07 e03c988748
commit 80f3b0438d
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
adb/shell_service.cpp
View File

@ -250,13 +250,18 @@ bool Subprocess::ForkAndExec() {
// Construct the environment for the child before we fork.
passwd* pw = getpwuid(getuid());
std::unordered_map<std::string, std::string> env;
if (environ) {
char** current = environ;
while (char* env_cstr = *current++) {
std::string env_string = env_cstr;
char* delimiter = strchr(env_string.c_str(), '=');
char** current = environ;
while (char* env_cstr = *current++) {
std::string env_string = env_cstr;
char* delimiter = strchr(env_string.c_str(), '=');
*delimiter++ = '\0';
env[env_string.c_str()] = delimiter;
// Drop any values that don't contain '='.
if (delimiter) {
*delimiter++ = '\0';
env[env_string.c_str()] = delimiter;
}
}
}
if (pw != nullptr) {