summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDenis Vlasenko2008-02-02 17:54:35 +0000
committerDenis Vlasenko2008-02-02 17:54:35 +0000
commita2980c6249e476926f09a185840d893bb9a03a6e (patch)
tree3d75c6a4f779f764c6b0cace107aa51d46c73df4 /include
parent5de754a395a36afe7ed89f300d3421ef05c2401b (diff)
downloadbusybox-a2980c6249e476926f09a185840d893bb9a03a6e.zip
busybox-a2980c6249e476926f09a185840d893bb9a03a6e.tar.gz
sendmail: fixes by Vladimir Dronnikov <dronnikov at gmail.com>
Diffstat (limited to 'include')
-rw-r--r--include/usage.h16
1 files changed, 9 insertions, 7 deletions
diff --git a/include/usage.h b/include/usage.h
index 0ef17b5..989ed91 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -3135,26 +3135,28 @@ USE_FEATURE_RUN_PARTS_FANCY("\n -l Prints names of all matching files even when
#define selinuxenabled_full_usage
#define sendmail_trivial_usage \
- "[-d] {-t to}+ [-f from] [-n[notify]] [-s subject] [-b file]*\n" \
- "[-a attachment]* [-c charset] [-w timeout] [-h server] [-p port] [-U user] [-P password]"
+ "{-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]" \
+ )
#define sendmail_full_usage \
- "Send an email from to with subject and optional attachments.\n" \
- "Body is read from stdin or from optional files" \
+ "Send an email <from> <to> with <subject> and optional attachments." \
"\n\nArguments:\n" \
- " -d Just dump composed message\n" \
" -t to Recipient email. May be multiple\n" \
- " -f from Sender email\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"\
+ " -P password Authenticate using AUTH LOGIN with specified password" \
)
#define seq_trivial_usage \