Commit 9c05c7ba authored by Han-Wen Nienhuys's avatar Han-Wen Nienhuys

Run GoFmt.

parent d89692e2
package fuse package fuse
import ( import (
"os" "os"
) )
...@@ -17,7 +18,7 @@ func CopyFile(srcFs, destFs FileSystem, srcFile, destFile string) Status { ...@@ -17,7 +18,7 @@ func CopyFile(srcFs, destFs FileSystem, srcFile, destFile string) Status {
} }
w := WriteIn{ w := WriteIn{
Flags: uint32(os.O_WRONLY|os.O_CREATE|os.O_TRUNC), Flags: uint32(os.O_WRONLY | os.O_CREATE | os.O_TRUNC),
} }
dst, code := destFs.Create(destFile, w.Flags, attr.Mode) dst, code := destFs.Create(destFile, w.Flags, attr.Mode)
if !code.Ok() { if !code.Ok() {
...@@ -28,7 +29,7 @@ func CopyFile(srcFs, destFs FileSystem, srcFile, destFile string) Status { ...@@ -28,7 +29,7 @@ func CopyFile(srcFs, destFs FileSystem, srcFile, destFile string) Status {
bp := NewBufferPool() bp := NewBufferPool()
r := ReadIn{ r := ReadIn{
Size: 128 * (1<<10), Size: 128 * (1 << 10),
} }
for { for {
data, code := src.Read(&r, bp) data, code := src.Read(&r, bp)
...@@ -36,7 +37,7 @@ func CopyFile(srcFs, destFs FileSystem, srcFile, destFile string) Status { ...@@ -36,7 +37,7 @@ func CopyFile(srcFs, destFs FileSystem, srcFile, destFile string) Status {
return code return code
} }
if len(data) == 0 { if len(data) == 0 {
break; break
} }
n, code := dst.Write(&w, data) n, code := dst.Write(&w, data)
if !code.Ok() { if !code.Ok() {
...@@ -46,7 +47,7 @@ func CopyFile(srcFs, destFs FileSystem, srcFile, destFile string) Status { ...@@ -46,7 +47,7 @@ func CopyFile(srcFs, destFs FileSystem, srcFile, destFile string) Status {
return EIO return EIO
} }
if len(data) < int(r.Size) { if len(data) < int(r.Size) {
break; break
} }
r.Offset += uint64(len(data)) r.Offset += uint64(len(data))
w.Offset += uint64(len(data)) w.Offset += uint64(len(data))
......
...@@ -14,7 +14,7 @@ func TestCopyFile(t *testing.T) { ...@@ -14,7 +14,7 @@ func TestCopyFile(t *testing.T) {
content1 := "blabla" content1 := "blabla"
err := ioutil.WriteFile(d1 + "/file", []byte(content1), 0644) err := ioutil.WriteFile(d1+"/file", []byte(content1), 0644)
CheckSuccess(err) CheckSuccess(err)
code := CopyFile(fs1, fs2, "file", "file") code := CopyFile(fs1, fs2, "file", "file")
...@@ -29,7 +29,7 @@ func TestCopyFile(t *testing.T) { ...@@ -29,7 +29,7 @@ func TestCopyFile(t *testing.T) {
content2 := "foobar" content2 := "foobar"
err = ioutil.WriteFile(d2 + "/file", []byte(content2), 0644) err = ioutil.WriteFile(d2+"/file", []byte(content2), 0644)
CheckSuccess(err) CheckSuccess(err)
// Copy back: should overwrite. // Copy back: should overwrite.
...@@ -43,6 +43,4 @@ func TestCopyFile(t *testing.T) { ...@@ -43,6 +43,4 @@ func TestCopyFile(t *testing.T) {
t.Fatal("Unexpected content", string(data)) t.Fatal("Unexpected content", string(data))
} }
} }
...@@ -5,6 +5,7 @@ import ( ...@@ -5,6 +5,7 @@ import (
"os" "os"
"syscall" "syscall"
) )
var _ = fmt.Println var _ = fmt.Println
// ReadOnlyFile is for implementing read-only filesystems. This // ReadOnlyFile is for implementing read-only filesystems. This
......
...@@ -21,7 +21,7 @@ func newDirnameMap(fs fuse.FileSystem, dir string) map[string]bool { ...@@ -21,7 +21,7 @@ func newDirnameMap(fs fuse.FileSystem, dir string) map[string]bool {
return result return result
} }
for e := range stream { for e := range stream {
if e.Mode & fuse.S_IFREG != 0 { if e.Mode&fuse.S_IFREG != 0 {
result[e.Name] = true result[e.Name] = true
} }
} }
......
...@@ -532,7 +532,7 @@ func (me *UnionFs) GetAttr(name string) (a *os.FileInfo, s fuse.Status) { ...@@ -532,7 +532,7 @@ func (me *UnionFs) GetAttr(name string) (a *os.FileInfo, s fuse.Status) {
if name == _DROP_CACHE { if name == _DROP_CACHE {
return &os.FileInfo{ return &os.FileInfo{
Mode: fuse.S_IFREG | 0777, Mode: fuse.S_IFREG | 0777,
}, fuse.OK },fuse.OK
} }
if name == me.options.DeletionDirName { if name == me.options.DeletionDirName {
return nil, fuse.ENOENT return nil, fuse.ENOENT
...@@ -684,7 +684,7 @@ func (me *UnionFs) DropCaches() { ...@@ -684,7 +684,7 @@ func (me *UnionFs) DropCaches() {
func (me *UnionFs) Open(name string, flags uint32) (fuseFile fuse.File, status fuse.Status) { func (me *UnionFs) Open(name string, flags uint32) (fuseFile fuse.File, status fuse.Status) {
if name == _DROP_CACHE { if name == _DROP_CACHE {
if flags & fuse.O_ANYWRITE != 0 { if flags&fuse.O_ANYWRITE != 0 {
me.DropCaches() me.DropCaches()
} }
return fuse.NewDevNullFile(), fuse.OK return fuse.NewDevNullFile(), fuse.OK
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment