X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=rpc%2Fconn.go;h=2dc2da7a0d5248d4792b72443abe8c24734cac8b;hb=791f34212ebd19a9c79c9bd1157f590f4b24f5c2;hp=9786941c7e808966a9a76841bfd6e03981f81ba6;hpb=5d6cc7f14a4bacc36bf3a23cd735a75ad4a90f1d;p=safcm%2Fsafcm.git

diff --git a/rpc/conn.go b/rpc/conn.go
index 9786941..2dc2da7 100644
--- a/rpc/conn.go
+++ b/rpc/conn.go
@@ -1,6 +1,6 @@
 // Simple RPC-like protocol: implementation of connection and basic actions
 
-// Copyright (C) 2021  Simon Ruderich
+// Copyright (C) 2021-2022  Simon Ruderich
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -20,6 +20,7 @@ package rpc
 import (
 	"bufio"
 	"fmt"
+	"io/fs"
 	"os/exec"
 	"strings"
 	"sync"
@@ -36,6 +37,8 @@ type Conn struct {
 	sshRemote string
 	sshOpts   []string
 
+	remoteHelpers fs.FS
+
 	cmd  *exec.Cmd
 	conn *safcm.GobConn
 }
@@ -124,15 +127,20 @@ func (c *Conn) wait() error {
 }
 
 // Kill forcefully terminates the connection. It's safe to call Kill (and
-// Wait) multiple times.
+// Wait) multiple times. Calling it before Dial*() was called will only close
+// the Events channel.
 func (c *Conn) Kill() error {
 	if c.cmd == nil {
+		if c.events != nil {
+			close(c.events)
+			c.events = nil
+		}
 		return fmt.Errorf("Dial*() not called or already terminated")
 	}
 
 	c.debugf("Kill: killing connection")
 
-	c.cmd.Process.Kill()
+	c.cmd.Process.Kill() //nolint:errcheck
 	return c.wait()
 }