summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Unterwurzacher2016-11-09 23:41:47 +0100
committerJakob Unterwurzacher2016-11-09 23:41:47 +0100
commitdf28fc5a11f5e52897f45cc299ab62a2a2cbaf4c (patch)
tree3f22950d9c79da6cc966293b0e35d178dc64d6e1
parentdf1e3a10c45cefb393a350f75ebf3fbb8117ef2f (diff)
nametransform: get rid of leading "./"
Paths in the root directory were encrypted to this: foobar -> ./N9vPc0gXUY4PDSt0-muYXQ==
-rw-r--r--internal/nametransform/diriv.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/internal/nametransform/diriv.go b/internal/nametransform/diriv.go
index 72c8e7c..cd96cfb 100644
--- a/internal/nametransform/diriv.go
+++ b/internal/nametransform/diriv.go
@@ -99,7 +99,7 @@ func (be *NameTransform) EncryptPathDirIV(plainPath string, rootDir string) (cip
if be.longNames && len(cBaseName) > syscall.NAME_MAX {
cBaseName = HashLongName(cBaseName)
}
- cipherPath = cParentDir + "/" + cBaseName
+ cipherPath = filepath.Join(cParentDir, cBaseName)
return cipherPath, nil
}
// Not cached - walk the directory tree
@@ -118,7 +118,7 @@ func (be *NameTransform) EncryptPathDirIV(plainPath string, rootDir string) (cip
encryptedNames = append(encryptedNames, encryptedName)
wd = filepath.Join(wd, encryptedName)
}
- cipherPath = strings.Join(encryptedNames, "/")
+ cipherPath = filepath.Join(encryptedNames...)
// Cache the final DirIV
cParentDir = filepath.Dir(cipherPath)
be.DirIVCache.store(parentDir, iv, cParentDir)