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

fusefrontend: get rid of last hardcoded "gocryptfs.diriv" instances

Browse Source 
Makes it easier to change the name (as some people want to):
https://github.com/rfjakob/gocryptfs/issues/37
This commit is contained in:
Jakob Unterwurzacher 2019-04-09 20:51:33 +02:00
parent 24036ab89f
commit 7d81494a64
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/fusefrontend/fs_dir.go
View File

@ -197,7 +197,7 @@ retry:
children, err := syscallcompat.Getdents(dirfd) children, err := syscallcompat.Getdents(dirfd)
if err == io.EOF { if err == io.EOF {
// The directory is empty // The directory is empty
tlog.Warn.Printf("Rmdir: %q: gocryptfs.diriv is missing", cName) tlog.Warn.Printf("Rmdir: %q: %s is missing", cName, nametransform.DirIVFilename)
err = unix.Unlinkat(parentDirFd, cName, unix.AT_REMOVEDIR) err = unix.Unlinkat(parentDirFd, cName, unix.AT_REMOVEDIR)
return fuse.ToStatus(err) return fuse.ToStatus(err)
} }
@ -222,7 +222,7 @@ retry:
return fuse.ToStatus(syscall.ENOTEMPTY) return fuse.ToStatus(syscall.ENOTEMPTY)
} }
// Move "gocryptfs.diriv" to the parent dir as "gocryptfs.diriv.rmdir.XYZ" // Move "gocryptfs.diriv" to the parent dir as "gocryptfs.diriv.rmdir.XYZ"
tmpName := fmt.Sprintf("gocryptfs.diriv.rmdir.%d", cryptocore.RandUint64()) tmpName := fmt.Sprintf("%s.rmdir.%d", nametransform.DirIVFilename, cryptocore.RandUint64())
tlog.Debug.Printf("Rmdir: Renaming %s to %s", nametransform.DirIVFilename, tmpName) tlog.Debug.Printf("Rmdir: Renaming %s to %s", nametransform.DirIVFilename, tmpName)
// The directory is in an inconsistent state between rename and rmdir. // The directory is in an inconsistent state between rename and rmdir.
// Protect against concurrent readers. // Protect against concurrent readers.
@ -293,7 +293,7 @@ func (fs *FS) OpenDir(dirName string, context *fuse.Context) ([]fuse.DirEntry, f
return nil, fuse.ENOENT return nil, fuse.ENOENT
} }
// Any other problem warrants an error message // Any other problem warrants an error message
tlog.Warn.Printf("OpenDir %q: could not read gocryptfs.diriv: %v", cDirName, err) tlog.Warn.Printf("OpenDir %q: could not read %s: %v", cDirName, nametransform.DirIVFilename, err)
return nil, fuse.EIO return nil, fuse.EIO
} }
} }