From c5d8fa83ae702017fc90769dff178fda6a7942a3 Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher
Date: Sun, 20 Jun 2021 19:09:46 +0200
Subject: nametransform: pass badname patterns via New

This means we can unexport the field.
---
 mount.go | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'mount.go')

diff --git a/mount.go b/mount.go
index e35e6c2..7f818d1 100644
--- a/mount.go
+++ b/mount.go
@@ -313,18 +313,7 @@ func initFuseFrontend(args *argContainer) (rootNode fs.InodeEmbedder, wipeKeys f
 	// Init crypto backend
 	cCore := cryptocore.New(masterkey, cryptoBackend, contentenc.DefaultIVBits, args.hkdf, args.forcedecode)
 	cEnc := contentenc.New(cCore, contentenc.DefaultBS, args.forcedecode)
-	nameTransform := nametransform.New(cCore.EMECipher, frontendArgs.LongNames, args.raw64)
-	// Init badname patterns
-	nameTransform.BadnamePatterns = make([]string, 0)
-	for _, pattern := range args.badname {
-		_, err := filepath.Match(pattern, "") // Make sure pattern is valid
-		if err != nil {
-			tlog.Fatal.Printf("-badname: invalid pattern %q supplied", pattern)
-			os.Exit(exitcodes.Usage)
-		} else {
-			nameTransform.BadnamePatterns = append(nameTransform.BadnamePatterns, pattern)
-		}
-	}
+	nameTransform := nametransform.New(cCore.EMECipher, frontendArgs.LongNames, args.raw64, []string(args.badname))
 	// After the crypto backend is initialized,
 	// we can purge the master key from memory.
 	for i := range masterkey {
-- 
cgit v1.2.3