Merge 35441 - Linux: use readlink() and prctl() in SetProcTitle() to fix "exe...

base/command_line.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
-#elif defined(OS_FREEBSD)
+#elif defined(OS_POSIX)
+#include <limits.h>
 #include <stdlib.h>
 #include <unistd.h>
 #endif
+#if defined(OS_LINUX)
+#include <sys/prctl.h>
+#endif
 
 #include <algorithm>
 
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/singleton.h"
 #include "base/string_piece.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 
@@ skipping 176 matching lines @@
 #endif
 }
 
 #if defined(OS_LINUX) || defined(OS_FREEBSD)
 // static
 void CommandLine::SetProcTitle() {
   // Build a single string which consists of all the arguments separated
   // by spaces. We can't actually keep them separate due to the way the
   // setproctitle() function works.
   std::string title;
+  bool have_argv0 = false;
+#if defined(OS_LINUX)
+  // In Linux we sometimes exec ourselves from /proc/self/exe, but this makes us
+  // show up as "exe" in process listings. Read the symlink /proc/self/exe and
+  // use the path it points at for our process title. Note that this is only for
+  // display purposes and has no TOCTTOU security implications.
+  char buffer[PATH_MAX];
+  // Note: readlink() does not append a null byte to terminate the string.
+  ssize_t length = readlink("/proc/self/exe", buffer, sizeof(buffer));
+  DCHECK(length <= static_cast<ssize_t>(sizeof(buffer)));
+  if (length > 0) {
+    have_argv0 = true;
+    title.assign(buffer, length);
+    // If the binary has since been deleted, Linux appends " (deleted)" to the
+    // symlink target. Remove it, since this is not really part of our name.
+    const std::string kDeletedSuffix = " (deleted)";
+    if (EndsWith(title, kDeletedSuffix, true))
+      title.resize(title.size() - kDeletedSuffix.size());
+#if defined(PR_SET_NAME)
+    // If PR_SET_NAME is available at compile time, we try using it. We ignore
+    // any errors if the kernel does not support it at runtime though. When
+    // available, this lets us set the short process name that shows when the
+    // full command line is not being displayed in most process listings.
+    prctl(PR_SET_NAME, FilePath(title).BaseName().value().c_str());
+#endif
+  }
+#endif
   for (size_t i = 1; i < current_process_commandline_->argv_.size(); ++i) {
     if (!title.empty())
       title += " ";
     title += current_process_commandline_->argv_[i];
   }
-  setproctitle("%s", title.c_str());
+  // Disable prepending argv[0] with '-' if we prepended it ourselves above.
+  setproctitle(have_argv0 ? "-%s" : "%s", title.c_str());
 }
 #endif
 
 void CommandLine::Reset() {
   DCHECK(current_process_commandline_ != NULL);
   delete current_process_commandline_;
   current_process_commandline_ = NULL;
 }
 
 bool CommandLine::HasSwitch(const std::string& switch_string) const {
@@ skipping 167 matching lines @@
 void CommandLine::PrependWrapper(const std::wstring& wrapper_wide) {
   // The wrapper may have embedded arguments (like "gdb --args"). In this case,
   // we don't pretend to do anything fancy, we just split on spaces.
   const std::string wrapper = base::SysWideToNativeMB(wrapper_wide);
   std::vector<std::string> wrapper_and_args;
   SplitString(wrapper, ' ', &wrapper_and_args);
   argv_.insert(argv_.begin(), wrapper_and_args.begin(), wrapper_and_args.end());
 }
 
 #endif