ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Revert "adb: Make HOME=/data/local/tmp""

Browse source
This commit is contained in:
Nick Kralevich 2015-12-10 20:48:08 +00:00 • committed by Gerrit Code Review
commit ce4bbcfb08
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. // TODO: $HOSTNAME? Normally bash automatically sets that, but mksh doesn't.
passwd* pw = getpwuid(getuid()); passwd* pw = getpwuid(getuid());
if (pw != nullptr) { if (pw != nullptr) {
setenv("HOME", pw->pw_dir, 1);
setenv("LOGNAME", pw->pw_name, 1); setenv("LOGNAME", pw->pw_name, 1);
setenv("SHELL", pw->pw_shell, 1); setenv("SHELL", pw->pw_shell, 1);
setenv("USER", pw->pw_name, 1); setenv("USER", pw->pw_name, 1);
@ -297,8 +298,6 @@ bool Subprocess::ForkAndExec() {
setenv("TERM", terminal_type_.c_str(), 1); setenv("TERM", terminal_type_.c_str(), 1);
} }
setenv("HOME", "/data/local/tmp", 1);
chdir(getenv("HOME"));
if (is_interactive()) { if (is_interactive()) {
execl(_PATH_BSHELL, _PATH_BSHELL, "-", nullptr); execl(_PATH_BSHELL, _PATH_BSHELL, "-", nullptr);
} else { } else {