Hi labath, vharron,
Fix execution of platform shell commands on android
* Add missing functionality to the process launcher
* Fixup PATH environment variable to workaround an OS bug
* Add default shell path to the host info structure
REPOSITORY
rL LLVM
http://reviews.llvm.org/D8009
Files:
include/lldb/Host/android/HostInfoAndroid.h
source/Host/android/HostInfoAndroid.cpp
source/Host/android/ProcessLauncherAndroid.cpp
EMAIL PREFERENCES
http://reviews.llvm.org/settings/panel/emailpreferences/
Index: include/lldb/Host/android/HostInfoAndroid.h
===================================================================
--- include/lldb/Host/android/HostInfoAndroid.h
+++ include/lldb/Host/android/HostInfoAndroid.h
@@ -19,10 +19,8 @@
{
friend class HostInfoBase;
- private:
- // Static class, unconstructable.
- HostInfoAndroid();
- ~HostInfoAndroid();
+ public:
+ static FileSpec GetDefaultShell();
protected:
static void ComputeHostArchitectureSupport(ArchSpec &arch_32, ArchSpec &arch_64);
Index: source/Host/android/HostInfoAndroid.cpp
===================================================================
--- source/Host/android/HostInfoAndroid.cpp
+++ source/Host/android/HostInfoAndroid.cpp
@@ -33,3 +33,9 @@
file_spec.GetDirectory() = HostInfoLinux::GetProgramFileSpec().GetDirectory();
return (bool)file_spec.GetDirectory();
}
+
+FileSpec
+HostInfoAndroid::GetDefaultShell()
+{
+ return FileSpec("/system/bin/sh", false);
+}
Index: source/Host/android/ProcessLauncherAndroid.cpp
===================================================================
--- source/Host/android/ProcessLauncherAndroid.cpp
+++ source/Host/android/ProcessLauncherAndroid.cpp
@@ -12,37 +12,81 @@
#include "lldb/Host/android/ProcessLauncherAndroid.h"
#include "lldb/Target/ProcessLaunchInfo.h"
+#include "lldb/Core/StreamString.h"
#include <limits.h>
using namespace lldb;
using namespace lldb_private;
+static bool
+DupDescriptor(const char *path, int fd, int flags)
+{
+ int target_fd = open(path, flags, 0666);
+
+ if (target_fd == -1)
+ return false;
+
+ if (dup2(target_fd, fd) == -1)
+ return false;
+
+ return (close(target_fd) == -1) ? false : true;
+}
+
+// If there is no PATH variable specified inside the environment then set the path to /system/bin.
+// It is required because the default path used by execve() is wrong on android.
+static void
+FixupEnvironment (Args& env)
+{
+ const static char* path = "PATH=";
+ const static int path_len = strlen(path);
+ for (const char** args = env.GetConstArgumentVector(); *args; ++args)
+ if (::strncmp(path, *args, path_len) == 0)
+ return;
+ env.AppendArgument("PATH=/system/bin");
+}
+
HostProcess
ProcessLauncherAndroid::LaunchProcess(const ProcessLaunchInfo &launch_info, Error &error)
{
// TODO: Handle other launch parameters specified in launc_info
char exe_path[PATH_MAX];
launch_info.GetExecutableFile().GetPath(exe_path, sizeof(exe_path));
- const size_t err_len = 1024;
- char err_str[err_len];
-
- lldb::pid_t pid = ::fork ();
- if (pid < 0)
+ lldb::pid_t pid = ::fork();
+ if (pid == static_cast<lldb::pid_t>(-1))
{
// Fork failed
error.SetErrorStringWithFormat("Fork failed with error message: %s", strerror(errno));
return HostProcess(LLDB_INVALID_PROCESS_ID);
}
else if (pid == 0)
{
+ // Dup file descriptors if needed.
+ if (const lldb_private::FileAction *file_action = launch_info.GetFileActionForFD (STDIN_FILENO))
+ if (::strlen(file_action->GetPath()) &&
+ !DupDescriptor(file_action->GetPath(), STDIN_FILENO, O_RDONLY))
+ exit(-1);
+
+ if (const lldb_private::FileAction *file_action = launch_info.GetFileActionForFD (STDOUT_FILENO))
+ if (::strlen(file_action->GetPath()) &&
+ !DupDescriptor(file_action->GetPath(), STDOUT_FILENO, O_WRONLY | O_CREAT | O_TRUNC))
+ exit(-1);
+
+ if (const lldb_private::FileAction *file_action = launch_info.GetFileActionForFD (STDERR_FILENO))
+ if (::strlen(file_action->GetPath()) &&
+ !DupDescriptor(file_action->GetPath(), STDERR_FILENO, O_WRONLY | O_CREAT | O_TRUNC))
+ exit(-1);
+
// Child process
const char **argv = launch_info.GetArguments().GetConstArgumentVector();
- const char **envp = launch_info.GetEnvironmentEntries().GetConstArgumentVector();
+
+ Args env = launch_info.GetEnvironmentEntries();
+ FixupEnvironment(env);
+ const char **envp = env.GetConstArgumentVector();
+
const char *working_dir = launch_info.GetWorkingDirectory();
-
if (working_dir != nullptr && working_dir[0])
{
if (::chdir(working_dir) != 0)
_______________________________________________
lldb-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits
