STEP 8: All socket writes now go through SockWrite.

svn path=/trunk/; revision=451

2 files changed, 12 insertions, 38 deletions

diff --git a/driver.c b/driver.c
index b3e8f2c7..126e85ad 100644
--- a/driver.c
+++ b/driver.c
@@ -705,7 +705,7 @@ struct query *ctl;	/* query control record */
 	    if (ctl->mda[0])
 		n = write(mboxfd,headers,oldlen);
 	    else
-		n = SockPuts(headers, sinkfp);
+		n = SockWrite(headers, oldlen, sinkfp);
 
 	    if (n < 0)
 	    {
@@ -722,7 +722,7 @@ struct query *ctl;	/* query control record */
 
 	/* SMTP byte-stuffing */
 	if (*bufp == '.' && ctl->mda[0] == 0)
-	    SockPuts(".", sinkfp);
+	    SockWrite(".", 1, sinkfp);
 
 	/* replace all LFs with CR-LF  in the line */
 	if (!ctl->mda[0])
@@ -739,7 +739,7 @@ struct query *ctl;	/* query control record */
 	if (ctl->mda[0])
 	    n = write(mboxfd,bufp,strlen(bufp));
 	else
-	    n = SockPuts(bufp, sinkfp);
+	    n = SockWrite(bufp, strlen(bufp), sinkfp);
 
 	if (!ctl->mda[0])
 	    free(bufp);
@@ -1087,7 +1087,7 @@ va_dcl {
     va_end(ap);
 
     strcat(buf, "\r\n");
-    SockPuts(buf, sockfp);
+    SockWrite(buf, strlen(buf), sockfp);
 
     if (outlevel == O_VERBOSE)
     {
@@ -1129,7 +1129,7 @@ va_dcl {
   va_end(ap);
 
   strcat(buf, "\r\n");
-  SockPuts(buf, sockfp);
+  SockWrite(buf, strlen(buf), sockfp);
   if (outlevel == O_VERBOSE)
   {
       char *cp;
diff --git a/socket.c b/socket.c
index 6ee4d961..d4dde009 100644
--- a/socket.c
+++ b/socket.c
@@ -74,30 +74,23 @@ int clientPort;
     return fdopen(sock, "r+");
 }
 
-int SockPuts(buf, sockfp)
-char *buf;
-FILE *sockfp;
-{
-    return(SockWrite(fileno(sockfp), buf, strlen(buf)));
-}
-
-int SockWrite(socket,buf,len)
-int socket;
+int SockWrite(buf,len,sockfp)
 char *buf;
 int len;
+FILE *sockfp;
 {
-    int n, rdlen = 0;
+    int n, wrlen = 0;
     
     while (len)
     {
-        n = write(socket, buf, len);
+        n = write(fileno(sockfp), buf, len);
         if (n <= 0)
             return -1;
         len -= n;
-	rdlen += n;
+	wrlen += n;
 	buf += n;
     }
-    return rdlen;
+    return wrlen;
 }
 
 static int sbuflen = 0;
@@ -147,25 +140,6 @@ int len;
    return(len);
 }
 
-int SockRead(socket,buf,len)
-int socket;
-char *buf;
-int len;
-{
-    int n;
-    
-    
-    while (len)
-    {
-        n = SockInternalRead(socket, buf, len);
-        if (n <= 0)
-            return -1;
-        len -= n;
-        buf += n;
-    }
-    return 0;
-}
-
 int SockGets(buf, len, sockfp)
 char *buf;
 int len;
@@ -208,7 +182,7 @@ va_dcl {
 #endif
     vsprintf(buf, format, ap);
     va_end(ap);
-    return SockWrite(fileno(sockfp), buf, strlen(buf));
+    return SockWrite(buf, strlen(buf), sockfp);
 
 }