PenaDevops/delve
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rr: fix gdb parsing (#3705)

Browse Source 
* rr: fix gdb parsing

Attempt to fix https://github.com/go-delve/delve/issues/3704

* Fold into one branch
This commit is contained in:
John Howard 2024-04-19 10:38:01 -07:00 committed by GitHub
parent 64a46abd81
commit baf68e0e79
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/proc/gdbserial/rr.go
View File

@ -216,7 +216,8 @@ type rrInit struct {
}
const (
rrGdbCommandPrefix = " gdb "
rrGdbCommandLegacyPrefix = " gdb "
rrGdbCommandPrefix = " 'gdb' "
rrGdbLaunchPrefix = "Launch gdb with"
targetCmd = "target extended-remote "
)
@ -233,8 +234,13 @@ func rrStderrParser(stderr io.ReadCloser, initch chan<- rrInit, quiet bool) {
return
}
if strings.HasPrefix(line, rrGdbCommandPrefix) {
initch <- rrParseGdbCommand(line[len(rrGdbCommandPrefix):])
var flags string
var foundPrefix bool
if flags, foundPrefix = strings.CutPrefix(line, rrGdbCommandPrefix); !foundPrefix {
flags, foundPrefix = strings.CutPrefix(line, rrGdbCommandLegacyPrefix)
}
if foundPrefix {
initch <- rrParseGdbCommand(flags)
close(initch)
break
}