Merge pull request jedisct1#4 from giucal/minutiae

Minor CLI modifications
nobrowser · May 10, 2019 · 95b4c87 · 95b4c87
2 parents bd967df + f8236c5
commit 95b4c87
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/src/encpipe.c b/src/encpipe.c
@@ -11,13 +11,20 @@ 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");
-    exit(0);
+        "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(2);
 }
 
 static int