on -t, use argument list as a supress list

SCCS-vsn: usr.sbin/sendmail/src/sendmail.h 3.33
SCCS-vsn: usr.sbin/sendmail/src/version.c 3.15
SCCS-vsn: usr.sbin/sendmail/src/main.c 3.29
SCCS-vsn: usr.sbin/sendmail/src/recipient.c 3.9

diff --git a/usr/src/usr.sbin/sendmail/src/main.c b/usr/src/usr.sbin/sendmail/src/main.c
index 6853051..4a6f7dd 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/main.c
+++ b/usr/src/usr.sbin/sendmail/src/main.c
@@ -5,7 +5,7 @@
 # include <syslog.h>
 # endif LOG
 
 # include <syslog.h>
 # endif LOG
 

-static char    SccsId[] = "@(#)main.c  3.28    %G%";
+static char    SccsId[] = "@(#)main.c  3.29    %G%";

 
 /*
 **  SENDMAIL -- Post mail to a set of destinations.
 
 /*
 **  SENDMAIL -- Post mail to a set of destinations.


@@ -124,6 +124,7 @@ bool        IgnrDot;        /* if set, ignore dot when collecting mail */
 bool   SuprErrs;       /* supress errors if set */
 bool   Verbose;        /* set if blow-by-blow desired */
 bool   GrabTo;         /* if set, read recipient addresses from msg */
 bool   SuprErrs;       /* supress errors if set */
 bool   Verbose;        /* set if blow-by-blow desired */
 bool   GrabTo;         /* if set, read recipient addresses from msg */

+bool   DontSend;       /* mark recipients as QDONTSEND */

 int    Debug;          /* debug level */
 int    Errors;         /* count of errors */
 int    AliasLevel;     /* current depth of aliasing */
 int    Debug;          /* debug level */
 int    Errors;         /* count of errors */
 int    AliasLevel;     /* current depth of aliasing */


@@ -522,6 +523,8 @@ main(argc, argv)
        ** Scan argv and deliver the message to everyone.
        */
 
        ** Scan argv and deliver the message to everyone.
        */
 

+       if (GrabTo)
+               DontSend = TRUE;

        for (; argc-- > 0; argv++)
        {
                p = argv[1];
        for (; argc-- > 0; argv++)
        {
                p = argv[1];


@@ -570,6 +573,7 @@ main(argc, argv)
        **  Read the input mail.
        */
 
        **  Read the input mail.
        */
 

+       DontSend = FALSE;

        collect();
 
 # ifdef DEBUG
        collect();
 
 # ifdef DEBUG

diff --git a/usr/src/usr.sbin/sendmail/src/recipient.c b/usr/src/usr.sbin/sendmail/src/recipient.c
index 5c94651..c49211b 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/recipient.c
+++ b/usr/src/usr.sbin/sendmail/src/recipient.c
@@ -1,7 +1,7 @@
 # include <pwd.h>
 # include "sendmail.h"
 
 # include <pwd.h>
 # include "sendmail.h"
 

-static char SccsId[] = "@(#)recipient.c        3.8     %G%";
+static char SccsId[] = "@(#)recipient.c        3.9     %G%";

 
 /*
 **  SENDTO -- Designate a send list.
 
 /*
 **  SENDTO -- Designate a send list.


@@ -147,6 +147,8 @@ recipient(a)
                q->q_next = a;
        }
        a->q_next = NULL;
                q->q_next = a;
        }
        a->q_next = NULL;

+       if (DontSend)
+               a->q_flags |= QDONTSEND;

 
        /*
        **  Alias the name and handle :include: specs.
 
        /*
        **  Alias the name and handle :include: specs.

diff --git a/usr/src/usr.sbin/sendmail/src/sendmail.h b/usr/src/usr.sbin/sendmail/src/sendmail.h
index 8bcbf1f..3f9b824 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/sendmail.h
+++ b/usr/src/usr.sbin/sendmail/src/sendmail.h
@@ -1,7 +1,7 @@
 /*
 **  SENDMAIL.H -- Global definitions for sendmail.
 **
 /*
 **  SENDMAIL.H -- Global definitions for sendmail.
 **

-**     @(#)sendmail.h  3.32    %G%
+**     @(#)sendmail.h  3.33    %G%

 */
 
 
 */
 
 


@@ -247,6 +247,7 @@ extern bool IgnrDot;        /* don't let dot end messages */
 extern bool    SaveFrom;       /* save leading "From" lines */
 extern bool    Verbose;        /* set if blow-by-blow desired */
 extern bool    GrabTo;         /* if set, get recipients from msg */
 extern bool    SaveFrom;       /* save leading "From" lines */
 extern bool    Verbose;        /* set if blow-by-blow desired */
 extern bool    GrabTo;         /* if set, get recipients from msg */

+extern bool    DontSend;       /* mark recipients as QDONTSEND */

 extern int     Debug;          /* debugging level */
 extern int     Errors;         /* set if errors */
 extern int     ExitStat;       /* exit status code */
 extern int     Debug;          /* debugging level */
 extern int     Errors;         /* set if errors */
 extern int     ExitStat;       /* exit status code */

diff --git a/usr/src/usr.sbin/sendmail/src/version.c b/usr/src/usr.sbin/sendmail/src/version.c
index 0f451cf..57146eb 100644 (file)
--- a/usr/src/usr.sbin/sendmail/src/version.c
+++ b/usr/src/usr.sbin/sendmail/src/version.c
@@ -1,3 +1,3 @@
-static char    SccsId[] = "@(#)SendMail version 3.14 of %G%";
+static char    SccsId[] = "@(#)SendMail version 3.15 of %G%";

 
 

-char   Version[] = "3.14 [%G%]";
+char   Version[] = "3.15 [%G%]";