diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-02-08 21:24:54 +0300 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-02-08 21:24:54 +0300 |
commit | 6d52c1ee24f77690c932dfe8456dfa31e8808f4c (patch) | |
tree | fddeffde64aeb613edc23e3580d196a28eb1ff03 /include | |
parent | dc1c45795b36c232fe781962c5fab1df6b8299d9 (diff) |
sendmail: update from maintainer
Diffstat (limited to 'include')
-rw-r--r-- | include/applets.h | 3 | ||||
-rw-r--r-- | include/usage.h | 45 |
2 files changed, 27 insertions, 21 deletions
diff --git a/include/applets.h b/include/applets.h index a78ce1c77..40fa39069 100644 --- a/include/applets.h +++ b/include/applets.h @@ -151,6 +151,7 @@ USE_FBSET(APPLET(fbset, _BB_DIR_USR_SBIN, _BB_SUID_NEVER)) USE_FDFLUSH(APPLET_ODDNAME(fdflush, freeramdisk, _BB_DIR_BIN, _BB_SUID_NEVER, fdflush)) USE_FDFORMAT(APPLET(fdformat, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_FDISK(APPLET(fdisk, _BB_DIR_SBIN, _BB_SUID_NEVER)) +USE_FETCHMAIL(APPLET_ODDNAME(fetchmail, sendgetmail, _BB_DIR_USR_BIN, _BB_SUID_NEVER, fetchmail)) USE_FEATURE_GREP_FGREP_ALIAS(APPLET_NOUSAGE(fgrep, grep, _BB_DIR_BIN, _BB_SUID_NEVER)) USE_FIND(APPLET_NOEXEC(find, find, _BB_DIR_USR_BIN, _BB_SUID_NEVER, find)) //USE_FINDFS(APPLET_NOUSAGE(findfs, tune2fs, _BB_DIR_SBIN, _BB_SUID_NEVER)) @@ -299,7 +300,7 @@ USE_RUNSV(APPLET(runsv, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_RUNSVDIR(APPLET(runsvdir, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_RX(APPLET(rx, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) USE_SED(APPLET(sed, _BB_DIR_BIN, _BB_SUID_NEVER)) -USE_SENDMAIL(APPLET(sendmail, _BB_DIR_USR_BIN, _BB_SUID_NEVER)) +USE_SENDMAIL(APPLET_ODDNAME(sendmail, sendgetmail, _BB_DIR_USR_BIN, _BB_SUID_NEVER, sendmail)) USE_SELINUXENABLED(APPLET(selinuxenabled, _BB_DIR_USR_SBIN, _BB_SUID_NEVER)) USE_SEQ(APPLET_NOFORK(seq, seq, _BB_DIR_USR_BIN, _BB_SUID_NEVER, seq)) USE_SESTATUS(APPLET(sestatus, _BB_DIR_USR_SBIN, _BB_SUID_NEVER)) diff --git a/include/usage.h b/include/usage.h index dfa751597..77a86074b 100644 --- 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 \ @@ -3138,29 +3151,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" |