summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Molenda <jmolenda@apple.com>2012-11-01 02:02:59 +0000
committerJason Molenda <jmolenda@apple.com>2012-11-01 02:02:59 +0000
commit0b2dbe0ebe1c0c0c59d3fb86f81989f4b20bfe0c (patch)
treee12071e5131dbf67afee718b7439d0bc38de4071
parentb26a24cca2fa03ae7db14b0b6290c005ed93cd55 (diff)
downloadbcm5719-llvm-0b2dbe0ebe1c0c0c59d3fb86f81989f4b20bfe0c.tar.gz
bcm5719-llvm-0b2dbe0ebe1c0c0c59d3fb86f81989f4b20bfe0c.zip
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
-rw-r--r--lldb/tools/debugserver/source/debugserver.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/lldb/tools/debugserver/source/debugserver.cpp b/lldb/tools/debugserver/source/debugserver.cpp
index bd126f85608..69c27d45a19 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;
OpenPOWER on IntegriCloud