From deca7d08ac3981105ecf4a04c9261e95d579e99b Mon Sep 17 00:00:00 2001 From: Michael Eischer Date: Fri, 14 Jun 2024 20:17:06 +0200 Subject: [PATCH] restorer: cleanup unexpected xattrs on windows --- internal/restic/node_windows.go | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/internal/restic/node_windows.go b/internal/restic/node_windows.go index 0d96bdb98..48ce07295 100644 --- a/internal/restic/node_windows.go +++ b/internal/restic/node_windows.go @@ -155,6 +155,26 @@ func restoreExtendedAttributes(nodeType, path string, eas []fs.ExtendedAttribute } defer closeFileHandle(fileHandle, path) // Replaced inline defer with named function call + // clear old unexpected xattrs by setting them to an empty value + oldEAs, err := fs.GetFileEA(fileHandle) + if err != nil { + return err + } + + for _, oldEA := range oldEAs { + found := false + for _, ea := range eas { + if strings.EqualFold(ea.Name, oldEA.Name) { + found = true + break + } + } + + if !found { + eas = append(eas, fs.ExtendedAttribute{Name: oldEA.Name, Value: nil}) + } + } + if err = fs.SetFileEA(fileHandle, eas); err != nil { return errors.Errorf("set EA failed for path %v, with: %v", path, err) }