X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=rpc%2Fconn.go;h=3f7ade144c1c2905254da49eb7924552aa3c362d;hb=HEAD;hp=03b748545f12c1c588acb24bac2761e0b439b25c;hpb=9d0d090fc1d683accc8bd1b354425c23cbe9fb6a;p=safcm%2Fsafcm.git diff --git a/rpc/conn.go b/rpc/conn.go index 03b7485..301ae2a 100644 --- a/rpc/conn.go +++ b/rpc/conn.go @@ -1,25 +1,14 @@ // Simple RPC-like protocol: implementation of connection and basic actions -// Copyright (C) 2021 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 -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . +// SPDX-License-Identifier: GPL-3.0-or-later +// Copyright (C) 2021-2024 Simon Ruderich package rpc import ( "bufio" "fmt" + "io/fs" "os/exec" "strings" "sync" @@ -36,6 +25,8 @@ type Conn struct { sshRemote string sshOpts []string + remoteHelpers fs.FS + cmd *exec.Cmd conn *safcm.GobConn } @@ -137,7 +128,7 @@ func (c *Conn) Kill() error { c.debugf("Kill: killing connection") - c.cmd.Process.Kill() + c.cmd.Process.Kill() //nolint:errcheck return c.wait() }