From 0b2dbe0ebe1c0c0c59d3fb86f81989f4b20bfe0c Mon Sep 17 00:00:00 2001 From: Jason Molenda Date: Thu, 1 Nov 2012 02:02:59 +0000 Subject: [PATCH] Fix an error message in debugserver so it doesn't print "Unable to launch process (null)" because we changed argv while doing argument parsing. llvm-svn: 167202 --- lldb/tools/debugserver/source/debugserver.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lldb/tools/debugserver/source/debugserver.cpp b/lldb/tools/debugserver/source/debugserver.cpp index bd126f8..69c27d4 100644 --- a/lldb/tools/debugserver/source/debugserver.cpp +++ b/lldb/tools/debugserver/source/debugserver.cpp @@ -787,6 +787,8 @@ static struct option g_long_options[] = int main (int argc, char *argv[]) { + const char *argv_sub_zero = argv[0]; // save a copy of argv[0] for error reporting post-launch + g_isatty = ::isatty (STDIN_FILENO); // ::printf ("uid=%u euid=%u gid=%u egid=%u\n", @@ -1426,7 +1428,7 @@ main (int argc, char *argv[]) else { const char *error_str = remote->Context().LaunchStatus().AsString(); - RNBLogSTDERR ("error: failed to launch process %s: %s\n", argv[0], error_str ? error_str : "unknown error."); + RNBLogSTDERR ("error: failed to launch process %s: %s\n", argv_sub_zero, error_str ? error_str : "unknown error."); } } break; -- 2.7.4