Message and documentation cleanup.

svn path=/trunk/; revision=342

4 files changed, 22 insertions, 17 deletions

diff --git a/driver.c b/driver.c
index 1eaaeec1..8d4cb018 100644
--- a/driver.c
+++ b/driver.c
@@ -41,6 +41,7 @@ static struct method *protocol;
 
 static int alarmed;	/* a flag to indicate that SIGALRM happened */
 static int mytimeout;	/* server-nonresponse timeout for current query */
+static char *srvname;	/* current server name for timeout message */
 
 char tag[TAGLEN];
 static int tagnum;
@@ -588,6 +589,7 @@ struct method *proto;
     void (*sigsave)();
     int num, count, deletions = 0;
 
+    srvname = queryctl->servername;
     alarmed = 0;
     sigsave = signal(SIGALRM, alarm_handler);
     alarm (mytimeout = queryctl->timeout);
@@ -971,5 +973,6 @@ alarm_handler (int signal)
 {
     alarmed = 1;
     fprintf(stderr,
-	    "fetchmail: timeout after %d seconds.\n", mytimeout);
+	    "fetchmail: timeout after %d seconds waiting for %s.\n",
+	    mytimeout, srvname);
 }
diff --git a/fetchmail.c b/fetchmail.c
index 4257562c..2c204a9e 100644
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -104,7 +104,7 @@ char **argv;
 	}
 	else
 	{
-	    fprintf(stderr,"I can't find your name and home directory!\n");
+	    fprintf(stderr,"fetchmail: can't find your name and home directory!\n");
 	    exit(PS_UNDEFINED);
 	}
     }
@@ -408,7 +408,8 @@ char **argv;
      * reflect the status of that transaction.
      */
     do {
-	for (hostp = hostlist; hostp; hostp = hostp->next) {
+	for (hostp = hostlist; hostp; hostp = hostp->next)
+	{
 	    if (hostp->active && !(implicitmode && hostp->skip))
 	    {
 		popstatus = query_host(hostp);
@@ -416,12 +417,13 @@ char **argv;
 	    }
 	}
 
-	sleep(poll_interval);
+	if (sleep(poll_interval))
+	    (void) fputs("fetchmail: awakened by SIGHUP\n", stderr);
     } while
 	(poll_interval);
 
     if (outlevel == O_VERBOSE)
-	fprintf(stderr, "normal termination, status %d\n", popstatus);
+	fprintf(stderr, "fetchmail: normal termination, status %d\n", popstatus);
 
     termhook(0);
     exit(popstatus);
diff --git a/fetchmail.man b/fetchmail.man
index 1fd25bf9..835cd20a 100644
--- a/fetchmail.man
+++ b/fetchmail.man
@@ -293,7 +293,7 @@ a mailserver does not send a greeting message or respond to commands for
 the given number of seconds, \fIfetchmail\fR will hang up on it.
 Without such a timeout \fIfetchmail\fR might hang up indefinitely
 trying to fetch mail from a down host.  This would be particularly
-annoying for a server running in background.
+annoying for a \fIfetchmail\fR running in background.
 .PP
 The
 .B -L
@@ -321,7 +321,8 @@ server are being fetched (and deleted) even when you don't specify
 .PP
 One could be that you're using POP2.  The POP2 protocol includes no
 representation of `new' or `old' state in messages, so \fIfetchmail\fR
-must treat all messages as new all the time.  POP2 is obsolete.
+must treat all messages as new all the time.  But POP2 is obsolete, so
+this is unlikely.
 .PP
 Under POP3, blame RFC1725.  That version of the POP3 protocol
 specification removed the LAST command, and some POP servers follow it
@@ -329,7 +330,7 @@ specification removed the LAST command, and some POP servers follow it
 and watching the response to LAST early in the query).  The
 \fIfetchmail\fR code tries to compensate by using POP3's UID feature,
 storing the identifiers of messages seen in each session until the
-next session,in the \fI.fetchids\fR file.  But this doesn't track
+next session, in the \fI.fetchids\fR file.  But this doesn't track
 messages seen with other clients, or read but not deleted directly with
 a mailer on the host.  A better solution would be to switch to IMAP.
 .PP
@@ -429,7 +430,7 @@ Legal protocol identifiers are
     pop3 (or POP3)
     imap (or IMAP)
     apop (or APOP)
-    kpop (or APOP)
+    kpop (or KPOP)
 
 .PP
 Legal authentication types are `password' or `kerberos'.  The former
@@ -448,7 +449,7 @@ it resemble English.  They're ignored, but but can make entries much
 easier to read at a glance.  The punctuation characters ':', ';' and
 ',' are also ignored.
 .PP
-The words \fBhere\fR and \fBthere\fR also have useful English-like
+The words \fBhere\fR and \fBthere\fR have useful English-like
 significance.  Normally `\fBuser eric is esr\fR' would mean that 
 mail for the remote user \fBeric\fR is to be delivered to \fBesr\fR,
 but you can make this clearer by saying `\fBuser eric there is esr here\fR',
@@ -499,7 +500,7 @@ If you need to include whitespace in a parameter string, enclose the
 string in double quotes.  Thus:
 
 .nf
-  server mail.provider.net with proto pop3
+  server mail.provider.net with proto pop3:
         user jsmith there has password "u can't krak this"
                     is jws here and wants mda "/bin/mail %s"
 .fi
@@ -523,7 +524,7 @@ likely to be useful when running fetchmail in daemon mode as root).
 The \fBuser\fR keyword leads off a user description, and every user
 description except optionally the first one must include it.  (If the
 first description lacks the \fBuser\fR keyword, the name of the
-invoking user is used .) Here's a contrived example:
+invoking user is used.) Here's a contrived example:
 
 .nf
   server pop.provider.net proto pop3 port 3111
@@ -543,7 +544,7 @@ to be specifying multiple users per server unless running it as root
 (thus the \fBpass gumshoe\fR would try to fetch root's mail on
 pop-provider.net, which is probably not what you want).
 In any case, we strongly recommend always having an explicit
-\fBuser\fR clause when specifying nultiple users for server.
+\fBuser\fR clause when specifying multiple users for server.
 .SH EXIT CODES
 To facilitate the use of 
 .I fetchmail
@@ -583,9 +584,8 @@ The
 .I fetchmail.
 run failed while trying to do an SMTP port open or transaction.
 .IP 10
-Something totally undefined occured.  This is usually caused by a bug within
-.I fetchmail.
-Do let me know if this happens.
+Internal error.  You should see a message on standard error with
+details.
 .PP
 When
 .I fetchmail
diff --git a/xmalloc.c b/xmalloc.c
index 9ea57c41..bfa5b463 100644
--- a/xmalloc.c
+++ b/xmalloc.c
@@ -31,7 +31,7 @@ int n;
 
   p = (XMALLOCTYPE *) malloc(n);
   if (p == (XMALLOCTYPE *) 0) {
-    fputs("malloc failed\n",stderr);
+    fputs("fetchmail: malloc failed\n",stderr);
     exit(PS_UNDEFINED);
   }
   return(p);