Merge pull request #106 from cpuguy83/export_copy_file

estesp · web-flow · commit c6cef3483023 · 2018-04-16T19:01:28.000-04:00
Export `copyFile`
diff --git a/fs/copy.go b/fs/copy.go
@@ -72,7 +72,7 @@ func copyDirectory(dst, src string, inodes map[uint64]string) error {
 				if err := os.Link(link, target); err != nil {
 					return errors.Wrap(err, "failed to create hard link")
 				}
-			} else if err := copyFile(source, target); err != nil {
+			} else if err := CopyFile(target, source); err != nil {
 				return errors.Wrap(err, "failed to copy files")
 			}
 		case (fi.Mode() & os.ModeSymlink) == os.ModeSymlink:
@@ -103,7 +103,9 @@ func copyDirectory(dst, src string, inodes map[uint64]string) error {
 	return nil
 }
 
-func copyFile(source, target string) error {
+// CopyFile copies the source file to the target.
+// The most efficient means of copying is used for the platform.
+func CopyFile(target, source string) error {
 	src, err := os.Open(source)
 	if err != nil {
 		return errors.Wrapf(err, "failed to open source %s", source)

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ func copyDirectory(dst, src string, inodes map[uint64]string) error {`
`72`	`72`	`if err := os.Link(link, target); err != nil {`
`73`	`73`	`return errors.Wrap(err, "failed to create hard link")`
`74`	`74`	`}`
`75`		`- } else if err := copyFile(source, target); err != nil {`
	`75`	`+ } else if err := CopyFile(target, source); err != nil {`
`76`	`76`	`return errors.Wrap(err, "failed to copy files")`
`77`	`77`	`}`
`78`	`78`	`case (fi.Mode() & os.ModeSymlink) == os.ModeSymlink:`
`@@ -103,7 +103,9 @@ func copyDirectory(dst, src string, inodes map[uint64]string) error {`
`103`	`103`	`return nil`
`104`	`104`	`}`
`105`	`105`
`106`		`-func copyFile(source, target string) error {`
	`106`	`+// CopyFile copies the source file to the target.`
	`107`	`+// The most efficient means of copying is used for the platform.`
	`108`	`+func CopyFile(target, source string) error {`
`107`	`109`	`src, err := os.Open(source)`
`108`	`110`	`if err != nil {`
`109`	`111`	`return errors.Wrapf(err, "failed to open source %s", source)`