reactos/syzkaller
1
0
Fork 0
mirror of https://github.com/reactos/syzkaller.git synced 2024-11-23 03:19:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pkg/osutil: fix LinkFiles/FilesExist for the new pattern format

Browse Source
This commit is contained in:
Dmitry Vyukov 2020-09-15 09:22:26 +02:00
parent a2360d0742
commit 9e681632f5
2 changed files with 64 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pkg/osutil/osutil.go
View File

@ -130,11 +130,12 @@ func IsAccessible(name string) error {
// FilesExist returns true if all files exist in dir. // FilesExist returns true if all files exist in dir.
// Files are assumed to be relative names in slash notation. // Files are assumed to be relative names in slash notation.
func FilesExist(dir string, files map[string]bool) bool { func FilesExist(dir string, files map[string]bool) bool {
for f, required := range files { for pattern, required := range files {
if !required { if !required {
continue continue
} }
if !IsExist(filepath.Join(dir, filepath.FromSlash(f))) { files, err := filepath.Glob(filepath.Join(dir, filepath.FromSlash(pattern)))
if err != nil || len(files) == 0 {
return false return false
} }
} }
@ -154,7 +155,18 @@ func CopyFiles(srcDir, dstDir string, files map[string]bool) error {
if err := MkdirAll(tmpDir); err != nil { if err := MkdirAll(tmpDir); err != nil {
return err return err
} }
if err := foreachPatternFile(srcDir, tmpDir, files, CopyFile); err != nil {
return err
}
if err := os.RemoveAll(dstDir); err != nil {
return err
}
return os.Rename(tmpDir, dstDir)
}
func foreachPatternFile(srcDir, dstDir string, files map[string]bool, fn func(src, dst string) error) error {
srcDir = filepath.Clean(srcDir) srcDir = filepath.Clean(srcDir)
dstDir = filepath.Clean(dstDir)
for pattern, required := range files { for pattern, required := range files {
files, err := filepath.Glob(filepath.Join(srcDir, filepath.FromSlash(pattern))) files, err := filepath.Glob(filepath.Join(srcDir, filepath.FromSlash(pattern)))
if err != nil { if err != nil {
@ -170,19 +182,16 @@ func CopyFiles(srcDir, dstDir string, files map[string]bool) error {
if !strings.HasPrefix(file, srcDir) { if !strings.HasPrefix(file, srcDir) {
return fmt.Errorf("file %q matched from %q in %q doesn't have src prefix", file, pattern, srcDir) return fmt.Errorf("file %q matched from %q in %q doesn't have src prefix", file, pattern, srcDir)
} }
dst := filepath.Join(tmpDir, strings.TrimPrefix(file, srcDir)) dst := filepath.Join(dstDir, strings.TrimPrefix(file, srcDir))
if err := MkdirAll(filepath.Dir(dst)); err != nil { if err := MkdirAll(filepath.Dir(dst)); err != nil {
return err return err
} }
if err := CopyFile(file, dst); err != nil { if err := fn(file, dst); err != nil {
return err return err
} }
} }
} }
if err := os.RemoveAll(dstDir); err != nil { return nil
return err
}
return os.Rename(tmpDir, dstDir)
} }
func CopyDirRecursively(srcDir, dstDir string) error { func CopyDirRecursively(srcDir, dstDir string) error {
@ -219,20 +228,7 @@ func LinkFiles(srcDir, dstDir string, files map[string]bool) error {
if err := MkdirAll(dstDir); err != nil { if err := MkdirAll(dstDir); err != nil {
return err return err
} }
for f, required := range files { return foreachPatternFile(srcDir, dstDir, files, os.Link)
src := filepath.Join(srcDir, filepath.FromSlash(f))
if !required && !IsExist(src) {
continue
}
dst := filepath.Join(dstDir, filepath.FromSlash(f))
if err := MkdirAll(filepath.Dir(dst)); err != nil {
return err
}
if err := os.Link(src, dst); err != nil {
return err
}
}
return nil
} }
func MkdirAll(dir string) error { func MkdirAll(dir string) error {

81
pkg/osutil/osutil_test.go
View File

@ -73,42 +73,53 @@ func TestCopyFiles(t *testing.T) {
}, },
}, },
} }
for i, test := range tests { for _, link := range []bool{false, true} {
t.Run(fmt.Sprint(i), func(t *testing.T) { fn, fnName := CopyFiles, "CopyFiles"
dir, err := ioutil.TempDir("", "syz-osutil-test") if link {
if err != nil { fn, fnName = LinkFiles, "LinkFiles"
t.Fatal(err) }
} t.Run(fnName, func(t *testing.T) {
defer os.RemoveAll(dir) for i, test := range tests {
src := filepath.Join(dir, "src") t.Run(fmt.Sprint(i), func(t *testing.T) {
dst := filepath.Join(dir, "dst") dir, err := ioutil.TempDir("", "syz-osutil-test")
for _, file := range test.files { if err != nil {
file = filepath.Join(src, filepath.FromSlash(file)) t.Fatal(err)
if err := MkdirAll(filepath.Dir(file)); err != nil {
t.Fatal(err)
}
if err := WriteFile(file, []byte{'a'}); err != nil {
t.Fatal(err)
}
}
if err := CopyFiles(src, dst, test.patterns); err != nil {
if test.err != "" {
if strings.Contains(err.Error(), test.err) {
return
} }
t.Fatalf("got err %q, want %q", err, test.err) defer os.RemoveAll(dir)
} src := filepath.Join(dir, "src")
t.Fatal(err) dst := filepath.Join(dir, "dst")
} else if test.err != "" { for _, file := range test.files {
t.Fatalf("got no err, want %q", test.err) file = filepath.Join(src, filepath.FromSlash(file))
} if err := MkdirAll(filepath.Dir(file)); err != nil {
if err := os.RemoveAll(src); err != nil { t.Fatal(err)
t.Fatal(err) }
} if err := WriteFile(file, []byte{'a'}); err != nil {
for _, file := range test.files { t.Fatal(err)
if !IsExist(filepath.Join(dst, filepath.FromSlash(file))) { }
t.Fatalf("%v does not exist in dst", file) }
} if err := fn(src, dst, test.patterns); err != nil {
if test.err != "" {
if strings.Contains(err.Error(), test.err) {
return
}
t.Fatalf("got err %q, want %q", err, test.err)
}
t.Fatal(err)
} else if test.err != "" {
t.Fatalf("got no err, want %q", test.err)
}
if err := os.RemoveAll(src); err != nil {
t.Fatal(err)
}
for _, file := range test.files {
if !IsExist(filepath.Join(dst, filepath.FromSlash(file))) {
t.Fatalf("%v does not exist in dst", file)
}
}
if !FilesExist(dst, test.patterns) {
t.Fatalf("dst files don't exist after copy")
}
})
} }
}) })
} }