microcom: split -d (delay) option away from -t

[oweals/busybox.git] / include / usage.h

diff --git a/include/usage.h b/include/usage.h
index dfa751597e41a3b016d4edb4ef45569b8bb9a48c..37cefeab192be17af8535ee85b52cf49d4bea806 100644 (file)
--- a/include/usage.h
+++ b/include/usage.h
@@ -1017,6 +1017,19 @@ USE_FEATURE_BRCTL_FANCY("\n" \
        "       -S SECTORS      Set the number of sectors\n" \
        "       -v              Give fdisk version"
 
+#define fetchmail_trivial_usage \
+       "[-C dir] [-w timeout] [-U user] -P password [-X] [-t] [-z] server[:port]"
+#define fetchmail_full_usage \
+       "Fetch content of remote mailbox to local Maildir." \
+       "\n\nOptions:\n" \
+       "       -C dir          Set Maildir location\n" \
+       "       -w timeout      Set timeout on network operations\n" \
+       "       -U username     Authenticate with specified username\n" \
+       "       -P password     Authenticate with specified password\n" \
+       "       -X              Use openssl connection helper for secured servers\n" \
+       "       -t              Get only headers\n" \
+       "       -z              Delete messages on server"
+
 #define find_trivial_usage \
        "[PATH...] [EXPRESSION]"
 #define find_full_usage \
@@ -2222,9 +2235,15 @@ USE_FEATURE_BRCTL_FANCY("\n" \
        "       n       Disallow write access to your terminal"
 
 #define microcom_trivial_usage \
-       "[-s speed] tty-name"
+       "[-d DELAY] [-t TIMEOUT] [-s SPEED] [-X] TTY"
 #define microcom_full_usage \
-       ""
+       "Copy bytes for stdin to TTY and from TTY to stdout" \
+       "\n\nOptions:" \
+     "\n       -d      Wait up to DELAY ms for TTY output before sending every" \
+     "\n               next byte to it" \
+     "\n       -t      Exit if both stdin and TTY are silent for TIMEOUT ms" \
+     "\n       -s      Set serial line to SPEED"
+     "\n       -X      Disable special meaning of NUL and Ctrl-X from stdin"
 
 #define mkdir_trivial_usage \
        "[OPTION] DIRECTORY..."
@@ -2326,13 +2345,19 @@ USE_FEATURE_BRCTL_FANCY("\n" \
        "       block-count     Number of block to use (default is entire partition)"
 
 #define mktemp_trivial_usage \
-       "[-dq] TEMPLATE"
+       "[-dt] [-p DIR] TEMPLATE"
 #define mktemp_full_usage \
        "Create a temporary file with its name based on TEMPLATE.\n" \
        "TEMPLATE is any name with six 'Xs' (i.e., /tmp/temp.XXXXXX)." \
        "\n\nOptions:\n" \
        "       -d      Make a directory instead of a file\n" \
-       "       -q      Fail silently if an error occurs"
+       /* "    -q      Fail silently if an error occurs\n" - we ignore it */ \
+       "       -t      Generate a path rooted in temporary directory\n" \
+       "       -p DIR  Use DIR as a temporary directory (implies -t)\n" \
+       "\n" \
+       "For -t or -p, directory is chosen as follows:\n" \
+       "$TMPDIR if set, else -p DIR, else /tmp"
+
 #define mktemp_example_usage \
        "$ mktemp /tmp/temp.XXXXXX\n" \
        "/tmp/temp.mWiLjM\n" \
@@ -3138,29 +3163,21 @@ USE_FEATURE_RUN_PARTS_FANCY("\n -l      Prints names of all matching files even when
 #define selinuxenabled_full_usage
 
 #define sendmail_trivial_usage \
-       "{-t to}+ {-f from} [-n[notify]] [-s subject] [-b file]*\n" \
-       "[-a attachment]* [-c charset]" \
-       USE_FEATURE_SENDMAIL_NETWORK("\n" \
-       " [-d] [-w timeout] [-h server] [-p port] [-U user] [-P password]" \
-       )
+       "[-C dir] [-w timeout] [-U user] [-P password] [-X]\n" \
+       "-t to [-t to] -f from [-n] [-s subject] [-c charset] server[:port] [body] [attachment ...]"
 #define sendmail_full_usage \
-       "Send an email <from> <to> with <subject> and optional attachments." \
-       "\n\nArguments:\n" \
+       "Send an email with optional attachments." \
+       "\n\nOptions:\n" \
+       "       -C dir          Change current directory to dir\n" \
+       "       -w timeout      Set timeout on network operations\n" \
+       "       -U username     Authenticate with specified username\n" \
+       "       -P password     Authenticate with specified password\n" \
+       "       -X              Use openssl connection helper for secured servers\n" \
        "       -t to           Recipient email. May be multiple\n" \
        "       -f from         Sender address\n" \
-       "       -n[notify]      Optional notification address. If just -n given then notifies the sender\n" \
-       "       -s subject      Optional subject\n" \
-       "       -b filename     Optional body content file. May be multiple\n" \
-       "       -a filename     Optional file attachment. May be multiple\n" \
-       "       -c charset      Assumed charset for body and subject [koi8-r]" \
-       USE_FEATURE_SENDMAIL_NETWORK("\n" \
-       "       -d              Just dump composed message\n" \
-       "       -w timeout      Set timeout on network operations\n" \
-       "       -h server       Optional mail server name or IP [127.0.0.1]\n" \
-       "       -p port         Optional mail server port [25]\n" \
-       "       -U username     Authenticate using AUTH LOGIN with specified username\n" \
-       "       -P password     Authenticate using AUTH LOGIN with specified password" \
-       )
+       "       -n              Request delivery notification to sender\n" \
+       "       -s subject      Subject\n" \
+       "       -c charset      Assumed charset for body and subject [utf-8]"
 
 #define seq_trivial_usage \
        "[first [increment]] last"