 4a6a2b9db0
			
		
	
	4a6a2b9db0
	
	
	
		
			
			The syscall package is locked down and the comment in [1] advises to
switch code to use the corresponding package from golang.org/x/sys. Do
so and replace usage of package syscall with package
golang.org/x/sys/{unix,windows} where applicable.
  [1] https://github.com/golang/go/blob/master/src/syscall/syscall.go#L21-L24
This will also allow to get updates and fixes for syscall wrappers
without having to use a new go version.
Errno, Signal and SysProcAttr aren't changed as they haven't been
implemented in x/sys/. Stat_t from syscall is used if standard library
packages (e.g. os) require it. syscall.ENOTSUP, syscall.SIGKILL and
syscall.SIGTERM are used for cross-platform files.
Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
		
	
		
			
				
	
	
		
			69 lines
		
	
	
		
			1.6 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			69 lines
		
	
	
		
			1.6 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| // +build solaris darwin freebsd
 | |
| 
 | |
| package fs
 | |
| 
 | |
| import (
 | |
| 	"io"
 | |
| 	"os"
 | |
| 	"syscall"
 | |
| 
 | |
| 	"github.com/containerd/containerd/sys"
 | |
| 	"github.com/containerd/continuity/sysx"
 | |
| 	"github.com/pkg/errors"
 | |
| 	"golang.org/x/sys/unix"
 | |
| )
 | |
| 
 | |
| func copyFileInfo(fi os.FileInfo, name string) error {
 | |
| 	st := fi.Sys().(*syscall.Stat_t)
 | |
| 	if err := os.Lchown(name, int(st.Uid), int(st.Gid)); err != nil {
 | |
| 		return errors.Wrapf(err, "failed to chown %s", name)
 | |
| 	}
 | |
| 
 | |
| 	if (fi.Mode() & os.ModeSymlink) != os.ModeSymlink {
 | |
| 		if err := os.Chmod(name, fi.Mode()); err != nil {
 | |
| 			return errors.Wrapf(err, "failed to chmod %s", name)
 | |
| 		}
 | |
| 	}
 | |
| 
 | |
| 	timespec := []syscall.Timespec{sys.StatAtime(st), sys.StatMtime(st)}
 | |
| 	if err := syscall.UtimesNano(name, timespec); err != nil {
 | |
| 		return errors.Wrapf(err, "failed to utime %s", name)
 | |
| 	}
 | |
| 
 | |
| 	return nil
 | |
| }
 | |
| 
 | |
| func copyFileContent(dst, src *os.File) error {
 | |
| 	buf := bufferPool.Get().([]byte)
 | |
| 	_, err := io.CopyBuffer(dst, src, buf)
 | |
| 	bufferPool.Put(buf)
 | |
| 
 | |
| 	return err
 | |
| }
 | |
| 
 | |
| func copyXAttrs(dst, src string) error {
 | |
| 	xattrKeys, err := sysx.LListxattr(src)
 | |
| 	if err != nil {
 | |
| 		return errors.Wrapf(err, "failed to list xattrs on %s", src)
 | |
| 	}
 | |
| 	for _, xattr := range xattrKeys {
 | |
| 		data, err := sysx.LGetxattr(src, xattr)
 | |
| 		if err != nil {
 | |
| 			return errors.Wrapf(err, "failed to get xattr %q on %s", xattr, src)
 | |
| 		}
 | |
| 		if err := sysx.LSetxattr(dst, xattr, data, 0); err != nil {
 | |
| 			return errors.Wrapf(err, "failed to set xattr %q on %s", xattr, dst)
 | |
| 		}
 | |
| 	}
 | |
| 
 | |
| 	return nil
 | |
| }
 | |
| 
 | |
| func copyDevice(dst string, fi os.FileInfo) error {
 | |
| 	st, ok := fi.Sys().(*syscall.Stat_t)
 | |
| 	if !ok {
 | |
| 		return errors.New("unsupported stat type")
 | |
| 	}
 | |
| 	return unix.Mknod(dst, uint32(fi.Mode()), int(st.Rdev))
 | |
| }
 |