go-rsync-receiver

created pr with 45.1 on 2025-01-21T15:08:10Z · by c8ef7d19

cmds

checkout latest patchset:

ssh pr.pico.sh print 45 | git am -3

checkout any patchset in a patch request:

ssh pr.pico.sh print 45.[rev] | git am -3

add changes to patch request:

git format-patch main --stdout | ssh pr.pico.sh pr add 45

Patchset `45.1` on 2025-01-21T15:08:10Z · commit 146cd84

→ fix: close read readers

Eric Bower 2024-07-09T01:59:33Z

fix: close read readers

Eric Bower 2024-07-09T01:59:33Z

Semantic diff summary

1 added, 2 modified, 0 signature changed, 0 removed across 2 analyzed files

rsyncsender/sender.go

function_declaration sendFile modified

utils/fs.go

type_declaration ReaderAtCloser added
type_declaration FS modified

+1 -0 rsyncsender/sender.go #

......@@ -141,6 +141,7 @@ func (st *sendTransfer) sendFile(fileIndex int32, fl *utils.SenderFile) error {
	const chunkSize = 32 * 1024

	fi, f, err := st.filesystem.Read(fl)
	defer f.Close()
	if err != nil {
		return err
	}

+6 -1 utils/fs.go #

......@@ -5,10 +5,15 @@ import (
	"os"
)

type ReaderAtCloser interface {
	io.ReaderAt
	io.Closer
}

// File System: need to handle all type of files: regular, folder, symlink, etc
type FS interface {
	Put(*ReceiverFile) (int64, error)
	Skip(*ReceiverFile) bool
	List(string) ([]os.FileInfo, error)
	Read(*SenderFile) (os.FileInfo, io.ReaderAt, error)
	Read(*SenderFile) (os.FileInfo, ReaderAtCloser, error)
}

...	...		@@ -141,6 +141,7 @@ func (st sendTransfer) sendFile(fileIndex int32, fl utils.SenderFile) error {
141	141		const chunkSize = 32 * 1024
142	142
143	143		fi, f, err := st.filesystem.Read(fl)
	144	+	defer f.Close()
144	145		if err != nil {
145	146		return err
146	147		}

...	...		@@ -5,10 +5,15 @@ import (
5	5		"os"
6	6		)
7	7
	8	+	type ReaderAtCloser interface {
	9	+	io.ReaderAt
	10	+	io.Closer
	11	+	}
	12	+
8	13		// File System: need to handle all type of files: regular, folder, symlink, etc
9	14		type FS interface {
10	15		Put(*ReceiverFile) (int64, error)
11	16		Skip(*ReceiverFile) bool
12	17		List(string) ([]os.FileInfo, error)
13		-	Read(*SenderFile) (os.FileInfo, io.ReaderAt, error)
	18	+	Read(*SenderFile) (os.FileInfo, ReaderAtCloser, error)
14	19		}

go-rsync-receiver

Patchset 45.1 on 2025-01-21T15:08:10Z · commit 146cd84

Patchset `45.1` on 2025-01-21T15:08:10Z · commit 146cd84