From 15e6c23776be57aec03dcfc347bf9dc7aed5cecf Mon Sep 17 00:00:00 2001 From: Hiromu OCHIAI Date: Fri, 7 May 2021 18:35:53 +0900 Subject: [PATCH] Change local name `copy` to `copyNextOrSkip` DO NOT use the name `copy` since it is reserved by builtin. Related #60 See https://github.com/otiai10/copy/pull/60#discussion_r627254825 --- copy.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/copy.go b/copy.go index 1b16224..77bf9f9 100644 --- a/copy.go +++ b/copy.go @@ -47,10 +47,10 @@ func switchboard(src, dest string, info os.FileInfo, opt Options) (err error) { return err } -// copy decide if this src should be copied or not. +// copyNextOrSkip decide if this src should be copied or not. // Because this "copy" could be called recursively, // "info" MUST be given here, NOT nil. -func copy(src, dest string, info os.FileInfo, opt Options) error { +func copyNextOrSkip(src, dest string, info os.FileInfo, opt Options) error { skip, err := opt.Skip(src) if err != nil { return err @@ -58,7 +58,6 @@ func copy(src, dest string, info os.FileInfo, opt Options) error { if skip { return nil } - return switchboard(src, dest, info, opt) } @@ -148,7 +147,7 @@ func dcopy(srcdir, destdir string, info os.FileInfo, opt Options) (err error) { for _, content := range contents { cs, cd := filepath.Join(srcdir, content.Name()), filepath.Join(destdir, content.Name()) - if err = copy(cs, cd, content, opt); err != nil { + if err = copyNextOrSkip(cs, cd, content, opt); err != nil { // If any error, exit immediately return } @@ -174,7 +173,7 @@ func onsymlink(src, dest string, info os.FileInfo, opt Options) error { if err != nil { return err } - return copy(orig, dest, info, opt) + return copyNextOrSkip(orig, dest, info, opt) case Skip: fallthrough default: