From afcbcc6ebabb9354b08df537959e2c3b3bc702e1 Mon Sep 17 00:00:00 2001
From: Eric Allman <eric@ucbvax.Berkeley.EDU>
Date: Tue, 28 Oct 1980 03:27:23 -0800
Subject: [PATCH] count & record message size

SCCS-vsn: usr.sbin/sendmail/src/collect.c 1.6
SCCS-vsn: usr.sbin/sendmail/src/deliver.c 1.11
---
 usr/src/usr.sbin/sendmail/src/collect.c |  7 +++++--
 usr/src/usr.sbin/sendmail/src/deliver.c | 15 ++++++++++-----
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/usr/src/usr.sbin/sendmail/src/collect.c b/usr/src/usr.sbin/sendmail/src/collect.c
index bc9ada733d..07af85ac82 100644
--- a/usr/src/usr.sbin/sendmail/src/collect.c
+++ b/usr/src/usr.sbin/sendmail/src/collect.c
@@ -3,7 +3,7 @@
 # include <errno.h>
 # include "dlvrmail.h"
 
-static char	SccsId[] = "@(#)collect.c	1.5	%G%";
+static char	SccsId[] = "@(#)collect.c	1.6	%G%";
 
 /*
 **  MAKETEMP -- read & parse message header & make temp file.
@@ -37,7 +37,8 @@ static char	SccsId[] = "@(#)collect.c	1.5	%G%";
 **		temp buffer can be deallocated.
 */
 
-char	MsgId[MAXNAME];
+char	MsgId[MAXNAME];		/* message-id, determined or created */
+long	MsgSize;		/* size of message in bytes */
 
 char *
 maketemp()
@@ -126,6 +127,7 @@ maketemp()
 			if (firstline && !SaveFrom)
 				continue;
 			fputs(">", tf);
+			MsgSize++;
 		}
 
 		if (inheader && !isspace(buf[0]))
@@ -159,6 +161,7 @@ maketemp()
 			if (p != NULL && MsgId[0] == '\0')
 				prescan(p, MsgId, &MsgId[sizeof MsgId - 1], '\0');
 		}
+		MsgSize += strlen(buf);
 		fputs(buf, tf);
 		firstline = FALSE;
 		if (ferror(tf))
diff --git a/usr/src/usr.sbin/sendmail/src/deliver.c b/usr/src/usr.sbin/sendmail/src/deliver.c
index 7fdf7d89f6..77ea9d0aa7 100644
--- a/usr/src/usr.sbin/sendmail/src/deliver.c
+++ b/usr/src/usr.sbin/sendmail/src/deliver.c
@@ -6,7 +6,7 @@
 # include <log.h>
 # endif LOG
 
-static char SccsId[] = "@(#)deliver.c	1.10	%G%";
+static char SccsId[] = "@(#)deliver.c	1.11	%G%";
 
 /*
 **  DELIVER -- Deliver a message to a particular address.
@@ -307,6 +307,8 @@ giveresponse(stat, force, m)
 	extern char *SysExMsg[];
 	register int i;
 	extern int N_SysEx;
+	extern long MsgSize;
+	char buf[30];
 
 	i = stat - EX__BASE;
 	if (i < 0 || i > N_SysEx)
@@ -342,11 +344,14 @@ giveresponse(stat, force, m)
 	**	that.
 	*/
 
-# ifdef LOG
 	if (statmsg == NULL)
-		logmsg(LOG_INFO, "%s->%s: error %d", From.q_paddr, To, stat);
-	else
-		logmsg(LOG_INFO, "%s->%s: %s", From.q_paddr, To, statmsg);
+	{
+		sprintf(buf, "error %d", stat);
+		statmsg = buf;
+	}
+
+# ifdef LOG
+	logmsg(LOG_INFO, "%s->%s: %ld: %s", From.q_paddr, To, MsgSize, statmsg);
 # endif LOG
 	setstat(stat);
 	return (stat);
-- 
2.20.1