Touch up the --help documentation.

w32-compat
Christopher Wellons 2017-07-23 19:56:21 -04:00
parent 514dc7d4dc
commit 64471b097b
1 changed files with 14 additions and 8 deletions

View File

@ -1,10 +1,10 @@
static const char *docs_usage[] = { static const char *docs_usage[] = {
"usage enchive [-p|--pubkey <file>] [-s|--seckey <file>]", "usage enchive [-p|--pubkey <file>] [-s|--seckey <file>]",
#if ENCHIVE_OPTION_AGENT #if ENCHIVE_OPTION_AGENT
" [-a|--agent[=seconds]] [--no-agent]", " [-a|--agent[=seconds]] [-A|--no-agent]",
#endif #endif
#if ENCHIVE_OPTION_RANDOM_DEVICE #if ENCHIVE_OPTION_RANDOM_DEVICE
" [--random-device <file>] " " [-r|--random-device <file>] "
#else #else
" " " "
#endif #endif
@ -17,18 +17,24 @@ static const char *docs_usage[] = {
" extract extract from an archive using the secret key", " extract extract from an archive using the secret key",
" fingerprint print the master keypair fingerprint", " fingerprint print the master keypair fingerprint",
"", "",
" -p, --pubkey <file> set the public key file [~/.enchive.pub]",
" -s, --seckey <file> set the secret key file [~/.enchive.sec]",
#if ENCHIVE_OPTION_AGENT #if ENCHIVE_OPTION_AGENT
" --agent[=seconds] run the key agent after reading a passphrase [" " -a, --agent[=seconds] run key agent after reading a passphrase ["
STR(ENCHIVE_AGENT_TIMEOUT) "]", STR(ENCHIVE_AGENT_TIMEOUT) "]",
" -A, --no-agent don't run the key agent"
# if ENCHIVE_AGENT_DEFAULT_ENABLED
"",
# else
" (default)",
# endif
#endif #endif
#if ENCHIVE_OPTION_RANDOM_DEVICE #if ENCHIVE_OPTION_RANDOM_DEVICE
" --random-device <file> device for secure entropy [" " -r, --random-device <dev> device for secure entropy ["
STR(ENCHIVE_RANDOM_DEVICE) "]", STR(ENCHIVE_RANDOM_DEVICE) "]",
#endif #endif
" --pubkey <file>, -p set the public key file [~/.enchive.pub]", " --version display version information",
" --seckey <file>, -s set the secret key file [~/.enchive.sec]", " --help display this usage information",
" --version display version information",
" --help display this usage information",
"", "",
"Enchive archives files by encrypting them to yourself using your", "Enchive archives files by encrypting them to yourself using your",
"public key. It uses ChaCha20, Curve25519, and HMAC-SHA256.", "public key. It uses ChaCha20, Curve25519, and HMAC-SHA256.",