update vendor/

vendor/github.com/otiai10/copy/copy.go

@@ -14,93 +14,177 @@ const (
 	tmpPermissionForDirectory = os.FileMode(0755)
 )
 
-// Copy copies src to dest, doesn't matter if src is a directory or a file
-func Copy(src, dest string) error {
+// Copy copies src to dest, doesn't matter if src is a directory or a file.
+func Copy(src, dest string, opt ...Options) error {
 	info, err := os.Lstat(src)
 	if err != nil {
 		return err
 	}
-	return copy(src, dest, info)
+	return switchboard(src, dest, info, assure(opt...))
 }
 
-// copy dispatches copy-funcs according to the mode.
+// switchboard switches proper copy functions regarding file type, etc...
+// If there would be anything else here, add a case to this switchboard.
+func switchboard(src, dest string, info os.FileInfo, opt Options) error {
+	switch {
+	case info.Mode()&os.ModeSymlink != 0:
+		return onsymlink(src, dest, opt)
+	case info.IsDir():
+		return dcopy(src, dest, info, opt)
+	default:
+		return fcopy(src, dest, info, opt)
+	}
+}
+
+// copy 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) error {
-	if info.Mode()&os.ModeSymlink != 0 {
-		return lcopy(src, dest, info)
+func copy(src, dest string, info os.FileInfo, opt Options) error {
+	skip, err := opt.Skip(src)
+	if err != nil {
+		return err
 	}
-	if info.IsDir() {
-		return dcopy(src, dest, info)
+	if skip {
+		return nil
 	}
-	return fcopy(src, dest, info)
+	return switchboard(src, dest, info, opt)
 }
 
 // fcopy is for just a file,
 // with considering existence of parent directory
 // and file permission.
-func fcopy(src, dest string, info os.FileInfo) error {
+func fcopy(src, dest string, info os.FileInfo, opt Options) (err error) {
 
-	if err := os.MkdirAll(filepath.Dir(dest), os.ModePerm); err != nil {
-		return err
+	if err = os.MkdirAll(filepath.Dir(dest), os.ModePerm); err != nil {
+		return
 	}
 
 	f, err := os.Create(dest)
 	if err != nil {
-		return err
+		return
 	}
-	defer f.Close()
+	defer fclose(f, &err)
 
-	if err = os.Chmod(f.Name(), info.Mode()); err != nil {
-		return err
+	if err = os.Chmod(f.Name(), info.Mode()|opt.AddPermission); err != nil {
+		return
 	}
 
 	s, err := os.Open(src)
 	if err != nil {
-		return err
+		return
 	}
-	defer s.Close()
+	defer fclose(s, &err)
 
-	_, err = io.Copy(f, s)
-	return err
+	if _, err = io.Copy(f, s); err != nil {
+		return
+	}
+
+	if opt.Sync {
+		err = f.Sync()
+	}
+
+	return
 }
 
 // dcopy is for a directory,
 // with scanning contents inside the directory
 // and pass everything to "copy" recursively.
-func dcopy(srcdir, destdir string, info os.FileInfo) error {
+func dcopy(srcdir, destdir string, info os.FileInfo, opt Options) (err error) {
 
 	originalMode := info.Mode()
 
 	// Make dest dir with 0755 so that everything writable.
-	if err := os.MkdirAll(destdir, tmpPermissionForDirectory); err != nil {
-		return err
+	if err = os.MkdirAll(destdir, tmpPermissionForDirectory); err != nil {
+		return
 	}
 	// Recover dir mode with original one.
-	defer os.Chmod(destdir, originalMode)
+	defer chmod(destdir, originalMode|opt.AddPermission, &err)
 
 	contents, err := ioutil.ReadDir(srcdir)
 	if err != nil {
-		return err
+		return
 	}
 
 	for _, content := range contents {
 		cs, cd := filepath.Join(srcdir, content.Name()), filepath.Join(destdir, content.Name())
-		if err := copy(cs, cd, content); err != nil {
+
+		if err = copy(cs, cd, content, opt); err != nil {
 			// If any error, exit immediately
-			return err
+			return
 		}
 	}
 
-	return nil
+	return
+}
+
+func onsymlink(src, dest string, opt Options) error {
+
+	switch opt.OnSymlink(src) {
+	case Shallow:
+		return lcopy(src, dest)
+	case Deep:
+		orig, err := filepath.EvalSymlinks(src)
+		if err != nil {
+			return err
+		}
+		info, err := os.Lstat(orig)
+		if err != nil {
+			return err
+		}
+		return copy(orig, dest, info, opt)
+	case Skip:
+		fallthrough
+	default:
+		return nil // do nothing
+	}
 }
 
 // lcopy is for a symlink,
 // with just creating a new symlink by replicating src symlink.
-func lcopy(src, dest string, info os.FileInfo) error {
+func lcopy(src, dest string) error {
 	src, err := os.Readlink(src)
 	if err != nil {
 		return err
 	}
+
+	// Create the directories on the path to the dest symlink.
+	if err = os.MkdirAll(filepath.Dir(dest), os.ModePerm); err != nil {
+		return err
+	}
+
 	return os.Symlink(src, dest)
 }
+
+// fclose ANYHOW closes file,
+// with asiging error raised during Close,
+// BUT respecting the error already reported.
+func fclose(f *os.File, reported *error) {
+	if err := f.Close(); *reported == nil {
+		*reported = err
+	}
+}
+
+// chmod ANYHOW changes file mode,
+// with asiging error raised during Chmod,
+// BUT respecting the error already reported.
+func chmod(dir string, mode os.FileMode, reported *error) {
+	if err := os.Chmod(dir, mode); *reported == nil {
+		*reported = err
+	}
+}
+
+// assure Options struct, should be called only once.
+// All optional values MUST NOT BE nil/zero after assured.
+func assure(opts ...Options) Options {
+	if len(opts) == 0 {
+		return getDefaultOptions()
+	}
+	defopt := getDefaultOptions()
+	if opts[0].OnSymlink == nil {
+		opts[0].OnSymlink = defopt.OnSymlink
+	}
+	if opts[0].Skip == nil {
+		opts[0].Skip = defopt.Skip
+	}
+	return opts[0]
+}