From ee409a69c7f931c02aac69553c92817dfa7951db Mon Sep 17 00:00:00 2001
From: "Eric S. Raymond" <esr@thyrsus.com>
Date: Tue, 5 Jan 1999 03:34:55 +0000
Subject: First step towards splitting error from progress messages.

svn path=/trunk/; revision=2326
---
 smtp.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'smtp.c')

diff --git a/smtp.c b/smtp.c
index 2b98d15f..31a8a983 100644
--- a/smtp.c
+++ b/smtp.c
@@ -47,7 +47,7 @@ int SMTP_helo(int sock,const char *host)
 
   SockPrintf(sock,"HELO %s\r\n", host);
   if (outlevel >= O_MONITOR)
-      error(0, 0, "SMTP> HELO %s", host);
+      progress(0, 0, "SMTP> HELO %s", host);
   ok = SMTP_ok(sock);
   return ok;
 }
@@ -59,7 +59,7 @@ int SMTP_ehlo(int sock, const char *host, int *opt)
 
   SockPrintf(sock,"%cHLO %s\r\n", (smtp_mode == 'S') ? 'E' : smtp_mode, host);
   if (outlevel >= O_MONITOR)
-      error(0, 0, "%cMTP> %cHLO %s", 
+      progress(0, 0, "%cMTP> %cHLO %s", 
 	    smtp_mode, (smtp_mode == 'S') ? 'E' : smtp_mode, host);
   
   *opt = 0;
@@ -75,7 +75,7 @@ int SMTP_ehlo(int sock, const char *host, int *opt)
 	  return SM_ERROR;
       smtp_response[n] = '\0';
       if (outlevel >= O_MONITOR)
-	  error(0, 0, "SMTP< %s", smtp_response);
+	  progress(0, 0, "SMTP< %s", smtp_response);
       for (hp = extensions; hp->name; hp++)
 	  if (!strncasecmp(hp->name, smtp_response+4, strlen(hp->name)))
 	      *opt |= hp->value;
@@ -101,7 +101,7 @@ int SMTP_from(int sock, const char *from, const char *opts)
 	strcat(buf, opts);
     SockPrintf(sock,"%s\r\n", buf);
     if (outlevel >= O_MONITOR)
-	error(0, 0, "%cMTP> %s", smtp_mode, buf);
+	progress(0, 0, "%cMTP> %s", smtp_mode, buf);
     ok = SMTP_ok(sock);
     return ok;
 }
@@ -113,7 +113,7 @@ int SMTP_rcpt(int sock, const char *to)
 
   SockPrintf(sock,"RCPT TO:<%s>\r\n", to);
   if (outlevel >= O_MONITOR)
-      error(0, 0, "%cMTP> RCPT TO:<%s>", smtp_mode, to);
+      progress(0, 0, "%cMTP> RCPT TO:<%s>", smtp_mode, to);
   ok = SMTP_ok(sock);
   return ok;
 }
@@ -125,7 +125,7 @@ int SMTP_data(int sock)
 
   SockPrintf(sock,"DATA\r\n");
   if (outlevel >= O_MONITOR)
-      error(0, 0, "%cMTP> DATA", smtp_mode);
+      progress(0, 0, "%cMTP> DATA", smtp_mode);
   ok = SMTP_ok(sock);
   return ok;
 }
@@ -137,7 +137,7 @@ int SMTP_rset(int sock)
 
   SockPrintf(sock,"RSET\r\n");
   if (outlevel >= O_MONITOR)
-      error(0, 0, "%cMTP> RSET", smtp_mode);
+      progress(0, 0, "%cMTP> RSET", smtp_mode);
   ok = SMTP_ok(sock);
   return ok;
 }
@@ -149,7 +149,7 @@ int SMTP_quit(int sock)
 
   SockPrintf(sock,"QUIT\r\n");
   if (outlevel >= O_MONITOR)
-      error(0, 0, "%cMTP> QUIT", smtp_mode);
+      progress(0, 0, "%cMTP> QUIT", smtp_mode);
   ok = SMTP_ok(sock);
   return ok;
 }
@@ -161,7 +161,7 @@ int SMTP_eom(int sock)
 
   SockPrintf(sock,".\r\n");
   if (outlevel >= O_MONITOR)
-      error(0, 0, "%cMTP>. (EOM)", smtp_mode);
+      progress(0, 0, "%cMTP>. (EOM)", smtp_mode);
 
   /* 
    * When doing LMTP, must process many of these at the outer level. 
@@ -189,7 +189,7 @@ int SMTP_ok(int sock)
 	    return SM_ERROR;
 	smtp_response[n] = '\0';
 	if (outlevel >= O_MONITOR)
-	    error(0, 0, "%cMTP< %s", smtp_mode, smtp_response);
+	    progress(0, 0, "%cMTP< %s", smtp_mode, smtp_response);
 	if ((smtp_response[0] == '1' || smtp_response[0] == '2' || smtp_response[0] == '3') && smtp_response[3] == ' ')
 	    return SM_OK;
 	else if (smtp_response[3] != '-')
-- 
cgit v1.2.3