ZipFs: deal correctly with trying to OpenDir a non-existing directory.

ef9991c3 · Han-Wen Nienhuys · d7ff0b6c · ef9991c3
Commit ef9991c3 authored May 18, 2011 by Han-Wen Nienhuys
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

zipfs/memtree.go zipfs/memtree.go +4 -4

No files found.
--- a/zipfs/memtree.go
+++ b/zipfs/memtree.go
@@ -120,11 +120,11 @@ func (me *MemTreeFileSystem) Open(name string, flags uint32) (fuseFile fuse.File
 func (me *MemTreeFileSystem) OpenDir(name string) (stream chan fuse.DirEntry, code fuse.Status) {
 	dir, file := me.tree.Lookup(name)
-	if file != nil {
-		return nil, fuse.ENOSYS
-	}
 	if dir == nil {
-		panic("dir")
+		return nil, fuse.ENOENT
+	}
+	if file != nil {
+		return nil, fuse.ENOTDIR
 	}
 	stream = make(chan fuse.DirEntry, len(dir.files)+len(dir.subdirs))