diff options
| author | hjk <hjk@qt.io> | 2019-08-05 16:26:20 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2019-08-06 08:07:25 +0000 |
| commit | 5b33660a575e71b0eb7a70593b69d6efbd1ceebd (patch) | |
| tree | 5b45cb075723fbcfdcc48535724b5fd67570088f /share | |
| parent | ea901fd4f1a60396cddd8f422729d6aeb82fa224 (diff) | |
Debugger: Allow spaces in arguments with LLDB
Change-Id: Iebc6f7975e9a306805911ed18eb4689074abd891
Task-number: QTCREATORBUG-22811
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qtcreator/debugger/lldbbridge.py | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/share/qtcreator/debugger/lldbbridge.py b/share/qtcreator/debugger/lldbbridge.py index f7cd2f591b..36302be0d6 100644 --- a/share/qtcreator/debugger/lldbbridge.py +++ b/share/qtcreator/debugger/lldbbridge.py @@ -841,7 +841,7 @@ class Dumper(DumperBase): self.startMode_ = args.get('startmode', 1) self.breakOnMain_ = args.get('breakonmain', 0) self.useTerminal_ = args.get('useterminal', 0) - self.processArgs_ = self.hexdecode(args.get('processargs')) + self.processArgs_ = self.hexdecode(args.get('processargs', '')).split('\0') self.environment_ = args.get('environment', []) self.environment_ = list(map(lambda x: self.hexdecode(x), self.environment_)) self.attachPid_ = args.get('attachpid', 0) @@ -932,19 +932,7 @@ class Dumper(DumperBase): else: self.reportState('enginerunfailed') else: - # This does not seem to work on Linux nor macOS? - #launchInfo = lldb.SBLaunchInfo([self.processArgs_]) - #launchInfo.SetShellExpandArguments(True) - args = [] - try: - import subprocess - cmd = 'for x in {} ; do printf "%s\n" "$x" ; done' \ - .format(self.processArgs_) - args = subprocess.check_output(cmd, shell=True, cwd=self.workingDirectory_).split() - except: - # Wrong, but... - args = self.processArgs_ - launchInfo = lldb.SBLaunchInfo(args) + launchInfo = lldb.SBLaunchInfo(self.processArgs_) launchInfo.SetWorkingDirectory(self.workingDirectory_) launchInfo.SetEnvironmentEntries(self.environment_, False) if self.breakOnMain_: |