commit 495952ffc614b0c3e0352a51173f76c13cf5eeaa
author Elliott Hughes <enh@google.com> Mon Nov 02 22:11:42 2015 +0000
committer android-build-merger <android-build-merger@google.com> Mon Nov 02 22:11:42 2015 +0000
tree 1084661c7ca944eaa47d13ecff2cdea472c08f55
parent 1cc3c0006576108d3cc4600114ed799ba29efdac
parent 9d59b6865b88b55a51f5f59521ae640ae135c7f3

Merge "Set HOME, LOGNAME, SHELL, and USER from adbd." am: 36d7af4cf6
am: 5b51ac7a59

* commit '5b51ac7a5931c2e9c491c61233a6bbaba5edb6fa':
  Set HOME, LOGNAME, SHELL, and USER from adbd.

adb/shell_service.cpp

diff --git a/adb/shell_service.cpp b/adb/shell_service.cpp
index 544afce..be5921d 100644
--- a/adb/shell_service.cpp
+++ b/adb/shell_service.cpp
@@ -83,6 +83,7 @@
 
 #include <errno.h>
 #include <pty.h>
+#include <pwd.h>
 #include <sys/select.h>
 #include <termios.h>
 
@@ -281,6 +282,15 @@
         parent_error_sfd.Reset();
         close_on_exec(child_error_sfd.fd());
 
+        // 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);
+        }
+
         if (is_interactive()) {
             execl(_PATH_BSHELL, _PATH_BSHELL, "-", nullptr);
         } else {