From dcd1068517d82d327cc3db108d1e714dad38ecc2 Mon Sep 17 00:00:00 2001
From: Jakob Unterwurzacher
Date: Tue, 9 Apr 2019 21:23:17 +0200
Subject: gocryptfs-xray: show full usage text on flag parse error

---
 gocryptfs-xray/xray_main.go | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'gocryptfs-xray')

diff --git a/gocryptfs-xray/xray_main.go b/gocryptfs-xray/xray_main.go
index df92f2d..34f695b 100644
--- a/gocryptfs-xray/xray_main.go
+++ b/gocryptfs-xray/xray_main.go
@@ -38,19 +38,24 @@ func prettyPrintHeader(h *contentenc.FileHeader, aessiv bool) {
 	fmt.Printf(msg+"\n", h.Version, id)
 }
 
+func usage() {
+	fmt.Fprintf(os.Stderr, "Usage: %s [OPTIONS] FILE\n"+
+		"\n"+
+		"Options:\n", myName)
+	flag.PrintDefaults()
+	fmt.Fprintf(os.Stderr, "\n"+
+		"Examples:\n"+
+		"  gocryptfs-xray myfs/mCXnISiv7nEmyc0glGuhTQ\n"+
+		"  gocryptfs-xray -dumpmasterkey myfs/gocryptfs.conf\n")
+}
+
 func main() {
 	dumpmasterkey := flag.Bool("dumpmasterkey", false, "Decrypt and dump the master key")
 	aessiv := flag.Bool("aessiv", false, "Assume AES-SIV mode instead of AES-GCM")
+	flag.Usage = usage
 	flag.Parse()
 	if flag.NArg() != 1 {
-		fmt.Fprintf(os.Stderr, "Usage: %s [OPTIONS] FILE\n"+
-			"\n"+
-			"Options:\n", myName)
-		flag.PrintDefaults()
-		fmt.Fprintf(os.Stderr, "\n"+
-			"Examples:\n"+
-			"  gocryptfs-xray myfs/mCXnISiv7nEmyc0glGuhTQ\n"+
-			"  gocryptfs-xray -dumpmasterkey myfs/gocryptfs.conf\n")
+		usage()
 		os.Exit(1)
 	}
 	fn := flag.Arg(0)
-- 
cgit v1.2.3