diff options
| -rw-r--r-- | fetchmail.c | 2 | ||||
| -rw-r--r-- | imap.c | 4 | ||||
| -rw-r--r-- | pop2.c | 2 | ||||
| -rw-r--r-- | pop3.c | 6 | ||||
| -rw-r--r-- | smtp.c | 14 |
5 files changed, 14 insertions, 14 deletions
diff --git a/fetchmail.c b/fetchmail.c index 08b9b4cf..6c18dedb 100644 --- a/fetchmail.c +++ b/fetchmail.c @@ -645,7 +645,7 @@ void termhook(int sig) */ if (sig != 0) - error(0, 0, "terminated with signal %d\n", sig); + error(0, 0, "terminated with signal %d", sig); else /* terminate all SMTP connections cleanly */ for (ctl = querylist; ctl; ctl = ctl->next) @@ -29,7 +29,7 @@ int imap_ok (FILE *sockfp, char *argbuf) return(PS_SOCKET); if (outlevel == O_VERBOSE) - fprintf(stderr,"%s\n",buf); + error(0, 0, buf); /* interpret untagged status responses */ if (strstr(buf, "EXISTS")) @@ -123,7 +123,7 @@ static int imap_getsizes(FILE *sockfp, int count, int *sizes) int num, size; if (outlevel == O_VERBOSE) - fprintf(stderr,"%s\n",buf); + error(0, 0, buf); if (strstr(buf, "OK")) break; else if (sscanf(buf, "* %d FETCH (RFC822.SIZE %d)", &num, &size) == 2) @@ -25,7 +25,7 @@ int pop2_ok (FILE *sockfp, char *argbuf) pound_arg = equal_arg = -1; if (SockGets(buf, sizeof(buf), sockfp) >= 0) { if (outlevel == O_VERBOSE) - fprintf(stderr,"%s\n",buf); + error(0, 0, buf); if (buf[0] == '+') ok = 0; @@ -32,7 +32,7 @@ int pop3_ok (FILE *sockfp, char *argbuf) if (SockGets(buf, sizeof(buf), sockfp) >= 0) { if (outlevel == O_VERBOSE) - fprintf(stderr,"%s\n",buf); + error(0, 0, buf); bufp = buf; if (*bufp == '+' || *bufp == '-') @@ -168,7 +168,7 @@ static int pop3_getrange(FILE *sockfp, struct query *ctl, int*countp, int*newp) while (SockGets(buf, sizeof(buf), sockfp) >= 0) { if (outlevel == O_VERBOSE) - fprintf(stderr,"%s\n",buf); + error(0, 0, buf); if (buf[0] == '.') break; else if (sscanf(buf, "%d %s", &num, id) == 2) @@ -201,7 +201,7 @@ static int pop3_getsizes(FILE *sockfp, int count, int *sizes) int num, size; if (outlevel == O_VERBOSE) - fprintf(stderr,"%s\n",buf); + error(0, 0, buf); if (buf[0] == '.') break; else if (sscanf(buf, "%d %d", &num, &size) == 2) @@ -27,7 +27,7 @@ int SMTP_helo(FILE *sockfp,char *host) SockPrintf(sockfp,"HELO %s\r\n", host); if (outlevel == O_VERBOSE) - error(0, 0, "SMTP> HELO %s\n", host); + error(0, 0, "SMTP> HELO %s", host); ok = SMTP_ok(sockfp); return ok; } @@ -39,7 +39,7 @@ int SMTP_from(FILE *sockfp, char *from) SockPrintf(sockfp,"MAIL FROM:<%s>\r\n", from); if (outlevel == O_VERBOSE) - error(0, 0, "SMTP> MAIL FROM:<%s>\n", from); + error(0, 0, "SMTP> MAIL FROM:<%s>", from); ok = SMTP_ok(sockfp); return ok; } @@ -51,7 +51,7 @@ int SMTP_rcpt(FILE *sockfp, char *to) SockPrintf(sockfp,"RCPT TO:<%s>\r\n", to); if (outlevel == O_VERBOSE) - error(0, 0, "SMTP> RCPT TO:<%s>\n", to); + error(0, 0, "SMTP> RCPT TO:<%s>", to); ok = SMTP_ok(sockfp); return ok; } @@ -63,7 +63,7 @@ int SMTP_data(FILE *sockfp) SockPrintf(sockfp,"DATA\r\n"); if (outlevel == O_VERBOSE) - error(0, 0, "SMTP> DATA\n"); + error(0, 0, "SMTP> DATA"); ok = SMTP_ok(sockfp); return ok; } @@ -75,7 +75,7 @@ int SMTP_quit(FILE *sockfp) SockPrintf(sockfp,"QUIT\r\n"); if (outlevel == O_VERBOSE) - error(0, 0, "SMTP> QUIT\n"); + error(0, 0, "SMTP> QUIT"); ok = SMTP_ok(sockfp); return ok; } @@ -87,7 +87,7 @@ int SMTP_eom(FILE *sockfp) SockPrintf(sockfp,".\r\n"); if (outlevel == O_VERBOSE) - error(0, 0, "SMTP>. (EOM)\n"); + error(0, 0, "SMTP>. (EOM)"); ok = SMTP_ok(sockfp); return ok; } @@ -104,7 +104,7 @@ int SMTP_ok(FILE *sockfp) return SM_ERROR; buf[n] = '\0'; if (outlevel == O_VERBOSE) - error(0, 0, "SMTP< %s\n", buf); + error(0, 0, "SMTP< %s", buf); smtp_response = atoi(buf); if ((buf[0] == '1' || buf[0] == '2' || buf[0] == '3') && buf[3] == ' ') return SM_OK; |