From cbd88c457a97d6383dd82099dc20cb06c50dca95 Mon Sep 17 00:00:00 2001
From: Alexander Neumann <alexander@bumpern.de>
Date: Sat, 30 Jan 2021 16:49:15 +0100
Subject: [PATCH] backup: Improve error handling

---
 cmd/restic/cmd_backup.go | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/cmd/restic/cmd_backup.go b/cmd/restic/cmd_backup.go
index e769fef1f..bd8b4da8c 100644
--- a/cmd/restic/cmd_backup.go
+++ b/cmd/restic/cmd_backup.go
@@ -205,10 +205,21 @@ func readFilenamesFromFileRaw(filename string) (names []string, err error) {
 		if f, err = os.Open(filename); err != nil {
 			return nil, err
 		}
-		defer f.Close()
 	}
 
-	return readFilenamesRaw(f)
+	names, err = readFilenamesRaw(f)
+	if err != nil {
+		// ignore subsequent errors
+		_ = f.Close()
+		return nil, err
+	}
+
+	err = f.Close()
+	if err != nil {
+		return nil, err
+	}
+
+	return names, nil
 }
 
 func readFilenamesRaw(r io.Reader) (names []string, err error) {