[src/trunk]: src/usr.bin/mail Rename send() to sendmessage() to avoid conflic...

[tron <tron%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2b08da9c519b
branches:  trunk
changeset: 481960:2b08da9c519b
user:      tron <tron%NetBSD.org@localhost>
date:      Thu Feb 10 12:34:42 2000 +0000

description:
Rename send() to sendmessage() to avoid conflict with send(2) in "libc".
Patch supplied by Geoff Adams in PR bin/9385.

diffstat:

 usr.bin/mail/cmd1.c    |   6 +++---
 usr.bin/mail/cmd2.c    |   6 +++---
 usr.bin/mail/collect.c |   6 +++---
 usr.bin/mail/extern.h  |   6 +++---
 usr.bin/mail/quit.c    |  10 +++++-----
 usr.bin/mail/send.c    |   6 +++---
 6 files changed, 20 insertions(+), 20 deletions(-)

diffs (180 lines):

diff -r a37d9f294020 -r 2b08da9c519b usr.bin/mail/cmd1.c
--- a/usr.bin/mail/cmd1.c       Thu Feb 10 12:33:45 2000 +0000
+++ b/usr.bin/mail/cmd1.c       Thu Feb 10 12:34:42 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cmd1.c,v 1.12 1999/02/09 04:51:30 dean Exp $   */
+/*     $NetBSD: cmd1.c,v 1.13 2000/02/10 12:34:42 tron Exp $   */
 
 /*-
  * Copyright (c) 1980, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)cmd1.c     8.2 (Berkeley) 4/20/95";
 #else
-__RCSID("$NetBSD: cmd1.c,v 1.12 1999/02/09 04:51:30 dean Exp $");
+__RCSID("$NetBSD: cmd1.c,v 1.13 2000/02/10 12:34:42 tron Exp $");
 #endif
 #endif /* not lint */
 
@@ -349,7 +349,7 @@
                dot = mp;
                if (value("quiet") == NOSTR)
                        fprintf(obuf, "Message %d:\n", *ip);
-               (void) send(mp, obuf, doign ? ignore : 0, NOSTR);
+               (void) sendmessage(mp, obuf, doign ? ignore : 0, NOSTR);
        }
 close_pipe:
        if (obuf != stdout) {
diff -r a37d9f294020 -r 2b08da9c519b usr.bin/mail/cmd2.c
--- a/usr.bin/mail/cmd2.c       Thu Feb 10 12:33:45 2000 +0000
+++ b/usr.bin/mail/cmd2.c       Thu Feb 10 12:34:42 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cmd2.c,v 1.9 1998/12/19 16:31:41 christos Exp $        */
+/*     $NetBSD: cmd2.c,v 1.10 2000/02/10 12:34:43 tron Exp $   */
 
 /*
  * Copyright (c) 1980, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)cmd2.c     8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: cmd2.c,v 1.9 1998/12/19 16:31:41 christos Exp $");
+__RCSID("$NetBSD: cmd2.c,v 1.10 2000/02/10 12:34:43 tron Exp $");
 #endif
 #endif /* not lint */
 
@@ -203,7 +203,7 @@
        for (ip = msgvec; *ip && ip-msgvec < msgCount; ip++) {
                mp = &message[*ip - 1];
                touch(mp);
-               if (send(mp, obuf, ignore, NOSTR) < 0) {
+               if (sendmessage(mp, obuf, ignore, NOSTR) < 0) {
                        perror(file);
                        Fclose(obuf);
                        return(1);
diff -r a37d9f294020 -r 2b08da9c519b usr.bin/mail/collect.c
--- a/usr.bin/mail/collect.c    Thu Feb 10 12:33:45 2000 +0000
+++ b/usr.bin/mail/collect.c    Thu Feb 10 12:34:42 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: collect.c,v 1.19 1999/02/17 20:48:48 mjl Exp $ */
+/*     $NetBSD: collect.c,v 1.20 2000/02/10 12:34:43 tron Exp $        */
 
 /*
  * Copyright (c) 1980, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)collect.c  8.2 (Berkeley) 4/19/94";
 #else
-__RCSID("$NetBSD: collect.c,v 1.19 1999/02/17 20:48:48 mjl Exp $");
+__RCSID("$NetBSD: collect.c,v 1.20 2000/02/10 12:34:43 tron Exp $");
 #endif
 #endif /* not lint */
 
@@ -641,7 +641,7 @@
 
                touch(mp);
                printf(" %d", *msgvec);
-               if (send(mp, fp, ig, tabst) < 0) {
+               if (sendmessage(mp, fp, ig, tabst) < 0) {
                        perror(tempMail);
                        return(-1);
                }
diff -r a37d9f294020 -r 2b08da9c519b usr.bin/mail/extern.h
--- a/usr.bin/mail/extern.h     Thu Feb 10 12:33:45 2000 +0000
+++ b/usr.bin/mail/extern.h     Thu Feb 10 12:34:42 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: extern.h,v 1.10 1998/10/08 17:36:55 wsanchez Exp $     */
+/*     $NetBSD: extern.h,v 1.11 2000/02/10 12:34:43 tron Exp $ */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -33,7 +33,7 @@
  * SUCH DAMAGE.
  *
  *     @(#)extern.h    8.2 (Berkeley) 4/20/95 
- *     $NetBSD: extern.h,v 1.10 1998/10/08 17:36:55 wsanchez Exp $
+ *     $NetBSD: extern.h,v 1.11 2000/02/10 12:34:43 tron Exp $
  */
 
 struct name;
@@ -224,7 +224,7 @@
 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 -r a37d9f294020 -r 2b08da9c519b usr.bin/mail/quit.c
--- a/usr.bin/mail/quit.c       Thu Feb 10 12:33:45 2000 +0000
+++ b/usr.bin/mail/quit.c       Thu Feb 10 12:34:42 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: quit.c,v 1.10 1997/12/07 21:27:10 bad Exp $    */
+/*     $NetBSD: quit.c,v 1.11 2000/02/10 12:34:43 tron Exp $   */
 
 /*
  * Copyright (c) 1980, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)quit.c     8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: quit.c,v 1.10 1997/12/07 21:27:10 bad Exp $");
+__RCSID("$NetBSD: quit.c,v 1.11 2000/02/10 12:34:43 tron Exp $");
 #endif
 #endif /* not lint */
 
@@ -275,7 +275,7 @@
        }
        for (mp = &message[0]; mp < &message[msgCount]; mp++)
                if (mp->m_flag & MBOX)
-                       if (send(mp, obuf, saveignore, NOSTR) < 0) {
+                       if (sendmessage(mp, obuf, saveignore, NOSTR) < 0) {
                                perror(mbox);
                                Fclose(ibuf);
                                Fclose(obuf);
@@ -404,7 +404,7 @@
        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, NOSTR) < 0) {
+                       if (sendmessage(mp, obuf, (struct ignoretab *)0, NOSTR) < 0) {
                                perror(mailname);
                                Fclose(obuf);
                                return(-1);
@@ -525,7 +525,7 @@
                if ((mp->m_flag & MDELETED) != 0)
                        continue;
                c++;
-               if (send(mp, obuf, (struct ignoretab *) NULL, NOSTR) < 0) {
+               if (sendmessage(mp, obuf, (struct ignoretab *) NULL, NOSTR) < 0) {
                        perror(mailname);
                        relsesigs();
                        reset(0);
diff -r a37d9f294020 -r 2b08da9c519b usr.bin/mail/send.c
--- a/usr.bin/mail/send.c       Thu Feb 10 12:33:45 2000 +0000
+++ b/usr.bin/mail/send.c       Thu Feb 10 12:34:42 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: send.c,v 1.10 1998/12/19 16:34:38 christos Exp $       */
+/*     $NetBSD: send.c,v 1.11 2000/02/10 12:34:44 tron Exp $   */
 
 /*
  * Copyright (c) 1980, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)send.c     8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: send.c,v 1.10 1998/12/19 16:34:38 christos Exp $");
+__RCSID("$NetBSD: send.c,v 1.11 2000/02/10 12:34:44 tron Exp $");
 #endif
 #endif /* not lint */
 
@@ -59,7 +59,7 @@
  * 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;