Special socket I/O almost gone!

svn path=/trunk/; revision=479

1 files changed, 5 insertions, 5 deletions

diff --git a/imap.c b/imap.c
index b0e39936..bb2e01bd 100644
--- a/imap.c
+++ b/imap.c
@@ -27,11 +27,11 @@ FILE *sockfp;
 
     seen = 0;
     do {
-	if (SockGets(buf, sizeof(buf), sockfp) < 0)
+	if (fgets(buf, sizeof(buf), sockfp) == (char *)NULL)
 	    return(PS_SOCKET);
 
 	if (outlevel == O_VERBOSE)
-	    fprintf(stderr,"%s\n",buf);
+	    fprintf(stderr,"%s",buf);
 
 	/* interpret untagged status responses */
 	if (strstr(buf, "EXISTS"))
@@ -121,7 +121,7 @@ int	*sizes;
     char buf [POPBUFSIZE+1];
 
     gen_send(sockfp, "FETCH 1:%d RFC822.SIZE", count);
-    while (SockGets(buf, sizeof(buf), sockfp) >= 0)
+    while (fgets(buf, sizeof(buf), sockfp) != (char *)NULL)
     {
 	int num, size;
 
@@ -165,7 +165,7 @@ int *lenp;
 
     /* looking for FETCH response */
     do {
-	if (SockGets(buf, sizeof(buf), sockfp) < 0)
+	if (fgets(buf, sizeof(buf), sockfp)  == (char *)NULL)
 	    return(PS_SOCKET);
     } while
 	    (sscanf(buf+2, "%d FETCH (RFC822 {%d}", &num, lenp) != 2);
@@ -184,7 +184,7 @@ int number;
 {
     char buf [POPBUFSIZE+1];
 
-    if (SockGets(buf, sizeof(buf), sockfp) < 0)
+    if (fgets(buf, sizeof(buf), sockfp) == (char *)NULL)
 	return(PS_SOCKET);
     else
 	return(0);