From 75ec94a87a52a7230c9b7d9b3e150a0da2725e58 Mon Sep 17 00:00:00 2001 From: Jakob Unterwurzacher Date: Sun, 6 Aug 2017 23:12:27 +0200 Subject: nametransform: add Dir() function Dir is like filepath.Dir but returns "" instead of ".". This was already implemented in fusefrontend_reverse as saneDir(). We will need it in nametransform for the improved diriv caching. --- internal/fusefrontend_reverse/virtualfile.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'internal/fusefrontend_reverse/virtualfile.go') diff --git a/internal/fusefrontend_reverse/virtualfile.go b/internal/fusefrontend_reverse/virtualfile.go index 05b8349..2fae175 100644 --- a/internal/fusefrontend_reverse/virtualfile.go +++ b/internal/fusefrontend_reverse/virtualfile.go @@ -7,6 +7,7 @@ import ( "github.com/hanwen/go-fuse/fuse" "github.com/hanwen/go-fuse/fuse/nodefs" + "github.com/rfjakob/gocryptfs/internal/nametransform" "github.com/rfjakob/gocryptfs/internal/pathiv" "github.com/rfjakob/gocryptfs/internal/tlog" ) @@ -31,7 +32,7 @@ const ( ) func (rfs *ReverseFS) newDirIVFile(cRelPath string) (nodefs.File, fuse.Status) { - cDir := saneDir(cRelPath) + cDir := nametransform.Dir(cRelPath) absDir, err := rfs.abs(rfs.decryptPath(cDir)) if err != nil { return nil, fuse.ToStatus(err) -- cgit v1.2.3