golang/mikael/madonctl: comparison vendor/github.com/spf13/afero/mem/file.go

equal deleted inserted replaced

-:4f153a23adab
+:6d9efbef00a9
 	"io"
 	"os"
 	"path/filepath"
 	"sync"
 	"sync/atomic"
+	"time"
 )
-import "time"
 const FilePathSeparator = string(filepath.Separator)
 type File struct {
 	// atomic requires 64-bit alignment for struct field access
 	data    []byte
 	memDir  Dir
 	dir     bool
 	mode    os.FileMode
 	modtime time.Time
+	uid     int
+	gid     int
 }
 func (d *FileData) Name() string {
 	d.Lock()
 	defer d.Unlock()
 	f.Unlock()
 }
 func setModTime(f *FileData, mtime time.Time) {
 	f.modtime = mtime
+}
+func SetUID(f *FileData, uid int) {
+	f.Lock()
+	f.uid = uid
+	f.Unlock()
+}
+func SetGID(f *FileData, gid int) {
+	f.Lock()
+	f.gid = gid
+	f.Unlock()
 }
 func GetFileInfo(f *FileData) *FileInfo {
 	return &FileInfo{f}
 }
 	atomic.AddInt64(&f.at, int64(n))
 	return
 }
 func (f *File) ReadAt(b []byte, off int64) (n int, err error) {
+	prev := atomic.LoadInt64(&f.at)
 	atomic.StoreInt64(&f.at, off)
-	return f.Read(b)
+	n, err = f.Read(b)
+	atomic.StoreInt64(&f.at, prev)
+	return
 }
 func (f *File) Truncate(size int64) error {
 	if f.closed == true {
 		return ErrFileClosed
 		return &os.PathError{Op: "truncate", Path: f.fileData.name, Err: errors.New("file handle is read only")}
 	}
 	if size < 0 {
 		return ErrOutOfRange
 	}
+	f.fileData.Lock()
+	defer f.fileData.Unlock()
 	if size > int64(len(f.fileData.data)) {
 		diff := size - int64(len(f.fileData.data))
 		f.fileData.data = append(f.fileData.data, bytes.Repeat([]byte{00}, int(diff))...)
 	} else {
 		f.fileData.data = f.fileData.data[0:size]
 func (f *File) Seek(offset int64, whence int) (int64, error) {
 	if f.closed == true {
 		return 0, ErrFileClosed
 	}
 	switch whence {
-	case 0:
+	case io.SeekStart:
 		atomic.StoreInt64(&f.at, offset)
-	case 1:
+	case io.SeekCurrent:
-		atomic.AddInt64(&f.at, int64(offset))
+		atomic.AddInt64(&f.at, offset)
-	case 2:
+	case io.SeekEnd:
 		atomic.StoreInt64(&f.at, int64(len(f.fileData.data))+offset)
 	}
 	return f.at, nil
 }
 func (f *File) Write(b []byte) (n int, err error) {
+	if f.closed == true {
+		return 0, ErrFileClosed
+	}
 	if f.readOnly {
 		return 0, &os.PathError{Op: "write", Path: f.fileData.name, Err: errors.New("file handle is read only")}
 	}
 	n = len(b)
 	cur := atomic.LoadInt64(&f.at)
 	var tail []byte
 	if n+int(cur) < len(f.fileData.data) {
 		tail = f.fileData.data[n+int(cur):]
 	}
 	if diff > 0 {
-		f.fileData.data = append(bytes.Repeat([]byte{00}, int(diff)), b...)
+		f.fileData.data = append(f.fileData.data, append(bytes.Repeat([]byte{00}, int(diff)), b...)...)
 		f.fileData.data = append(f.fileData.data, tail...)
 	} else {
 		f.fileData.data = append(f.fileData.data[:cur], b...)
 		f.fileData.data = append(f.fileData.data, tail...)
 	}
 	setModTime(f.fileData, time.Now())
-	atomic.StoreInt64(&f.at, int64(len(f.fileData.data)))
+	atomic.AddInt64(&f.at, int64(n))
 	return
 }
 func (f *File) WriteAt(b []byte, off int64) (n int, err error) {
 	atomic.StoreInt64(&f.at, off)

changeset 256	6d9efbef00a9
parent 242	2a9ec03fe5a1
child 260	445e01aede7e