From 5d99721eb84c738deeda0adb81b4aeb97a1f9f61 Mon Sep 17 00:00:00 2001
From: Eric Allman <eric@ucbvax.Berkeley.EDU>
Date: Mon, 20 Jul 1992 17:22:55 -0800
Subject: [PATCH] macro expand error messages

SCCS-vsn: usr.sbin/sendmail/src/savemail.c 5.20
---
 usr/src/usr.sbin/sendmail/src/savemail.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/usr/src/usr.sbin/sendmail/src/savemail.c b/usr/src/usr.sbin/sendmail/src/savemail.c
index e315838a87..5b5199611e 100644
--- a/usr/src/usr.sbin/sendmail/src/savemail.c
+++ b/usr/src/usr.sbin/sendmail/src/savemail.c
@@ -7,7 +7,7 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)savemail.c	5.19 (Berkeley) %G%";
+static char sccsid[] = "@(#)savemail.c	5.20 (Berkeley) %G%";
 #endif /* not lint */
 
 # include <sys/types.h>
@@ -469,14 +469,18 @@ errbody(fp, m, e)
 			if (xfile != NULL)
 			{
 				while (fgets(buf, sizeof buf, xfile) != NULL)
+				{
+					expand(buf, buf, &buf[sizeof buf - 1], e);
 					putline(buf, fp, m);
+				}
 				(void) fclose(xfile);
 				fprintf(fp, "\n");
 			}
 		}
 		else
 		{
-			putline(ErrMsgFile, fp, m);
+			expand(ErrMsgFile, buf, &buf[sizeof buf - 1], e);
+			putline(buf, fp, m);
 			fprintf(fp, "\n");
 		}
 	}
-- 
2.20.1