summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Unterwurzacher2020-08-01 20:28:06 +0200
committerJakob Unterwurzacher2020-08-01 20:28:06 +0200
commitdd3d8c100bc9e84c44b2efb55e536b2fc0ded37e (patch)
treec5865bb105a55f139e98fd082cc700aa7d19a539
parent1867fdaef4b0b602e24c7a6bc070dd21c05526d8 (diff)
fusefrontend_reverse: collapse getFileType
-rw-r--r--internal/fusefrontend_reverse/rfs.go39
1 files changed, 13 insertions, 26 deletions
diff --git a/internal/fusefrontend_reverse/rfs.go b/internal/fusefrontend_reverse/rfs.go
index aade5c7..9f7d1f6 100644
--- a/internal/fusefrontend_reverse/rfs.go
+++ b/internal/fusefrontend_reverse/rfs.go
@@ -115,19 +115,24 @@ const (
typeRegular fileType = iota
// A DirIV (gocryptfs.diriv) file
typeDiriv
- // A .name file for a file with a long name
+ // A gocryptfs.longname.*.name file for a file with a long name
typeName
- // The config file
+ // The config file gocryptfs.conf
typeConfig
)
-// getFileType returns the type of file. Only the name is checked
+// getFileType returns the type of file (one of the fileType constants above).
func (rfs *ReverseFS) getFileType(cPath string) fileType {
- if rfs.isDirIV(cPath) {
- return typeDiriv
- }
- if rfs.isNameFile(cPath) {
- return typeName
+ if !rfs.args.PlaintextNames {
+ cName := filepath.Base(cPath)
+ // Is it a gocryptfs.diriv file?
+ if cName == nametransform.DirIVFilename {
+ return typeDiriv
+ }
+ // Is it a gocryptfs.longname.*.name file?
+ if t := nametransform.NameType(cName); t == nametransform.LongNameFilename {
+ return typeName
+ }
}
if rfs.isTranslatedConfig(cPath) {
return typeConfig
@@ -135,24 +140,6 @@ func (rfs *ReverseFS) getFileType(cPath string) fileType {
return typeRegular
}
-// isDirIV determines if the path points to a gocryptfs.diriv file
-func (rfs *ReverseFS) isDirIV(relPath string) bool {
- if rfs.args.PlaintextNames {
- return false
- }
- return filepath.Base(relPath) == nametransform.DirIVFilename
-}
-
-// isNameFile determines if the path points to a gocryptfs.longname.*.name
-// file
-func (rfs *ReverseFS) isNameFile(relPath string) bool {
- if rfs.args.PlaintextNames {
- return false
- }
- fileType := nametransform.NameType(filepath.Base(relPath))
- return fileType == nametransform.LongNameFilename
-}
-
// isTranslatedConfig returns true if the default config file name is in use
// and the ciphertext path is "gocryptfs.conf".
// "gocryptfs.conf" then maps to ".gocryptfs.reverse.conf" in the plaintext