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 "Revert "adb: Make HOME=/data/local/tmp"" 

am: ce4bbcfb08

* commit 'ce4bbcfb08bea39dce8c4f71da7326814edfb247':
  Revert "adb: Make HOME=/data/local/tmp"
This commit is contained in:
Nick Kralevich 2015-12-10 12:57:48 -08:00 committed by android-build-merger
parent 2d4ec2e663 ce4bbcfb08
commit a09565ad1d
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
adb/shell_service.cpp
View File

@ -289,6 +289,7 @@ bool Subprocess::ForkAndExec() {
// TODO: $HOSTNAME? Normally bash automatically sets that, but mksh doesn't.
passwd* pw = getpwuid(getuid());
if (pw != nullptr) {
setenv("HOME", pw->pw_dir, 1);
setenv("LOGNAME", pw->pw_name, 1);
setenv("SHELL", pw->pw_shell, 1);
setenv("USER", pw->pw_name, 1);
@ -297,8 +298,6 @@ bool Subprocess::ForkAndExec() {
setenv("TERM", terminal_type_.c_str(), 1);
}
setenv("HOME", "/data/local/tmp", 1);
chdir(getenv("HOME"));
if (is_interactive()) {
execl(_PATH_BSHELL, _PATH_BSHELL, "-", nullptr);
} else {