From: millert <millert@openbsd.org>
Date: Wed, 26 Apr 2000 15:47:29 +0000 (+0000)
Subject: Change the name of mail's send() function to sendmessages() to
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=80d25fda2d08f1bbac7a56a27cfc788a2558cc70;p=openbsd

Change the name of mail's send() function to sendmessages() to
avoid shadowing the libc send(2); gadams@avernus.com
---

diff --git a/usr.bin/mail/cmd1.c b/usr.bin/mail/cmd1.c
index 039f1a557e5..2e83ef729f3 100644
--- a/usr.bin/mail/cmd1.c
+++ b/usr.bin/mail/cmd1.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmd1.c,v 1.14 2000/04/25 16:42:22 millert Exp $	*/
+/*	$OpenBSD: cmd1.c,v 1.15 2000/04/26 15:47:29 millert Exp $	*/
 /*	$NetBSD: cmd1.c,v 1.9 1997/07/09 05:29:48 mikel Exp $	*/
 
 /*-
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)cmd1.c	8.2 (Berkeley) 4/20/95";
 #else
-static char rcsid[] = "$OpenBSD: cmd1.c,v 1.14 2000/04/25 16:42:22 millert Exp $";
+static char rcsid[] = "$OpenBSD: cmd1.c,v 1.15 2000/04/26 15:47:29 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -347,7 +347,7 @@ type1(msgvec, doign, page)
 		dot = mp;
 		if (value("quiet") == NULL)
 			fprintf(obuf, "Message %d:\n", *ip);
-		(void)send(mp, obuf, doign ? ignore : 0, NULL);
+		(void)sendmessage(mp, obuf, doign ? ignore : 0, NULL);
 	}
 close_pipe:
 	if (obuf != stdout) {
diff --git a/usr.bin/mail/cmd2.c b/usr.bin/mail/cmd2.c
index 19a6c1d3182..706273cbb74 100644
--- a/usr.bin/mail/cmd2.c
+++ b/usr.bin/mail/cmd2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmd2.c,v 1.8 1997/11/14 00:23:43 millert Exp $	*/
+/*	$OpenBSD: cmd2.c,v 1.9 2000/04/26 15:47:30 millert Exp $	*/
 /*	$NetBSD: cmd2.c,v 1.7 1997/05/17 19:55:10 pk Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)cmd2.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: cmd2.c,v 1.8 1997/11/14 00:23:43 millert Exp $";
+static char rcsid[] = "$OpenBSD: cmd2.c,v 1.9 2000/04/26 15:47:30 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -202,7 +202,7 @@ save1(str, mark, cmd, ignore)
 	for (ip = msgvec; *ip && ip-msgvec < msgCount; ip++) {
 		mp = &message[*ip - 1];
 		touch(mp);
-		if (send(mp, obuf, ignore, NULL) < 0) {
+		if (sendmessage(mp, obuf, ignore, NULL) < 0) {
 			warn("%s", file);
 			(void)Fclose(obuf);
 			return(1);
diff --git a/usr.bin/mail/collect.c b/usr.bin/mail/collect.c
index cbee1730d5e..1ad6274da1e 100644
--- a/usr.bin/mail/collect.c
+++ b/usr.bin/mail/collect.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: collect.c,v 1.17 1998/06/12 18:07:54 millert Exp $	*/
+/*	$OpenBSD: collect.c,v 1.18 2000/04/26 15:47:30 millert Exp $	*/
 /*	$NetBSD: collect.c,v 1.9 1997/07/09 05:25:45 mikel Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)collect.c	8.2 (Berkeley) 4/19/94";
 #else
-static char rcsid[] = "$OpenBSD: collect.c,v 1.17 1998/06/12 18:07:54 millert Exp $";
+static char rcsid[] = "$OpenBSD: collect.c,v 1.18 2000/04/26 15:47:30 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -589,7 +589,7 @@ forward(ms, fp, fn, f)
 
 		touch(mp);
 		printf(" %d", *msgvec);
-		if (send(mp, fp, ig, tabst) < 0) {
+		if (sendmessage(mp, fp, ig, tabst) < 0) {
 			warn(fn);
 			return(-1);
 		}
diff --git a/usr.bin/mail/extern.h b/usr.bin/mail/extern.h
index 36b04e4acc3..84b01d5b07c 100644
--- a/usr.bin/mail/extern.h
+++ b/usr.bin/mail/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.13 2000/04/25 16:42:22 millert Exp $	*/
+/*	$OpenBSD: extern.h,v 1.14 2000/04/26 15:47:31 millert Exp $	*/
 /*	$NetBSD: extern.h,v 1.7 1997/07/09 05:22:00 mikel Exp $	*/
 
 /*-
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.2 (Berkeley) 4/20/95
- *	$OpenBSD: extern.h,v 1.13 2000/04/25 16:42:22 millert Exp $
+ *	$OpenBSD: extern.h,v 1.14 2000/04/26 15:47:31 millert Exp $
  */
 
 struct name;
