fix calls to Stat() on vdirfs

KarpelesLab · Jan 16, 2020 · 6dd253c · 6dd253c
1 parent 4784a19
commit 6dd253c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/vdirfs/dir.go b/vdirfs/dir.go
@@ -26,6 +26,7 @@ func (d *dir) getDir(name string, create bool) (*dir, error) {
 			return nil, os.ErrNotExist
 		}
 		sd = &dir{
+			fs:       d.fs,
 			path:     path.Join(d.path, name),
 			children: make(map[string]*dir),
 		}

diff --git a/vdirfs/fs.go b/vdirfs/fs.go
@@ -19,7 +19,7 @@ func New(fs vfs.FileSystem) (*FS, error) {
 	}
 
 	f.root = &dir{
-		path:     "/",
+		path:     "",
 		children: make(map[string]*dir),
 		fs:       f,
 	}
@@ -67,10 +67,16 @@ func (f *FS) OpenFile(path string, flag int, perm os.FileMode) (vfs.File, error)
 }
 
 func (f *FS) Lstat(path string) (os.FileInfo, error) {
+	if d, err := f.root.getDir(path, false); err == nil && d != nil {
+		return d.Stat()
+	}
 	return f.parent.Lstat(path)
 }
 
 func (f *FS) Stat(path string) (os.FileInfo, error) {
+	if d, err := f.root.getDir(path, false); err == nil && d != nil {
+		return d.Stat()
+	}
 	return f.parent.Stat(path)
 }
 

diff --git a/zipfs/map.go b/zipfs/map.go
@@ -35,7 +35,10 @@ func newZipMap(z *zip.Reader, addVdir bool) (vfs.FileSystem, error) {
 		}
 
 		for f, _ := range m.i {
-			res.AddPath(f)
+			err := res.AddPath(f)
+			if err != nil {
+				return nil, err
+			}
 		}
 
 		return res, nil