diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | fetchmail.c | 5 | ||||
| -rw-r--r-- | fetchmail.man | 2 | ||||
| -rw-r--r-- | options.c | 7 |
4 files changed, 9 insertions, 7 deletions
@@ -4,8 +4,6 @@ To-do list: Option to enable EMACS-like user folder versioning on each run. --p option to come back? - S/key for secure challenge-response. Recode POP2 to use the same driver/method strategy as POP3/IMAP, so diff --git a/fetchmail.c b/fetchmail.c index 872e22e8..1f424374 100644 --- a/fetchmail.c +++ b/fetchmail.c @@ -392,6 +392,9 @@ struct hostrec *queryctl; switch(queryctl->output) { + case TO_SMTP: + printf(" Messages will be SMTP-forwarded to '%s'\n", queryctl->smtphost); + break; case TO_FOLDER: printf(" Messages will be appended to '%s'\n", queryctl->userfolder); break; @@ -409,6 +412,8 @@ struct hostrec *queryctl; } if (outlevel == O_VERBOSE) { + if (queryctl->smtphost[0] != '\0' && queryctl->output != TO_SMTP) + printf(" (SMTP host would have been '%s')\n", queryctl->smtphost); if (queryctl->output != TO_FOLDER) printf(" (Mail folder would have been '%s')\n", queryctl->userfolder); if (queryctl->output != TO_MDA) diff --git a/fetchmail.man b/fetchmail.man index d88c68ec..76884b7b 100644 --- a/fetchmail.man +++ b/fetchmail.man @@ -116,7 +116,7 @@ mail is delivered by SMTP over a socket connection to the specified host. This simulates the way mail would be delivered to that host by a normal Internet mail connection. .TP -.B \--protocol proto +.B \-p, \--protocol proto Specify the protocol to used when communicating with the remote mailserver. If no protocol is specified, .I popclient @@ -19,8 +19,6 @@ #include "popclient.h" #include "bzero.h" -/* XXX -- Would like to use 'enum' here, but it causes type mismatch - problems many compilers */ #define LA_VERSION 1 #define LA_ALL 2 #define LA_KILL 3 @@ -44,7 +42,7 @@ #define LA_NOREWRITE 21 #define LA_YYDEBUG 22 -static char *shortoptions = "23VaKkvscl:Fd:f:u:r:o:m:L:qN"; +static char *shortoptions = "23PVaKkvS:scl:Fd:f:u:r:o:m:L:qN"; static struct option longoptions[] = { {"version", no_argument, (int *) 0, LA_VERSION }, {"all", no_argument, (int *) 0, LA_ALL }, @@ -168,6 +166,7 @@ struct hostrec *queryctl; case LA_FLUSH: queryctl->flush = !0; break; + case 'p': case LA_PROTOCOL: /* XXX -- should probably use a table lookup here */ if (strcasecmp(optarg,"pop2") == 0) @@ -251,7 +250,7 @@ struct hostrec *queryctl; fputs(" options\n",stderr); fputs(" -2 use POP2 protocol\n", stderr); fputs(" -3 use POP3 protocol\n", stderr); - fputs(" --protocol specify pop2, pop3, imap, apop, or rpop\n", + fputs(" -p, --protocol specify pop2, pop3, imap, apop, or rpop\n", stderr); fputs(" -V, --version display version info\n", stderr); fputs(" -a, --all retrieve old and new messages\n", stderr); |