From 336dd89b3198be948d57de4a801c28a9070426c7 Mon Sep 17 00:00:00 2001
From: jkh <jkh@FreeBSD.org>
Date: Sun, 6 Oct 1996 01:55:32 +0000
Subject: Honor the MAIL environment variable. Submitted-By: Dan Cross
 <cross@math.psu.edu>

---
 usr.bin/mail/mail.1     | 8 ++++++--
 usr.bin/mail/v7.local.c | 7 ++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/usr.bin/mail/mail.1 b/usr.bin/mail/mail.1
index c151555..597f175 100644
--- a/usr.bin/mail/mail.1
+++ b/usr.bin/mail/mail.1
@@ -30,7 +30,7 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)mail.1	8.2 (Berkeley) 12/30/93
-.\"	$Id$
+.\"	$Id: mail.1,v 1.7 1996/08/29 18:05:57 wosch Exp $
 .\"
 .Dd December 30, 1993
 .Dt MAIL 1
@@ -985,7 +985,11 @@ utilizes the
 .Ev HOME
 and
 .Ev USER
-environment variables.
+environment variables.  Also, if the
+.Ev MAIL
+environment variable is set, it is used as the
+location of the user's mailbox instead of the
+default in /var/mail.
 .Sh FILES
 .Bl -tag -width /usr/share/misc/Mail.help* -compact
 .It Pa /var/mail/*
diff --git a/usr.bin/mail/v7.local.c b/usr.bin/mail/v7.local.c
index 5144c01..ade3cbd 100644
--- a/usr.bin/mail/v7.local.c
+++ b/usr.bin/mail/v7.local.c
@@ -55,7 +55,12 @@ void
 findmail(user, buf)
 	char *user, *buf;
 {
-	(void)sprintf(buf, "%s/%s", _PATH_MAILDIR, user);
+	char	*tmp = getenv("MAIL");
+
+	if (tmp == NULL)
+		(void)sprintf(buf, "%s/%s", _PATH_MAILDIR, user);
+	else
+		(void)strcpy(buf, tmp);
 }
 
 /*
-- 
cgit v1.1