hardcoresushi
/
libgocryptfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fusefrontend: add named parameters to openBackingDir 

Named parameters make using the function easier.
This commit is contained in:
Jakob Unterwurzacher 2018-09-22 20:25:47 +02:00
parent c270b21efc
commit bead82c9fb
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
internal/fusefrontend/names.go
View File

@ -44,17 +44,18 @@ func (fs *FS) getBackingPath(relPath string) (string, error) {
// "relPath" and returns the dirfd and the encrypted basename. // "relPath" and returns the dirfd and the encrypted basename.
// The caller should then use Openat(dirfd, cName, ...) and friends. // The caller should then use Openat(dirfd, cName, ...) and friends.
// openBackingDir is secure against symlink races. // openBackingDir is secure against symlink races.
func (fs *FS) openBackingDir(relPath string) (int, string, error) { func (fs *FS) openBackingDir(relPath string) (dirfd int, cName string, err error) {
cRelPath, err := fs.encryptPath(relPath) cRelPath, err := fs.encryptPath(relPath)
if err != nil { if err != nil {
return -1, "", err return -1, "", err
} }
// Open parent dir // Open parent dir
dirfd, err := syscallcompat.OpenDirNofollow(fs.args.Cipherdir, filepath.Dir(cRelPath)) dirfd, err = syscallcompat.OpenDirNofollow(fs.args.Cipherdir, filepath.Dir(cRelPath))
if err != nil { if err != nil {
return -1, "", err return -1, "", err
} }
return dirfd, filepath.Base(cRelPath), nil cName = filepath.Base(cRelPath)
return dirfd, cName, nil
} }
// encryptPath - encrypt relative plaintext path // encryptPath - encrypt relative plaintext path