Move changes.go and changes_unix.go to utils

Signed-off-by: Lei Jitang <[email protected]>

Author: coolljt0725

image/layer.go

@@ -19,6 +19,8 @@ import (
 	"io"
 	"os"
 	"path/filepath"
+
+	"github.com/opencontainers/image-tools/utils"
 )
 
 // CreateLayer cretes filesystem changset from child and parent
@@ -43,12 +45,12 @@ func CreateLayer(child, parent, dest string) error {
 
 // Diff produces an archive of the changes between the specified
 // layer and its parent layer which may be "".
-func Diff(child, parent string) (arch io.ReadCloser, err error) {
-	changes, err := ChangesDirs(child, parent)
+func Diff(child, parent string) (rc io.ReadCloser, err error) {
+	changes, err := utils.ChangesDirs(child, parent)
 	if err != nil {
 		return nil, err
 	}
-	archive, err := exportChanges(child, changes)
+	archive, err := utils.ExportChanges(child, changes)
 	if err != nil {
 		return nil, err
 	}

image/change.go renamed to utils/change.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package image
+package utils
 
 import (
 	"archive/tar"
@@ -27,7 +27,6 @@ import (
 	"time"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/opencontainers/image-tools/utils"
 )
 
 // ChangeType represents the change type.
@@ -67,7 +66,7 @@ func sameFsTimeSpec(a, b syscall.Timespec) bool {
 type FileInfo struct {
 	parent     *FileInfo
 	name       string
-	stat       *utils.StatT
+	stat       *StatT
 	children   map[string]*FileInfo
 	capability []byte
 	added      bool
@@ -225,16 +224,16 @@ func ChangesDirs(newDir, oldDir string) ([]Change, error) {
 }
 
 // ExportChanges produces an Archive from the provided changes, relative to dir.
-func exportChanges(dir string, changes []Change) (io.ReadCloser, error) {
+func ExportChanges(dir string, changes []Change) (io.ReadCloser, error) {
 	reader, writer := io.Pipe()
 	go func() {
-		ta := &utils.TarAppender{
+		ta := &TarAppender{
 			TarWriter: tar.NewWriter(writer),
-			Buffer:    utils.BufioWriter32KPool.Get(nil),
+			Buffer:    BufioWriter32KPool.Get(nil),
 			SeenFiles: make(map[uint64]string),
 		}
 		// this buffer is needed for the duration of this piped stream
-		defer utils.BufioWriter32KPool.Put(ta.Buffer)
+		defer BufioWriter32KPool.Put(ta.Buffer)
 
 		sort.Sort(changesByPath(changes))
 

image/change_unix.go renamed to utils/change_unix.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package image
+package utils
 
 import (
 	"bytes"
@@ -22,8 +22,6 @@ import (
 	"sort"
 	"syscall"
 	"unsafe"
-
-	"github.com/opencontainers/image-tools/utils"
 )
 
 // walker is used to implement collectFileInfoForChanges on linux. Where this
@@ -87,12 +85,12 @@ func walkchunk(path string, fi os.FileInfo, dir string, root *FileInfo) error {
 		parent:   parent,
 	}
 	cpath := filepath.Join(dir, path)
-	stat, err := utils.FromStatT(fi.Sys().(*syscall.Stat_t))
+	stat, err := FromStatT(fi.Sys().(*syscall.Stat_t))
 	if err != nil {
 		return err
 	}
 	info.stat = stat
-	info.capability, _ = utils.Lgetxattr(cpath, "security.capability") // lgetxattr(2): fs access
+	info.capability, _ = Lgetxattr(cpath, "security.capability") // lgetxattr(2): fs access
 	parent.children[info.name] = info
 	return nil
 }
@@ -298,7 +296,7 @@ func clen(n []byte) int {
 	return len(n)
 }
 
-func statDifferent(oldStat *utils.StatT, newStat *utils.StatT) bool {
+func statDifferent(oldStat *StatT, newStat *StatT) bool {
 	// Don't look at size for dirs, its not a good measure of change
 	if oldStat.Mode() != newStat.Mode() ||
 		oldStat.UID() != newStat.UID() ||