From: Eric Allman <eric@ucbvax.Berkeley.EDU>
Date: Fri, 28 Aug 1981 02:43:19 +0000 (-0800)
Subject: on -t, use argument list as a supress list
X-Git-Tag: BSD-4_1_snap-Snapshot-Development~946
X-Git-Url: https://git.subgeniuskitty.com/unix-history/.git/commitdiff_plain/23a54ee363f1e7f8da251582f2d7bc91b1dc95ef

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 685305149a..4a6f7ddcf1 100644
--- 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
 
-static char	SccsId[] = "@(#)main.c	3.28	%G%";
+static char	SccsId[] = "@(#)main.c	3.29	%G%";
 
 /*
 **  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	DontSend;	/* mark recipients as QDONTSEND */
 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.
 	*/
 
+	if (GrabTo)
+		DontSend = TRUE;
 	for (; argc-- > 0; argv++)
 	{
 		p = argv[1];
@@ -570,6 +573,7 @@ main(argc, argv)
 	**  Read the input mail.
 	*/
 
+	DontSend = FALSE;
 	collect();
 
 # ifdef DEBUG
diff --git a/usr/src/usr.sbin/sendmail/src/recipient.c b/usr/src/usr.sbin/sendmail/src/recipient.c
index 5c946515ac..c49211b634 100644
--- 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"
 
-static char SccsId[] = "@(#)recipient.c	3.8	%G%";
+static char SccsId[] = "@(#)recipient.c	3.9	%G%";
 
 /*
 **  SENDTO -- Designate a send list.
@@ -147,6 +147,8 @@ recipient(a)
 		q->q_next = a;
 	}
 	a->q_next = NULL;
+	if (DontSend)
+		a->q_flags |= QDONTSEND;
 
 	/*
 	**  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 8bcbf1f890..3f9b824cd2 100644
--- 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	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	DontSend;	/* mark recipients as QDONTSEND */
 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 0f451cf6fa..57146eb0d8 100644
--- 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%]";