From 2a7bd60222ce3c09208a265ad3a5f1490ccb6768 Mon Sep 17 00:00:00 2001
From: peter <peter@FreeBSD.org>
Date: Tue, 12 Jan 1999 12:26:57 +0000
Subject: Import sendmail-8.9.2 onto vendor branch  (update from 8.9.1)

Obtained from: ftp.sendamil.org
---
 contrib/sendmail/rmail/Makefile.m4 | 6 +++---
 contrib/sendmail/rmail/rmail.8     | 2 +-
 contrib/sendmail/rmail/rmail.c     | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'contrib/sendmail/rmail')

diff --git a/contrib/sendmail/rmail/Makefile.m4 b/contrib/sendmail/rmail/Makefile.m4
index 55468bd..9f2d87b 100644
--- a/contrib/sendmail/rmail/Makefile.m4
+++ b/contrib/sendmail/rmail/Makefile.m4
@@ -1,7 +1,7 @@
 #
 #  This Makefile is designed to work on the old "make" program.
 #
-#	@(#)Makefile.m4	8.16	(Berkeley)	6/18/98
+#	@(#)Makefile.m4	8.17	(Berkeley)	7/12/1998
 #
 
 # C compiler
@@ -34,7 +34,7 @@ LIBDIRS=confLIBDIRS
 LIBS=	ifdef(`confLIBS', `confLIBS')
 
 # location of rmail binary (usually /usr/sbin or /usr/etc)
-BINDIR=	${DESTDIR}ifdef(`confUBINDIR', `confUBINDIR', `/usr/bin')
+UBINDIR=${DESTDIR}ifdef(`confUBINDIR', `confUBINDIR', `/usr/bin')
 
 # additional .o files needed
 OBJADD=	ifdef(`confOBJADD', `confOBJADD')
@@ -90,7 +90,7 @@ install:
 force-install: install-rmail install-docs
 
 install-rmail: rmail
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} rmail ${BINDIR}
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} rmail ${UBINDIR}
 
 install-docs: rmail.${MAN8SRC}
 ifdef(`confNO_MAN_INSTALL', `dnl',
diff --git a/contrib/sendmail/rmail/rmail.8 b/contrib/sendmail/rmail/rmail.8
index ad70e5b..9f6ee26 100644
--- a/contrib/sendmail/rmail/rmail.8
+++ b/contrib/sendmail/rmail/rmail.8
@@ -7,7 +7,7 @@
 .\" the sendmail distribution.
 .\"
 .\"
-.\"	@(#)rmail.8	6.14 (Berkeley) 5/19/98
+.\"	@(#)rmail.8	6.14 (Berkeley) 5/19/1998
 .\"
 .Dd May 19, 1998
 .Dt RMAIL 8
diff --git a/contrib/sendmail/rmail/rmail.c b/contrib/sendmail/rmail/rmail.c
index 9d58fcc..f3f5cf6 100644
--- a/contrib/sendmail/rmail/rmail.c
+++ b/contrib/sendmail/rmail/rmail.c
@@ -16,7 +16,7 @@ static char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-static char sccsid[] = "@(#)rmail.c	8.17 (Berkeley) 5/19/98";
+static char sccsid[] = "@(#)rmail.c	8.18 (Berkeley) 10/23/1998";
 #endif /* not lint */
 
 /*
@@ -136,10 +136,10 @@ main(argc, argv)
 	extern int errno, optind;
 	FILE *fp;
 	struct stat sb;
-	size_t fplen, fptlen, len;
+	size_t fplen = 0, fptlen = 0, len;
 	off_t offset;
 	int ch, debug, i, pdes[2], pid, status;
-	char *addrp, *domain, *p, *t;
+	char *addrp = NULL, *domain, *p, *t;
 	char *from_path, *from_sys, *from_user;
 	char *args[100], buf[2048], lbuf[2048];
 
-- 
cgit v1.1