commit 3feb98e7ca79ba4bde6e8cb68e9093d44b2b930b
author Elliott Hughes <enh@google.com> Tue Oct 03 22:52:43 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 03 22:52:43 2017 +0000
tree ca676a17d183734733a0575eb9a069646892ce96
parent 09f74a6f078ea6661e015e6a219235ba9f243c2a
parent d08b173c1421921f47fcad04f4d0c573a7fd5c98

Merge "Set $HOSTNAME in adbd." am: 2364d7ccc5 am: 510552149c am: 3ef8d2abca
am: d59c04eb8b

Change-Id: Ia31d500daef2bb0ac7e6079294fadd442110676a

adb/shell_service.cpp

diff --git a/adb/shell_service.cpp b/adb/shell_service.cpp
index 5b48da0..0c7e1f9 100644
--- a/adb/shell_service.cpp
+++ b/adb/shell_service.cpp
@@ -95,6 +95,7 @@
 #include <vector>
 
 #include <android-base/logging.h>
+#include <android-base/properties.h>
 #include <android-base/stringprintf.h>
 #include <private/android_logger.h>
 
@@ -212,6 +213,13 @@
     WaitForExit();
 }
 
+static std::string GetHostName() {
+    char buf[HOST_NAME_MAX];
+    if (gethostname(buf, sizeof(buf)) != -1 && strcmp(buf, "localhost") != 0) return buf;
+
+    return android::base::GetProperty("ro.product.device", "android");
+}
+
 bool Subprocess::ForkAndExec(std::string* error) {
     unique_fd child_stdinout_sfd, child_stderr_sfd;
     unique_fd parent_error_sfd, child_error_sfd;
@@ -250,11 +258,11 @@
     }
 
     if (pw != nullptr) {
-        // TODO: $HOSTNAME? Normally bash automatically sets that, but mksh doesn't.
         env["HOME"] = pw->pw_dir;
+        env["HOSTNAME"] = GetHostName();
         env["LOGNAME"] = pw->pw_name;
-        env["USER"] = pw->pw_name;
         env["SHELL"] = pw->pw_shell;
+        env["USER"] = pw->pw_name;
     }
 
     if (!terminal_type_.empty()) {