mirror
/
afero
mirror of https://github.com/spf13/afero.git
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Treat existing files and directories differently in MemMapFS.

This commit is contained in:
spf13 2015-11-16 21:26:16 -05:00
parent 19b2cf0372
commit 3f6f746a75
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
memmap.go
View File

@ -154,9 +154,16 @@ func (m *MemMapFs) registerWithParent(f File) {
} }
func (m *MemMapFs) lockfreeMkdir(name string, perm os.FileMode) error { func (m *MemMapFs) lockfreeMkdir(name string, perm os.FileMode) error {
_, ok := m.getData()[name] x, ok := m.getData()[name]
if ok { if ok {
return ErrFileExists // Only return ErrFileExists if it's a file, not a directory.
i, err := x.Stat()
if !i.IsDir() {
return ErrFileExists
}
if err != nil {
return err
}
} else { } else {
item := &InMemoryFile{name: name, memDir: &MemDirMap{}, dir: true} item := &InMemoryFile{name: name, memDir: &MemDirMap{}, dir: true}
m.getData()[name] = item m.getData()[name] = item
@ -167,10 +174,17 @@ func (m *MemMapFs) lockfreeMkdir(name string, perm os.FileMode) error {
func (m *MemMapFs) Mkdir(name string, perm os.FileMode) error { func (m *MemMapFs) Mkdir(name string, perm os.FileMode) error {
m.rlock() m.rlock()
_, ok := m.getData()[name] x, ok := m.getData()[name]
m.runlock() m.runlock()
if ok { if ok {
return ErrFileExists // Only return ErrFileExists if it's a file, not a directory.
i, err := x.Stat()
if !i.IsDir() {
return ErrFileExists
}
if err != nil {
return err
}
} else { } else {
m.lock() m.lock()
item := &InMemoryFile{name: name, memDir: &MemDirMap{}, dir: true} item := &InMemoryFile{name: name, memDir: &MemDirMap{}, dir: true}