Add the -E flag to not send messages that have an empty body. This is

useful for piping cron script error output by mail.

PR:		bin/9494
Obtained from:	NetBSD
MFC after:	2 weeks

1 files changed, 11 insertions, 5 deletions

diff --git a/usr.bin/mail/main.c b/usr.bin/mail/main.c
index 7c03e17..3707903 100644
--- a/usr.bin/mail/main.c
+++ b/usr.bin/mail/main.c
@@ -93,7 +93,7 @@ main(argc, argv)
 	bcc = NULL;
 	smopts = NULL;
 	subject = NULL;
-	while ((i = getopt(argc, argv, "INT:b:c:dfins:u:v")) != -1) {
+	while ((i = getopt(argc, argv, "EINT:b:c:dfins:u:v")) != -1) {
 		switch (i) {
 		case 'T':
 			/*
@@ -181,13 +181,19 @@ main(argc, argv)
 			 */
 			bcc = cat(bcc, nalloc(optarg, GBCC));
 			break;
+		case 'E':
+			/*
+			 * Don't send empty files.
+			 */
+			assign("dontsendempty", "");
+			break;
 		case '?':
 			fprintf(stderr, "\
-Usage: %s [-iInv] [-s subject] [-c cc-addr] [-b bcc-addr] to-addr ...\n\
+Usage: %s [-EiInv] [-s subject] [-c cc-addr] [-b bcc-addr] to-addr ...\n\
        %*s [- sendmail-options ...]\n\
-       %s [-iInNv] -f [name]\n\
-       %s [-iInNv] [-u user]\n",__progname, strlen(__progname), "", __progname,
-				__progname);
+       %s [-EiInNv] -f [name]\n\
+       %s [-EiInNv] [-u user]\n",__progname, strlen(__progname), "",
+			    __progname, __progname);
 			exit(1);
 		}
 	}