Used new xds agent v1.0.0-rc1 and lib xaapiv1.

[src/xds/xds-gdb.git] / main.go

diff --git a/main.go b/main.go
index d907a44..dfe2a14 100644 (file)
--- a/main.go
+++ b/main.go
@@ -123,7 +123,7 @@ func main() {
                },
                EnvVar{
                        Name:        "XDS_LOGFILE",
-                       Usage:       "logging file",
+                       Usage:       "logging file (default: " + logFileInitial + ")",
                        Destination: &logFile,
                },
                EnvVar{
@@ -360,7 +360,7 @@ endloop:
                                sc := bufio.NewScanner(reader)
                                for sc.Scan() {
                                        data := sc.Text()
-                                       iosk.Emit(apiv1.ExecInferiorInEvent, data+"\n")
+                                       iosk.Emit(xaapiv1.ExecInferiorInEvent, data+"\n")
                                        log.Debugf("Inferior IN: <%v>", data)
                                }
                                if sc.Err() != nil {
@@ -461,9 +461,7 @@ endloop:
                        for {
                                sig := <-sigs
 
-                               // FIXME: skip Window Changed signal for now
-                               if sig == syscall.SIGWINCH {
-                                       log.Debugf("SKIP signal Window Changed")
+                               if isIgnoredSignal(sig) {
                                        return
                                }
 
@@ -524,9 +522,10 @@ func loadConfigEnvFile(confFile, gdbCmdFile string) (map[string]string, string,
                                path.Join(curDir, "target"),
                                path.Join(u.HomeDir, ".config", "xds"),
                        } {
-                               confFile = path.Join(d, xdsEnvFile)
-                               log.Infof("Search config in %s", confFile)
-                               if common.Exists(confFile) {
+                               cf := path.Join(d, xdsEnvFile)
+                               log.Infof("Search config in %s", cf)
+                               if common.Exists(cf) {
+                                       confFile = cf
                                        break
                                }
                        }