@@ -227,7 +227,7 @@ void	 scaninit __P((void));
 int	 schdir __P((void *));
 int	 screensize __P((void));
 int	 scroll __P((void *));
-int	 send __P((struct message *, FILE *, struct ignoretab *, char *));
+int	 sendmessage __P((struct message *, FILE *, struct ignoretab *, char *));
 int	 sendmail __P((void *));
 int	 set __P((void *));
 int	 setfile __P((char *));
diff --git a/usr.bin/mail/quit.c b/usr.bin/mail/quit.c
index bcf8ffb1212..310fc71a753 100644
--- a/usr.bin/mail/quit.c
+++ b/usr.bin/mail/quit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: quit.c,v 1.11 1998/09/10 16:18:37 millert Exp $	*/
+/*	$OpenBSD: quit.c,v 1.12 2000/04/26 15:47:31 millert Exp $	*/
 /*	$NetBSD: quit.c,v 1.6 1996/12/28 07:11:07 tls Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)quit.c	8.2 (Berkeley) 4/28/95";
 #else
-static char rcsid[] = "$OpenBSD: quit.c,v 1.11 1998/09/10 16:18:37 millert Exp $";
+static char rcsid[] = "$OpenBSD: quit.c,v 1.12 2000/04/26 15:47:31 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -269,7 +269,7 @@ quit()
 	}
 	for (mp = &message[0]; mp < &message[msgCount]; mp++)
 		if (mp->m_flag & MBOX)
-			if (send(mp, obuf, saveignore, NULL) < 0) {
+			if (sendmessage(mp, obuf, saveignore, NULL) < 0) {
 				warn(mbox);
 				(void)Fclose(ibuf);
 				(void)Fclose(obuf);
@@ -382,7 +382,7 @@ writeback(res)
 	for (mp = &message[0]; mp < &message[msgCount]; mp++)
 		if ((mp->m_flag&MPRESERVE)||(mp->m_flag&MTOUCH)==0) {
 			p++;
-			if (send(mp, obuf, (struct ignoretab *)0, NULL) < 0) {
+			if (sendmessage(mp, obuf, NULL, NULL) < 0) {
 				warn(mailname);
 				(void)Fclose(obuf);
 				return(-1);
@@ -494,7 +494,7 @@ edstop()
 		if ((mp->m_flag & MDELETED) != 0)
 			continue;
 		c++;
-		if (send(mp, obuf, (struct ignoretab *) NULL, NULL) < 0) {
+		if (sendmessage(mp, obuf, NULL, NULL) < 0) {
 			warn(mailname);
 			relsesigs();
 			reset(0);
diff --git a/usr.bin/mail/send.c b/usr.bin/mail/send.c
index d1a3933bd0f..df12fe6d35e 100644
--- a/usr.bin/mail/send.c
+++ b/usr.bin/mail/send.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: send.c,v 1.9 1997/11/14 00:23:57 millert Exp $	*/
+/*	$OpenBSD: send.c,v 1.10 2000/04/26 15:47:31 millert Exp $	*/
 /*	$NetBSD: send.c,v 1.6 1996/06/08 19:48:39 christos Exp $	*/
 
 /*
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)send.c	8.1 (Berkeley) 6/6/93";
 #else
-static char rcsid[] = "$OpenBSD: send.c,v 1.9 1997/11/14 00:23:57 millert Exp $";
+static char rcsid[] = "$OpenBSD: send.c,v 1.10 2000/04/26 15:47:31 millert Exp $";
 #endif
 #endif /* not lint */
 
@@ -59,7 +59,7 @@ static char rcsid[] = "$OpenBSD: send.c,v 1.9 1997/11/14 00:23:57 millert Exp $"
  * prefix is a string to prepend to each output line.
  */
 int
-send(mp, obuf, doign, prefix)
+sendmessage(mp, obuf, doign, prefix)
 	struct message *mp;
 	FILE *obuf;
 	struct ignoretab *doign;