From 2fa603e47433b6377397c635553623845d2d731c Mon Sep 17 00:00:00 2001
From: Giuseppe Calabrese <ugiucal@gmail.com>
Date: Wed, 10 Jan 2018 18:28:57 +0100
Subject: Refine usage message

- Synthesized usage lines.
- Documented both short and long options.
---
 src/encpipe.c | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'src/encpipe.c')

diff --git a/src/encpipe.c b/src/encpipe.c
index e0f206d..cd06e35 100644
--- a/src/encpipe.c
+++ b/src/encpipe.c
@@ -11,12 +11,19 @@ static void
 usage(void)
 {
     puts(
-        "Usage:\n\n"
-        "Encrypt: encpipe -e -p <password>      [-i <inputfile>] [-o <outputfile>]\n"
-        "         encpipe -e -P <password file> [-i <inputfile>] [-o <outputfile>]\n\n"
-        "Decrypt: encpipe -d -p <password>      [-i <inputfile>] [-o <outputfile>]\n"
-        "         encpipe -d -P <password file> [-i <inputfile>] [-o <outputfile>]\n\n"
-        "Passgen: encpipe -G\n");
+        "Usage:\n"
+        "    encpipe -G\n"
+        "    encpipe {-e | -d} {-p <string> | -P <file>} [-i <file>] [-o <file>]\n"
+        "\n"
+        "Options:\n"
+        "    -G, --passgen          generate a random password\n"
+        "    -e, --encrypt          encryption mode\n"
+        "    -d, --decrypt          decryption mode\n"
+        "    -p, --pass <password>  use <password>\n"
+        "    -P, --passfile <file>  read password from <file>\n"
+        "    -i, --in <file>        read input from <file>\n"
+        "    -o, --out <file>       write output to <file>\n"
+        "    -h, --help             print this message");
     exit(0);
 }
 
-- 
cgit v1.2.3-70-g09d2


From f8236c5d1559b85e481472ade252cf847b77d73f Mon Sep 17 00:00:00 2001
From: Giuseppe Calabrese <ugiucal@gmail.com>
Date: Fri, 10 May 2019 18:03:16 +0200
Subject: Exit with status code 2 after printing the usage

---
 src/encpipe.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/encpipe.c')

diff --git a/src/encpipe.c b/src/encpipe.c
index cd06e35..735ed87 100644
--- a/src/encpipe.c
+++ b/src/encpipe.c
@@ -24,7 +24,7 @@ usage(void)
         "    -i, --in <file>        read input from <file>\n"
         "    -o, --out <file>       write output to <file>\n"
         "    -h, --help             print this message");
-    exit(0);
+    exit(2);
 }
 
 static int
-- 
cgit v1.2.3-70-g09d2