diff options
| author | Jakob Unterwurzacher | 2016-10-09 18:17:04 +0200 | 
|---|---|---|
| committer | Jakob Unterwurzacher | 2016-10-09 18:18:14 +0200 | 
| commit | 495479dc66efae688895aed8902d00f0350cdea7 (patch) | |
| tree | 6cf5c3dd9bbbb0fe029732766c86d5283f2e7790 | |
| parent | d3b78fea959dfb0e1c1f5079ae516303bdb9a0f8 (diff) | |
main: friendlier error message on wrong number of arguments
Before:
	Usage: gocryptfs [OPTIONS] CIPHERDIR MOUNTPOINT
After:
	Wrong number of arguments (have 9, want 2). You passed: "-nosyslog" "." "asd" "-q" "ß" "asdf" "fg" "gh" "sdf" "asd fs\\dfg"
	Usage: gocryptfs [OPTIONS] CIPHERDIR MOUNTPOINT
| -rw-r--r-- | main.go | 11 | ||||
| -rw-r--r-- | mount.go | 4 | 
2 files changed, 10 insertions, 5 deletions
| @@ -214,6 +214,15 @@ func main() {  		}  		changePassword(&args) // does not return  	} -	// Mount +	// Default operation: mount. +	if flagSet.NArg() != 2 { +		prettyArgs := fmt.Sprintf("%q", os.Args[1:]) +		// Get rid of "[" and "]" +		prettyArgs = prettyArgs[1 : len(prettyArgs)-1] +		tlog.Info.Printf("Wrong number of arguments (have %d, want 2). You passed: %s", +			flagSet.NArg(), prettyArgs) +		tlog.Fatal.Printf("Usage: %s [OPTIONS] CIPHERDIR MOUNTPOINT", tlog.ProgramName) +		os.Exit(ErrExitUsage) +	}  	os.Exit(doMount(&args))  } @@ -26,10 +26,6 @@ import (  // Called from main.  func doMount(args *argContainer) int {  	// Check mountpoint -	if flagSet.NArg() != 2 { -		tlog.Fatal.Printf("Usage: %s [OPTIONS] CIPHERDIR MOUNTPOINT", tlog.ProgramName) -		os.Exit(ErrExitUsage) -	}  	var err error  	args.mountpoint, err = filepath.Abs(flagSet.Arg(1))  	if err != nil { | 
