summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordaniel <daniel@openbsd.org>2020-12-15 00:50:01 +0000
committerdaniel <daniel@openbsd.org>2020-12-15 00:50:01 +0000
commit0f2746abbdaa0d3a63cfb46966d98b9a75224ef1 (patch)
tree37a267cd118ed8c94b4c181930e8a1e7b8dc3ce2
parentthe names com1 to com9 are reserved filenames on windows (diff)
downloadwireguard-openbsd-0f2746abbdaa0d3a63cfb46966d98b9a75224ef1.tar.xz
wireguard-openbsd-0f2746abbdaa0d3a63cfb46966d98b9a75224ef1.zip
the name aux is a reserved filename on windows
NetBSD renamed this file to support.c in 2001, while FreeBSD chose to rename this file to util.c in 2009. We go the FreeBSD route and pick util.c since our implementation is closer to the FreeBSD codebase. Helps get us closer to being able to check out OpenBSD source code on Windows as requested by John Carmack. This issue thoroughly researched by jsg@ ok deraadt@, sthen@, "go ahead" jsg@
-rw-r--r--usr.bin/mail/Makefile6
-rw-r--r--usr.bin/mail/util.c (renamed from usr.bin/mail/aux.c)2
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/mail/Makefile b/usr.bin/mail/Makefile
index 0cddfaf4ba9..e2313ca24a3 100644
--- a/usr.bin/mail/Makefile
+++ b/usr.bin/mail/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.12 2018/09/16 02:38:57 millert Exp $
+# $OpenBSD: Makefile,v 1.13 2020/12/15 00:50:01 daniel Exp $
PROG= mail
-SRCS= version.c aux.c cmd1.c cmd2.c cmd3.c cmdtab.c collect.c \
+SRCS= version.c cmd1.c cmd2.c cmd3.c cmdtab.c collect.c \
edit.c fio.c head.c v7.local.c lex.c list.c main.c names.c \
- popen.c quit.c send.c strings.c temp.c tty.c vars.c
+ popen.c quit.c send.c strings.c temp.c tty.c util.c vars.c
SFILES= mail.help mail.tildehelp
EFILES= mail.rc
LINKS= ${BINDIR}/mail ${BINDIR}/Mail ${BINDIR}/mail ${BINDIR}/mailx
diff --git a/usr.bin/mail/aux.c b/usr.bin/mail/util.c
index 5abe474d61a..e6c03342990 100644
--- a/usr.bin/mail/aux.c
+++ b/usr.bin/mail/util.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: aux.c,v 1.31 2019/06/28 13:35:01 deraadt Exp $ */
+/* $OpenBSD: util.c,v 1.1 2020/12/15 00:50:01 daniel Exp $ */
/* $NetBSD: aux.c,v 1.5 1997/05/13 06:15:52 mikel Exp $ */
/*