X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=main.go;h=d907a449f90667e6885944012d632bbf08725124;hb=68f893390feb6d4f442add4ac4152c9cb1112019;hp=4302e9c9fb9afddbd9c233ce1516b570ff6c8598;hpb=68ac563c8ce709fe55d3cf38ea230ea78d633d6a;p=src%2Fxds%2Fxds-gdb.git

diff --git a/main.go b/main.go
index 4302e9c..d907a44 100644
--- a/main.go
+++ b/main.go
@@ -345,7 +345,7 @@ endloop:
 
 		// Handle client tty / pts
 		if clientPty != "" {
-			log.Infoln("Client tty detected: %v\n", clientPty)
+			log.Infoln("Client tty detected: %v", clientPty)
 
 			cpFd, err := os.OpenFile(clientPty, os.O_RDWR, 0)
 			if err != nil {
@@ -409,6 +409,10 @@ endloop:
 			paranoia := 600
 			reader := bufio.NewReader(os.Stdin)
 
+			// Enable workaround to correctly close connection
+			// except if XDS_GDBSERVER_EXIT_NOFIX is defined
+			_, gdbExitNoFix := os.LookupEnv("XDS_GDBSERVER_EXIT_NOFIX")
+
 			for {
 				sc := bufio.NewScanner(reader)
 				for sc.Scan() {
@@ -421,6 +425,16 @@ endloop:
 							log.Debugf("OVERWRITE %s -> %s", key, value)
 						}
 					}
+
+					// Send SIGINT to stop debugged process execution before sending -gdb-exit command
+					if !gdbExitNoFix && strings.Contains(command, "-gdb-exit") {
+						log.Infof("Detection of -gdb-exit, exiting...")
+						if err := gdb.SendSignal(syscall.SIGINT); err != nil {
+							log.Errorf("Error while sending signal SIGINT : %s", err.Error())
+						}
+						time.Sleep(time.Millisecond * 200)
+					}
+
 					gdb.Write(command + "\n")
 					log.Debugf("Send: <%v>", command)
 				}
@@ -446,8 +460,15 @@ endloop:
 		go func() {
 			for {
 				sig := <-sigs
+
+				// FIXME: skip Window Changed signal for now
+				if sig == syscall.SIGWINCH {
+					log.Debugf("SKIP signal Window Changed")
+					return
+				}
+
 				if err := gdb.SendSignal(sig); err != nil {
-					log.Errorf("Error while sending signal: %s", err.Error())
+					log.Errorf("Error while sending signal %v : %s", sig, err.Error())
 				}
 			}
 		}()