Progress messages now go to stdout.

svn path=/trunk/; revision=2329

diff --git a/driver.c b/driver.c
index 44ae98212c0d4f517bd11478d60b9c7487ab13ee..40408d13e70f467204d893278edf5a63609f3e91 100644 (file)
--- a/driver.c
+++ b/driver.c
@@ -731,7 +731,8 @@ static int readheaders(int sock,
     if (!headers_ok)
     {
        if (outlevel > O_SILENT)
-           report(stdout, 0,0,_("message delimiter found while scanning headers"));
+           report(stdout, 0,
+                  _("message delimiter found while scanning headers"));
     }
 
     /*
@@ -869,7 +870,8 @@ static int readheaders(int sock,
     if (ctl->errcount > olderrs)       /* there were DNS errors above */
     {
        if (outlevel >= O_DEBUG)
-           report(stdout, 0,0, _("forwarding and deletion suppressed due to DNS errors"));
+           report(stdout, 0,
+                  _("forwarding and deletion suppressed due to DNS errors"));
        free(msgblk.headers);
        free_str_list(&msgblk.recipients);
        return(PS_TRANSIENT);

diff --git a/fetchmail.c b/fetchmail.c
index 6264b9f19de14f960125a1432c6ff58547aaee25..f17ae6c056dc96536a21c8eb8334d2507e25dcf7 100644 (file)
--- a/fetchmail.c
+++ b/fetchmail.c
@@ -464,7 +464,7 @@ int main (int argc, char **argv)
     {
        if (!nodetach)
            daemonize(run.logfile, termhook);
-       report(stdout,  0, 0, _("starting fetchmail %s daemon "), VERSION);
+       report(stdout, 0, _("starting fetchmail %s daemon "), VERSION);
 
        /*
         * We'll set up a handler for these when we're sleeping,

diff --git a/imap.c b/imap.c
index b085e35a91449a131e43e35503cee609fabfb53b..4a4ebe58ef54eb91cb1445d21fa2a61379e6b2f3 100644 (file)
--- a/imap.c
+++ b/imap.c
@@ -465,7 +465,7 @@ static int do_gssauth(int sock, char *hostname, char *username)
     sec_token = GSS_C_NO_BUFFER;
     context = GSS_C_NO_CONTEXT;
     if (outlevel >= O_VERBOSE)
-        report(stdout, 0,0,_("Sending credentials"));
+        report(stdout, 0, _("Sending credentials"));
     do {
         maj_stat = gss_init_sec_context(&min_stat, GSS_C_NO_CREDENTIAL, 
             &context, target_name, NULL, 0, 0, NULL, sec_token, NULL,
@@ -484,7 +484,7 @@ static int do_gssauth(int sock, char *hostname, char *username)
         SockWrite(sock, buf1, strlen(buf1));
         SockWrite(sock, "\r\n", 2);
         if (outlevel >= O_MONITOR)
-            report(stdout, 0,0,"IMAP> %s", buf1);
+            report(stdout, 0, "IMAP> %s", buf1);
         if (maj_stat == GSS_S_CONTINUE_NEEDED) {
            if (result = gen_recv(sock, buf1, sizeof buf1)) {
                gss_release_name(&min_stat, &target_name);
@@ -512,7 +512,7 @@ static int do_gssauth(int sock, char *hostname, char *username)
         return PS_AUTHFAIL;
     }
     if (outlevel >= O_DEBUG)
-        report(stdout, 0,0,_("Credential exchange complete"));
+        report(stdout, 0, _("Credential exchange complete"));
     /* first octet is security levels supported. We want none, for now */
     server_conf_flags = ((char *)send_token.value)[0];
     if ( !(((char *)send_token.value)[0] & GSSAUTH_P_NONE) ) {
@@ -525,11 +525,11 @@ static int do_gssauth(int sock, char *hostname, char *username)
     /* we don't care about buffer size if we don't wrap data */
     gss_release_buffer(&min_stat, &send_token);
     if (outlevel >= O_DEBUG) {
-        report(stdout, 0,0,_("Unwrapped security level flags: %s%s%s"),
+        report(stdout, 0, _("Unwrapped security level flags: %s%s%s"),
             server_conf_flags & GSSAUTH_P_NONE ? "N" : "-",
             server_conf_flags & GSSAUTH_P_INTEGRITY ? "I" : "-",
             server_conf_flags & GSSAUTH_P_PRIVACY ? "C" : "-");
-        report(stdout, 0,0,_("Maximum GSS token size is %ld"),buf_size);
+        report(stdout, 0, _("Maximum GSS token size is %ld"),buf_size);
     }
 
     /* now respond in kind (hack!!!) */
@@ -547,8 +547,8 @@ static int do_gssauth(int sock, char *hostname, char *username)
     }
     to64frombits(buf1, send_token.value, send_token.length);
     if (outlevel >= O_DEBUG) {
-        report(stdout, 0,0,_("Requesting authorisation as %s"), username);
-        report(stdout, 0,0,"IMAP> %s",buf1);
+        report(stdout, 0, _("Requesting authorisation as %s"), username);
+        report(stdout, 0, "IMAP> %s",buf1);
     }
     SockWrite(sock, buf1, strlen(buf1));
     SockWrite(sock, "\r\n", 2);

diff --git a/netrc.c b/netrc.c
index c3b3dad49f8d3f6dd084e59edb98062a018aaa2a..7228e3372adc6da3f33e9ca13556ffe7726581b8 100644 (file)
--- a/netrc.c
+++ b/netrc.c
@@ -209,7 +209,7 @@ parse_netrc (file)
            if (premature_token)
            {
 #ifdef HAVE_ERROR
-               error_at_line (0, 0, file, ln,
+               error_at_line (0, file, ln,
                               _("warning: found \"%s\" before any host names"),
                               premature_token);
 #else

diff --git a/pop3.c b/pop3.c
index 4eb1aa0758d0a054a122bf64f5640d6928d5d205..0b3a5258401412146ad07cb9401f4e429d4b029e 100644 (file)
--- a/pop3.c
+++ b/pop3.c
@@ -92,7 +92,7 @@ int pop3_ok (int sock, char *argbuf)
            else
                ok = PS_AUTHFAIL;
            if (*bufp)
-             report(stderr, 0,0,bufp);
+             report(stderr, 0, bufp);
        }
        else
            ok = PS_PROTOCOL;
@@ -351,8 +351,8 @@ pop3_slowuidl( int sock,  struct query *ctl, int *countp, int *newp)
                    try_id--;
                }
            } else {
-               report(stderr, 0,0,_("Messages inserted into list on server. "
-                     "Cannot handle this."));
+               report(stderr, 0, 
+                      _("Messages inserted into list on server. Cannot handle this."));
                return -1;
            }
        } 

diff --git a/rcfile_y.y b/rcfile_y.y
index 7f36b3ddb98e07bba7ff5667a58c9369dab2bbb7..54f1b534e97f9f0611fb415edcb5a30fd9b37cb4 100644 (file)
--- a/rcfile_y.y
+++ b/rcfile_y.y
@@ -345,7 +345,7 @@ static struct query *hosttail;      /* where to add new elements */
 void yyerror (const char *s)
 /* report a syntax error */
 {
-    error_at_line( 0, 0, rcfile, prc_lineno, "%s at %s", s, 
+    report_at_line(stderr, 0, rcfile, prc_lineno, "%s at %s", s, 
                   (yytext && yytext[0]) ? yytext : "end of input");
     prc_errflag++;
 }

diff --git a/report.c b/report.c
index dea48801c0ae1c4db27657bdcd46cf4c3d089e65..b986ff2870794e824feead557058244f16f44e10 100644 (file)
--- a/report.c
+++ b/report.c
@@ -126,7 +126,7 @@ report (FILE *errfp, errnum, message, va_alist)
   if (partial_message_size_used != 0)
     {
       partial_message_size_used = 0;
-      report (errfp, 0, 0, _("%s (log message incomplete)"), partial_message);
+      report (errfp, 0, _("%s (log message incomplete)"), partial_message);
     }
 
 #if defined(HAVE_SYSLOG)