count & record message size

SCCS-vsn: usr.sbin/sendmail/src/collect.c 1.6
SCCS-vsn: usr.sbin/sendmail/src/deliver.c 1.11

diff --git a/usr/src/usr.sbin/sendmail/src/collect.c b/usr/src/usr.sbin/sendmail/src/collect.c
index bc9ada7..07af85a 100644 (file)
--- 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"
 
 # 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.
 
 /*
 **  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.
 */
 
 **             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()
 
 char *
 maketemp()


@@ -126,6 +127,7 @@ maketemp()
                        if (firstline && !SaveFrom)
                                continue;
                        fputs(">", tf);
                        if (firstline && !SaveFrom)
                                continue;
                        fputs(">", tf);

+                       MsgSize++;

                }
 
                if (inheader && !isspace(buf[0]))
                }
 
                if (inheader && !isspace(buf[0]))


@@ -159,6 +161,7 @@ maketemp()
                        if (p != NULL && MsgId[0] == '\0')
                                prescan(p, MsgId, &MsgId[sizeof MsgId - 1], '\0');
                }
                        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))
                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 7fdf7d8..77ea9d0 100644 (file)
--- 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
 
 # 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.
 
 /*
 **  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 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)
 
        i = stat - EX__BASE;
        if (i < 0 || i > N_SysEx)


@@ -342,11 +344,14 @@ giveresponse(stat, force, m)
        **      that.
        */
 
        **      that.
        */
 

-# ifdef LOG

        if (statmsg == NULL)
        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);
 # endif LOG
        setstat(stat);
        return (stat);