From a230fffb88784b94407002c2990987001071ea3f Mon Sep 17 00:00:00 2001 From: aneesh-n <99904+aneesh-n@users.noreply.github.com> Date: Tue, 3 Dec 2024 18:44:17 +0530 Subject: [PATCH] Fix args for processTargets --- internal/archiver/archiver.go | 2 +- internal/archiver/archiver_unix.go | 4 +--- internal/archiver/archiver_windows.go | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/internal/archiver/archiver.go b/internal/archiver/archiver.go index 7521d92c9..86d2bd75d 100644 --- a/internal/archiver/archiver.go +++ b/internal/archiver/archiver.go @@ -511,7 +511,7 @@ func (arch *Archiver) save(ctx context.Context, snPath, target string, previous return futureNode{}, true, nil } var fi *fs.ExtendedFileInfo - fi, shouldReturn, fn, excluded, err := arch.processTargets(target, targetMain, abstarget, *fiMain) + fi, shouldReturn, fn, excluded, err := arch.processTargets(target, targetMain, abstarget, fiMain) if shouldReturn { return fn, excluded, err } diff --git a/internal/archiver/archiver_unix.go b/internal/archiver/archiver_unix.go index 471d99dc7..4309bb36b 100644 --- a/internal/archiver/archiver_unix.go +++ b/internal/archiver/archiver_unix.go @@ -4,8 +4,6 @@ package archiver import ( - "os" - "github.com/restic/restic/internal/fs" "github.com/restic/restic/internal/restic" ) @@ -44,7 +42,7 @@ func getNameFromPathname(pathname string) (name string) { } // processTargets is no-op for non-windows OS -func (arch *Archiver) processTargets(_ string, _ string, _ string, fiMain os.FileInfo) (fi os.FileInfo, shouldReturn bool, fn futureNode, excluded bool, err error) { +func (arch *Archiver) processTargets(_ string, _ string, _ string, fiMain *fs.ExtendedFileInfo) (fi *fs.ExtendedFileInfo, shouldReturn bool, fn futureNode, excluded bool, err error) { return fiMain, false, futureNode{}, false, nil } diff --git a/internal/archiver/archiver_windows.go b/internal/archiver/archiver_windows.go index 552f1a8b0..719ce5fa5 100644 --- a/internal/archiver/archiver_windows.go +++ b/internal/archiver/archiver_windows.go @@ -86,7 +86,7 @@ func addADSStreams(pathname string, paths *[]string) { } // processTargets in windows performs Lstat for the ADS files since the file info would not be available for them yet. -func (arch *Archiver) processTargets(target string, targetMain string, abstarget string, fiMain fs.ExtendedFileInfo) (fi *fs.ExtendedFileInfo, shouldReturn bool, fn futureNode, excluded bool, err error) { +func (arch *Archiver) processTargets(target string, targetMain string, abstarget string, fiMain *fs.ExtendedFileInfo) (fi *fs.ExtendedFileInfo, shouldReturn bool, fn futureNode, excluded bool, err error) { if target != targetMain { //If this is an ADS file we need to Lstat again for the file info. fi, err = arch.FS.Lstat(target) @@ -101,7 +101,7 @@ func (arch *Archiver) processTargets(target string, targetMain string, abstarget return nil, true, futureNode{}, true, nil } } else { - fi = &fiMain + fi = fiMain } return fi, false, futureNode{}, false, nil }