From 7d879705ada5c80b665c41edbdc82d59a19d0307 Mon Sep 17 00:00:00 2001
From: Michael Eischer <michael.eischer@fau.de>
Date: Sun, 1 Oct 2023 15:07:51 +0200
Subject: [PATCH] fs: cleanup CommandReader implementation

---
 cmd/restic/cmd_backup.go         |  2 +-
 internal/fs/fs_reader_command.go | 55 ++++++++++++++++----------------
 2 files changed, 29 insertions(+), 28 deletions(-)

diff --git a/cmd/restic/cmd_backup.go b/cmd/restic/cmd_backup.go
index 69a68ccab..8207e0bb4 100644
--- a/cmd/restic/cmd_backup.go
+++ b/cmd/restic/cmd_backup.go
@@ -728,5 +728,5 @@ func prepareStdinCommand(ctx context.Context, args []string) (io.ReadCloser, err
 	if err := command.Start(); err != nil {
 		return nil, errors.Wrap(err, "command.Start")
 	}
-	return &fs.ReadCloserCommand{Cmd: command, Stdout: stdout}, nil
+	return fs.NewCommandReader(command, stdout), nil
 }
diff --git a/internal/fs/fs_reader_command.go b/internal/fs/fs_reader_command.go
index bc377ab96..b257deb72 100644
--- a/internal/fs/fs_reader_command.go
+++ b/internal/fs/fs_reader_command.go
@@ -1,17 +1,18 @@
 package fs
 
 import (
-	"github.com/restic/restic/internal/errors"
 	"io"
 	"os/exec"
+
+	"github.com/restic/restic/internal/errors"
 )
 
-// ReadCloserCommand wraps an exec.Cmd and its standard output to provide an
+// CommandReader wraps an exec.Cmd and its standard output to provide an
 // io.ReadCloser that waits for the command to terminate on Close(), reporting
 // any error in the command.Wait() function back to the Close() caller.
-type ReadCloserCommand struct {
-	Cmd    *exec.Cmd
-	Stdout io.ReadCloser
+type CommandReader struct {
+	cmd    *exec.Cmd
+	stdout io.ReadCloser
 
 	// We should call exec.Wait() once. waitHandled is taking care of storing
 	// whether we already called that function in Read() to avoid calling it
@@ -25,44 +26,36 @@ type ReadCloserCommand struct {
 	alreadyClosedReadErr error
 }
 
+func NewCommandReader(cmd *exec.Cmd, stdout io.ReadCloser) *CommandReader {
+	return &CommandReader{
+		cmd:    cmd,
+		stdout: stdout,
+	}
+}
+
 // Read populate the array with data from the process stdout.
-func (fp *ReadCloserCommand) Read(p []byte) (int, error) {
+func (fp *CommandReader) Read(p []byte) (int, error) {
 	if fp.alreadyClosedReadErr != nil {
 		return 0, fp.alreadyClosedReadErr
 	}
-	b, err := fp.Stdout.Read(p)
+	b, err := fp.stdout.Read(p)
 
 	// If the error is io.EOF, the program terminated. We need to check the
 	// exit code here because, if the program terminated with no output, the
 	// error in `Close()` is ignored.
 	if errors.Is(err, io.EOF) {
-		// Check if the command terminated successfully. If not, return the
-		// error.
 		fp.waitHandled = true
-		errw := fp.Cmd.Wait()
-		if errw != nil {
-			// If we have information about the exit code, let's use it in the
-			// error message. Otherwise, send the error message along.
-			// In any case, use a fatal error to abort the snapshot.
-			var err2 *exec.ExitError
-			if errors.As(errw, &err2) {
-				err = errors.Fatalf("command terminated with exit code %d", err2.ExitCode())
-			} else {
-				err = errors.Fatal(errw.Error())
-			}
+		// check if the command terminated successfully, If not return the error.
+		if errw := fp.wait(); errw != nil {
+			err = errw
 		}
 	}
 	fp.alreadyClosedReadErr = err
 	return b, err
 }
 
-func (fp *ReadCloserCommand) Close() error {
-	if fp.waitHandled {
-		return nil
-	}
-
-	// No need to close fp.Stdout as Wait() closes all pipes.
-	err := fp.Cmd.Wait()
+func (fp *CommandReader) wait() error {
+	err := fp.cmd.Wait()
 	if err != nil {
 		// If we have information about the exit code, let's use it in the
 		// error message. Otherwise, send the error message along.
@@ -75,3 +68,11 @@ func (fp *ReadCloserCommand) Close() error {
 	}
 	return nil
 }
+
+func (fp *CommandReader) Close() error {
+	if fp.waitHandled {
+		return nil
+	}
+
+	return fp.wait()
+}