summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cli_args.go16
-rw-r--r--cli_args_test.go6
2 files changed, 11 insertions, 11 deletions
diff --git a/cli_args.go b/cli_args.go
index 91bd56e..48f1cdd 100644
--- a/cli_args.go
+++ b/cli_args.go
@@ -210,16 +210,16 @@ func parseCliOpts(osArgs []string) (args argContainer) {
flagSet.StringVar(&args.fido2, "fido2", "", "Protect the masterkey using a FIDO2 token instead of a password")
// Exclusion options
- flagSet.StringSliceVar(&args.exclude, "e", nil, "Alias for -exclude")
- flagSet.StringSliceVar(&args.exclude, "exclude", nil, "Exclude relative path from reverse view")
- flagSet.StringSliceVar(&args.excludeWildcard, "ew", nil, "Alias for -exclude-wildcard")
- flagSet.StringSliceVar(&args.excludeWildcard, "exclude-wildcard", nil, "Exclude path from reverse view, supporting wildcards")
- flagSet.StringSliceVar(&args.excludeFrom, "exclude-from", nil, "File from which to read exclusion patterns (with -exclude-wildcard syntax)")
+ flagSet.StringArrayVar(&args.exclude, "e", nil, "Alias for -exclude")
+ flagSet.StringArrayVar(&args.exclude, "exclude", nil, "Exclude relative path from reverse view")
+ flagSet.StringArrayVar(&args.excludeWildcard, "ew", nil, "Alias for -exclude-wildcard")
+ flagSet.StringArrayVar(&args.excludeWildcard, "exclude-wildcard", nil, "Exclude path from reverse view, supporting wildcards")
+ flagSet.StringArrayVar(&args.excludeFrom, "exclude-from", nil, "File from which to read exclusion patterns (with -exclude-wildcard syntax)")
// multipleStrings options ([]string)
- flagSet.StringSliceVar(&args.extpass, "extpass", nil, "Use external program for the password prompt")
- flagSet.StringSliceVar(&args.badname, "badname", nil, "Glob pattern invalid file names that should be shown")
- flagSet.StringSliceVar(&args.passfile, "passfile", nil, "Read password from file")
+ flagSet.StringArrayVar(&args.extpass, "extpass", nil, "Use external program for the password prompt")
+ flagSet.StringArrayVar(&args.badname, "badname", nil, "Glob pattern invalid file names that should be shown")
+ flagSet.StringArrayVar(&args.passfile, "passfile", nil, "Read password from file")
flagSet.Uint8Var(&args.longnamemax, "longnamemax", 255, "Hash encrypted names that are longer than this")
diff --git a/cli_args_test.go b/cli_args_test.go
index 3220196..4fb01ac 100644
--- a/cli_args_test.go
+++ b/cli_args_test.go
@@ -157,13 +157,13 @@ func TestParseCliOpts(t *testing.T) {
}...)
o = defaultArgs
- o.exclude = []string{"foo", "bar"}
+ o.exclude = []string{"foo", "bar", "baz,boe"}
testcases = append(testcases, []testcaseContainer{
{
- i: []string{"gocryptfs", "-e", "foo", "-e", "bar"},
+ i: []string{"gocryptfs", "-e", "foo", "-e", "bar", "-e", "baz,boe"},
o: o,
}, {
- i: []string{"gocryptfs", "--exclude", "foo", "--exclude", "bar"},
+ i: []string{"gocryptfs", "--exclude", "foo", "--exclude", "bar", "--exclude", "baz,boe"},
o: o,
}, /* TODO BROKEN {
i: []string{"gocryptfs", "--exclude", "foo", "-e", "bar"},