summaryrefslogtreecommitdiff
path: root/common/smtppass.c
diff options
context:
space:
mode:
authorStef Walter <stef@memberwebs.com>2004-08-30 04:28:25 +0000
committerStef Walter <stef@memberwebs.com>2004-08-30 04:28:25 +0000
commit6e142a434645a27b6fa07bbfd2d06228d8fc4fd9 (patch)
treeef93299d3882eeb3cc07d9394a9b063a37daa84d /common/smtppass.c
parent442201a3c6bedd9da976b342107cefdaf476ec79 (diff)
- IO fixes
Diffstat (limited to 'common/smtppass.c')
-rw-r--r--common/smtppass.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/common/smtppass.c b/common/smtppass.c
index e94b9b3..e68bdf1 100644
--- a/common/smtppass.c
+++ b/common/smtppass.c
@@ -958,7 +958,7 @@ static int avcheck_data(clamsmtp_context_t* ctx, char* logline)
strlcat(buf, "/clamsmtpd.XXXXXX", MAXPATHLEN);
/* transfer_to_file deletes the temp file on failure */
- if((r = transfer_to_file(ctx, buf)) != -1)
+ if((r = transfer_to_file(ctx, buf)) > 0)
{
havefile = 1;
r = clam_scan_file(ctx, buf, logline);
@@ -1275,6 +1275,7 @@ static int transfer_to_file(clamsmtp_context_t* ctx, char* tempname)
/* We check errors on this later */
fwrite(ctx->line, 1, ctx->linelen, tfile);
+ count += ctx->linelen;
/* Check if this line ended with a CRLF */
ended_crlf = (strcmp(CRLF, ctx->line + (ctx->linelen - KL(CRLF))) == 0);
@@ -1300,7 +1301,7 @@ cleanup:
if(tfile == NULL)
close(tfd);
- if(ret == -1)
+ if(ret <= 0)
{
messagex(ctx, LOG_DEBUG, "discarding temporary file");
unlink(tempname);
@@ -1323,7 +1324,7 @@ static int transfer_from_file(clamsmtp_context_t* ctx, const char* filename)
RETURN(-1);
}
- messagex(ctx, LOG_DEBUG, "opened temporary file: %s", filename);
+ messagex(ctx, LOG_DEBUG, "sending from temporary file: %s", filename);
while(fgets(ctx->line, LINE_LENGTH, file) != NULL)
{