mirror of
https://github.com/restic/restic.git
synced 2025-12-13 12:02:59 +00:00
Check error in archiver before calling Select
The archiver first called the Select function for a path before checking whether the Lstat on that path actually worked. The RejectFuncs in exclude.go worked around this by checking whether they received a nil os.FileInfo. Checking first is more obvious and requires less code.
This commit is contained in:
@@ -234,10 +234,6 @@ func rejectByDevice(samples []string) (RejectFunc, error) {
|
||||
debug.Log("allowed devices: %v\n", allowed)
|
||||
|
||||
return func(item string, fi os.FileInfo) bool {
|
||||
if fi == nil {
|
||||
return false
|
||||
}
|
||||
|
||||
item = filepath.Clean(item)
|
||||
|
||||
id, err := fs.DeviceID(fi)
|
||||
@@ -301,10 +297,6 @@ func rejectBySize(maxSizeStr string) (RejectFunc, error) {
|
||||
}
|
||||
|
||||
return func(item string, fi os.FileInfo) bool {
|
||||
if fi == nil {
|
||||
return false
|
||||
}
|
||||
|
||||
// directory will be ignored
|
||||
if fi.IsDir() {
|
||||
return false
|
||||
|
||||
Reference in New Issue
Block a user