diff options
| -rw-r--r-- | driver.c | 16 | ||||
| -rw-r--r-- | fetchmail.c | 4 | ||||
| -rw-r--r-- | pop2.c | 9 |
3 files changed, 19 insertions, 10 deletions
@@ -115,7 +115,7 @@ struct method *proto; } /* print the greeting */ - if (outlevel > O_SILENT && outlevel < O_VERBOSE) + if (outlevel == O_VERBOSE) fprintf(stderr,"%s greeting: %s\n", protocol->name, buf); /* try to get authorized to fetch mail */ @@ -131,11 +131,17 @@ struct method *proto; /* show them how many messages we'll be downloading */ if (outlevel > O_SILENT && outlevel < O_VERBOSE) - if (first > 1) - fprintf(stderr,"%d messages in folder, %d new messages.\n", - count, count - first + 1); + if (count == 0) + fprintf(stderr, "No mail from %s\n", queryctl->servername); + else if (first > 1) + fprintf(stderr, + "%d message%s from %s, %d new messages.\n", + count, count > 1 ? "s" : "", + queryctl->servername, count - first + 1); else - fprintf(stderr,"%d %smessages in folder.\n", count, ok ? "" : "new "); + fprintf(stderr, + "%d %smessages from %s.\n", + count, ok ? "" : "new ", queryctl->servername); if (count > 0) { for (number = queryctl->flush ? 1 : first; number<=count; number++) { diff --git a/fetchmail.c b/fetchmail.c index d677be9f..f78d149a 100644 --- a/fetchmail.c +++ b/fetchmail.c @@ -326,12 +326,12 @@ struct hostrec *queryctl; { int i, st; - if (outlevel != O_SILENT) + if (outlevel == O_VERBOSE) { time_t now; time(&now); - fprintf(stderr, "fetchmail: querying %s (protocol %s) at %s", + fprintf(stderr, "Querying %s (protocol %s) at %s", queryctl->servername, showproto(queryctl->protocol), ctime(&now)); } switch (queryctl->protocol) { @@ -131,9 +131,12 @@ struct hostrec *queryctl; /* tell 'em how many messages are waiting */ if (outlevel > O_SILENT && outlevel < O_VERBOSE) - fprintf(stderr,"%d messages in folder %s\n",number,queryctl->remotefolder); - else - ; + if (number == 0) + fprintf(stderr,"No mail from %s\n",number,queryctl->servername); + else + fprintf(stderr,"%d message%s from %s\n", + number, number > 1 ? "s" : "", queryctl->servername); + /* fall into a retrieve/acknowledge loop */ if (number > 0) { |