avoid aliasing against libc symbols

5 files changed, 19 insertions, 19 deletions

diff --git a/usr.bin/mail/aux.c b/usr.bin/mail/aux.c
index 16f2781c19d..6152515e2e1 100644
--- a/usr.bin/mail/aux.c
+++ b/usr.bin/mail/aux.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aux.c,v 1.21 2003/06/03 02:56:11 millert Exp $	*/
+/*	$OpenBSD: aux.c,v 1.22 2004/09/15 22:21:40 deraadt Exp $	*/
 /*	$NetBSD: aux.c,v 1.5 1997/05/13 06:15:52 mikel Exp $	*/
 
 /*
@@ -34,7 +34,7 @@
 #if 0
 static const char sccsid[] = "@(#)aux.c	8.1 (Berkeley) 6/6/93";
 #else
-static const char rcsid[] = "$OpenBSD: aux.c,v 1.21 2003/06/03 02:56:11 millert Exp $";
+static const char rcsid[] = "$OpenBSD: aux.c,v 1.22 2004/09/15 22:21:40 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -603,7 +603,7 @@ charcount(char *str, int c)
  * Convert c to upper case
  */
 int
-raise(int c)
+chraise(int c)
 {
 
 	if (islower(c))
diff --git a/usr.bin/mail/cmd2.c b/usr.bin/mail/cmd2.c
index 72a4cbe16e6..8eaaa029ab3 100644
--- a/usr.bin/mail/cmd2.c
+++ b/usr.bin/mail/cmd2.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmd2.c,v 1.14 2004/05/10 12:10:50 millert Exp $	*/
+/*	$OpenBSD: cmd2.c,v 1.15 2004/09/15 22:21:40 deraadt Exp $	*/
 /*	$NetBSD: cmd2.c,v 1.7 1997/05/17 19:55:10 pk Exp $	*/
 
 /*
@@ -34,7 +34,7 @@
 #if 0
 static const char sccsid[] = "@(#)cmd2.c	8.1 (Berkeley) 6/6/93";
 #else
-static const char rcsid[] = "$OpenBSD: cmd2.c,v 1.14 2004/05/10 12:10:50 millert Exp $";
+static const char rcsid[] = "$OpenBSD: cmd2.c,v 1.15 2004/09/15 22:21:40 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -256,7 +256,7 @@ snarf(char *linebuf, int *flag)
  * Delete messages.
  */
 int
-delete(void *v)
+deletecmd(void *v)
 {
 	int *msgvec = v;
 
diff --git a/usr.bin/mail/cmdtab.c b/usr.bin/mail/cmdtab.c
index 1f0965beb6a..62b93ac3f1c 100644
--- a/usr.bin/mail/cmdtab.c
+++ b/usr.bin/mail/cmdtab.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cmdtab.c,v 1.9 2004/05/10 12:10:50 millert Exp $	*/
+/*	$OpenBSD: cmdtab.c,v 1.10 2004/09/15 22:21:40 deraadt Exp $	*/
 /*	$NetBSD: cmdtab.c,v 1.7 1996/12/28 07:10:59 tls Exp $	*/
 
 /*
@@ -34,7 +34,7 @@
 #if 0
 static const char sccsid[] = "@(#)cmdtab.c	8.2 (Berkeley) 4/20/95";
 #else
-static const char rcsid[] = "$OpenBSD: cmdtab.c,v 1.9 2004/05/10 12:10:50 millert Exp $";
+static const char rcsid[] = "$OpenBSD: cmdtab.c,v 1.10 2004/09/15 22:21:40 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -61,7 +61,7 @@ const struct cmd cmdtab[] = {
 	{ "top",	{ top },	MSGLIST,	0,	MMNDEL },
 	{ "touch",	{ stouch },	W|MSGLIST,	0,	MMNDEL },
 	{ "preserve",	{ preserve },	W|MSGLIST,	0,	MMNDEL },
-	{ "delete",	{ delete },	W|P|MSGLIST,	0,	MMNDEL },
+	{ "delete",	{ deletecmd },	W|P|MSGLIST,	0,	MMNDEL },
 	{ "dp",		{ deltype },	W|MSGLIST,	0,	MMNDEL },
 	{ "dt",		{ deltype },	W|MSGLIST,	0,	MMNDEL },
 	{ "undelete",	{ undeletecmd }, P|MSGLIST,	MDELETED,MMNDEL },
diff --git a/usr.bin/mail/extern.h b/usr.bin/mail/extern.h
index b766e8e7e8e..672a059b0fc 100644
--- a/usr.bin/mail/extern.h
+++ b/usr.bin/mail/extern.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: extern.h,v 1.22 2004/05/10 12:10:50 millert Exp $	*/
+/*	$OpenBSD: extern.h,v 1.23 2004/09/15 22:21:40 deraadt Exp $	*/
 /*	$NetBSD: extern.h,v 1.7 1997/07/09 05:22:00 mikel Exp $	*/
 
 /*-
@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)extern.h	8.2 (Berkeley) 4/20/95
- *	$OpenBSD: extern.h,v 1.22 2004/05/10 12:10:50 millert Exp $
+ *	$OpenBSD: extern.h,v 1.23 2004/09/15 22:21:40 deraadt Exp $
  */
 
 struct name;
@@ -101,7 +101,7 @@ void	 commands(void);
 int	 copycmd(void *);
 int	 core(void *);
 int	 count(struct name *);
-int	 delete(void *);
+int	 deletecmd(void *);
 int	 delm(int *);
 int	 deltype(void *);
 void	 demail(void);
@@ -200,7 +200,7 @@ int	 putline(FILE *, char *, int);
 int	 pversion(void *);
 int	 quit(void);
 int	 quitcmd(void *);
-int	 raise(int);
+int	 chraise(int);
 int	 readline(FILE *, char *, int, int *);
 void	 register_file(FILE *, int, pid_t);
 void	 regret(int);
diff --git a/usr.bin/mail/list.c b/usr.bin/mail/list.c
index 91d42d13ee1..4bfaff919b0 100644
--- a/usr.bin/mail/list.c
+++ b/usr.bin/mail/list.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: list.c,v 1.14 2003/10/13 00:46:08 tedu Exp $	*/
+/*	$OpenBSD: list.c,v 1.15 2004/09/15 22:21:40 deraadt Exp $	*/
 /*	$NetBSD: list.c,v 1.7 1997/07/09 05:23:36 mikel Exp $	*/
 
 /*
@@ -34,7 +34,7 @@
 #if 0
 static const char sccsid[] = "@(#)list.c	8.4 (Berkeley) 5/1/95";
 #else
-static const char rcsid[] = "$OpenBSD: list.c,v 1.14 2003/10/13 00:46:08 tedu Exp $";
+static const char rcsid[] = "$OpenBSD: list.c,v 1.15 2004/09/15 22:21:40 deraadt Exp $";
 #endif
 #endif /* not lint */
 
@@ -658,7 +658,7 @@ matchsender(char *str, int mesg)
 	while (*cp2) {
 		if (*cp == 0)
 			return(1);
-		if (raise(*cp++) != raise(*cp2++)) {
+		if (chraise(*cp++) != chraise(*cp2++)) {
 			cp2 = ++backup;
 			cp = str;
 		}
@@ -693,7 +693,7 @@ matchto(char *str, int mesg)
 			while (*cp2) {
 				if (*cp == 0)
 					return(1);
-				if (raise(*cp++) != raise(*cp2++)) {
+				if (chraise(*cp++) != chraise(*cp2++)) {
 					cp2 = ++backup;
 					cp = str;
 				}
@@ -732,7 +732,7 @@ matchsubj(char *str, int mesg)
 	 */
 	if (value("searchheaders") && (cp = strchr(str, ':'))) {
 		/* Check for special case "/To:" */
-		if (raise(str[0]) == 'T' && raise(str[1]) == 'O' &&
+		if (chraise(str[0]) == 'T' && chraise(str[1]) == 'O' &&
 		    str[2] == ':')
 			return(matchto(cp, mesg));
 		*cp++ = '\0';
@@ -749,7 +749,7 @@ matchsubj(char *str, int mesg)
 	while (*cp2) {
 		if (*cp == 0)
 			return(1);
-		if (raise(*cp++) != raise(*cp2++)) {
+		if (chraise(*cp++) != chraise(*cp2++)) {
 			cp2 = ++backup;
 			cp = str;
 		}