changeset 504:a07174f00a1b

*** empty log message ***
author mmj
date Tue, 10 May 2005 02:29:15 +1000
parents 2cd3dc827d59
children d1397c9f7d30
files VERSION src/checkwait_smtpreply.c
diffstat 2 files changed, 36 insertions(+), 47 deletions(-) [+]
line wrap: on
line diff
--- a/VERSION	Tue May 10 00:36:09 2005 +1000
+++ b/VERSION	Tue May 10 02:29:15 2005 +1000
@@ -1,1 +1,1 @@
-1.2.6.1
+1.2.7pre1
--- a/src/checkwait_smtpreply.c	Tue May 10 00:36:09 2005 +1000
+++ b/src/checkwait_smtpreply.c	Tue May 10 02:29:15 2005 +1000
@@ -38,27 +38,16 @@
 {
 	size_t len = 0;
 	char smtpreply[RFC_REPLY_SIZE + 1];
-	int timer = 0;
 
 	smtpreply[RFC_REPLY_SIZE] = '\0';
 
 	do {
-		if(replytype != MLMMJ_QUIT && timer > 10) {
-			usleep(USEC_WAIT);
-			timer++;
-		}
 		len += read(sockfd, (smtpreply+len), RFC_REPLY_SIZE - len);
-	} while(smtpreply[len-1] != '\n' && timer < LOOP_WAIT);
+	} while(smtpreply[len - 1] != '\n' || len >= RFC_REPLY_SIZE);
 
 	smtpreply[len] = '\0';
 #if 0
 	printf("replytype = [%d], smtpreply = [%s]\n", replytype, smtpreply);
-#endif
-	if(timer > LOOP_WAIT) {
-		printf("Timed out in waiting for reply--will try later\n");
-		return (char *)-1;
-	}
-#if 0
 	fprintf(stderr, "%s", smtpreply);
 #endif