summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-01-31 21:52:01 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-01-31 21:52:01 +0000
commit3c06f6a0b234822c7b2d6c63ef1aaf554af7167b (patch)
tree86e5fe626cb9cbade752baf2440badfa19976200
parentbf75776d415126a415ac92fb767c70dc67feba4f (diff)
- (bal) Reorder. Move all bsd-*, fake-*, next-*, and cygwin* stuff to
openbsd-compat/. And resolve all ./configure and Makefile.in issues assocated. Logic: * All OpenBSD functions should have the same filename as in the OpenBSD tree * All 'home brew' functions have bsd-* infront of them. * All 'not really implemented' functions have fake-* infront of them.
-rw-r--r--ChangeLog9
-rw-r--r--Makefile.in15
-rw-r--r--configure.in2
-rw-r--r--includes.h4
-rw-r--r--openbsd-compat/Makefile.in33
-rw-r--r--openbsd-compat/base64.c (renamed from bsd-base64.c)2
-rw-r--r--openbsd-compat/base64.h (renamed from bsd-base64.h)0
-rw-r--r--openbsd-compat/bindresvport.c (renamed from bsd-bindresvport.c)0
-rw-r--r--openbsd-compat/bindresvport.h (renamed from bsd-bindresvport.h)0
-rw-r--r--openbsd-compat/bsd-arc4random.c (renamed from bsd-arc4random.c)0
-rw-r--r--openbsd-compat/bsd-arc4random.h (renamed from bsd-arc4random.h)0
-rw-r--r--openbsd-compat/bsd-cygwin_util.c (renamed from cygwin_util.c)0
-rw-r--r--openbsd-compat/bsd-cygwin_util.h (renamed from cygwin_util.h)0
-rw-r--r--openbsd-compat/bsd-misc.c (renamed from bsd-misc.c)0
-rw-r--r--openbsd-compat/bsd-misc.h (renamed from bsd-misc.h)0
-rw-r--r--openbsd-compat/bsd-nextstep.c (renamed from next-posix.c)0
-rw-r--r--openbsd-compat/bsd-nextstep.h (renamed from next-posix.h)0
-rw-r--r--openbsd-compat/bsd-snprintf.c (renamed from bsd-snprintf.c)0
-rw-r--r--openbsd-compat/bsd-snprintf.h (renamed from bsd-snprintf.h)0
-rw-r--r--openbsd-compat/bsd-waitpid.c (renamed from bsd-waitpid.c)0
-rw-r--r--openbsd-compat/bsd-waitpid.h (renamed from bsd-waitpid.h)0
-rw-r--r--openbsd-compat/daemon.c (renamed from bsd-daemon.c)0
-rw-r--r--openbsd-compat/daemon.h (renamed from bsd-daemon.h)0
-rw-r--r--openbsd-compat/fake-gai-errnos.h (renamed from fake-gai-errnos.h)0
-rw-r--r--openbsd-compat/fake-getaddrinfo.c (renamed from fake-getaddrinfo.c)0
-rw-r--r--openbsd-compat/fake-getaddrinfo.h (renamed from fake-getaddrinfo.h)0
-rw-r--r--openbsd-compat/fake-getnameinfo.c (renamed from fake-getnameinfo.c)0
-rw-r--r--openbsd-compat/fake-getnameinfo.h (renamed from fake-getnameinfo.h)0
-rw-r--r--openbsd-compat/fake-regex.h (renamed from fake-regex.h)0
-rw-r--r--openbsd-compat/fake-socket.h (renamed from fake-socket.h)0
-rw-r--r--openbsd-compat/getcwd.c (renamed from bsd-getcwd.c)0
-rw-r--r--openbsd-compat/getcwd.h (renamed from bsd-getcwd.h)0
-rw-r--r--openbsd-compat/getgrouplist.c (renamed from bsd-getgrouplist.c)0
-rw-r--r--openbsd-compat/getgrouplist.h (renamed from bsd-getgrouplist.h)0
-rw-r--r--openbsd-compat/inet_aton.c (renamed from bsd-inet_aton.c)0
-rw-r--r--openbsd-compat/inet_aton.h (renamed from bsd-inet_aton.h)0
-rw-r--r--openbsd-compat/inet_ntoa.c (renamed from bsd-inet_ntoa.c)0
-rw-r--r--openbsd-compat/inet_ntoa.h (renamed from bsd-inet_ntoa.h)0
-rw-r--r--openbsd-compat/mktemp.c (renamed from bsd-mktemp.c)0
-rw-r--r--openbsd-compat/mktemp.h (renamed from bsd-mktemp.h)0
-rw-r--r--openbsd-compat/openbsd-compat.h37
-rw-r--r--openbsd-compat/queue.h (renamed from bsd-queue.h)0
-rw-r--r--openbsd-compat/realpath.c (renamed from bsd-realpath.c)0
-rw-r--r--openbsd-compat/realpath.h (renamed from bsd-realpath.h)0
-rw-r--r--openbsd-compat/rresvport.c (renamed from bsd-rresvport.c)0
-rw-r--r--openbsd-compat/rresvport.h (renamed from bsd-rresvport.h)0
-rw-r--r--openbsd-compat/setenv.c (renamed from bsd-setenv.c)0
-rw-r--r--openbsd-compat/setenv.h (renamed from bsd-setenv.h)0
-rw-r--r--openbsd-compat/setproctitle.c (renamed from bsd-setproctitle.c)0
-rw-r--r--openbsd-compat/setproctitle.h (renamed from bsd-setproctitle.h)0
-rw-r--r--openbsd-compat/sigaction.c (renamed from bsd-sigaction.c)2
-rw-r--r--openbsd-compat/sigaction.h (renamed from bsd-sigaction.h)0
-rw-r--r--openbsd-compat/strlcat.c (renamed from bsd-strlcat.c)0
-rw-r--r--openbsd-compat/strlcat.h (renamed from bsd-strlcat.h)0
-rw-r--r--openbsd-compat/strlcpy.c (renamed from bsd-strlcpy.c)0
-rw-r--r--openbsd-compat/strlcpy.h (renamed from bsd-strlcpy.h)0
-rw-r--r--openbsd-compat/strmode.c (renamed from bsd-strmode.c)0
-rw-r--r--openbsd-compat/strmode.h (renamed from bsd-strmode.h)0
-rw-r--r--openbsd-compat/strsep.c (renamed from bsd-strsep.c)0
-rw-r--r--openbsd-compat/strsep.h (renamed from bsd-strsep.h)0
-rw-r--r--openbsd-compat/strtok.c (renamed from bsd-strtok.c)0
-rw-r--r--openbsd-compat/strtok.h (renamed from bsd-strtok.h)0
-rw-r--r--openbsd-compat/vis.c (renamed from bsd-vis.c)0
-rw-r--r--openbsd-compat/vis.h (renamed from bsd-vis.h)0
64 files changed, 88 insertions, 16 deletions
diff --git a/ChangeLog b/ChangeLog
index 7ac2bf35..d50091bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-20000131
+20010131
- (djm) OpenBSD CVS Sync:
- djm@cvs.openbsd.org 2001/01/30 15:48:53
[sshconnect.c]
@@ -8,8 +8,11 @@
respectively.
- (djm) Don't log SSH2 PAM KbdInt responses to debug, they may contain
passwords.
+ - (bal) Reorder. Move all bsd-*, fake-*, next-*, and cygwin* stuff to
+ openbsd-compat/. And resolve all ./configure and Makefile.in issues
+ assocated.
-20000130
+20010130
- (djm) OpenBSD CVS Sync:
- markus@cvs.openbsd.org 2001/01/29 09:55:37
[channels.c channels.h clientloop.c serverloop.c]
@@ -26,7 +29,7 @@
Allow invocation of sybsystem by commandline (-s); ok markus@
- (stevesk) configure.in: remove duplicate PROG_LS
-20000129
+20010129
- (stevesk) sftp-server.c: use %lld vs. %qd
20010128
diff --git a/Makefile.in b/Makefile.in
index 58d67a5d..063fa5c7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -19,7 +19,7 @@ CC=@CC@
LD=@LD@
PATHS=-DETCDIR=\"$(sysconfdir)\" -D_PATH_SSH_PROGRAM=\"$(SSH_PROGRAM)\" -D_PATH_SSH_ASKPASS_DEFAULT=\"$(ASKPASS_PROGRAM)\"
CFLAGS=@CFLAGS@
-CPPFLAGS=@CPPFLAGS@ -I. -I$(srcdir) $(PATHS) @DEFS@
+CPPFLAGS=@CPPFLAGS@ -I. -Iopenbsd-compat/ -I$(srcdir) $(PATHS) @DEFS@
LIBS=@LIBS@
AR=@AR@
RANLIB=@RANLIB@
@@ -27,7 +27,7 @@ INSTALL=@INSTALL@
PERL=@PERL@
ENT=@ENT@
XAUTH_PATH=@XAUTH_PATH@
-LDFLAGS=-L. @LDFLAGS@
+LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@
EXEEXT=@EXEEXT@
SSH_MODE= @SSHMODE@
@@ -37,9 +37,7 @@ INSTALL_SSH_PRNG_CMDS=@INSTALL_SSH_PRNG_CMDS@
TARGETS=ssh$(EXEEXT) sshd$(EXEEXT) ssh-add$(EXEEXT) ssh-keygen$(EXEEXT) ssh-keyscan${EXEEXT} ssh-agent$(EXEEXT) scp$(EXEEXT) $(SFTP-SERVER)
-LIBSSH_OBJS=atomicio.o authfd.o authfile.o bufaux.o buffer.o canohost.o channels.o cipher.o cli.o compat.o compress.o crc32.o cygwin_util.o deattack.o dispatch.o hmac.o hostfile.o key.o kex.o log.o match.o misc.o mpaux.o nchan.o packet.o radix.o rijndael.o entropy.o readpass.o rsa.o ssh-dss.o ssh-rsa.o tildexpand.o ttymodes.o uidswap.o uuencode.o xmalloc.o
-
-LIBOPENBSD_COMPAT_OBJS=bsd-arc4random.o bsd-base64.o bsd-bindresvport.o bsd-daemon.o bsd-getcwd.o bsd-getgrouplist.o bsd-inet_aton.o bsd-inet_ntoa.o bsd-misc.o bsd-mktemp.o bsd-realpath.o bsd-rresvport.o bsd-setenv.o bsd-sigaction.o bsd-snprintf.o bsd-strlcat.o bsd-strlcpy.o bsd-strmode.o bsd-strsep.o bsd-strtok.o bsd-vis.o bsd-setproctitle.o bsd-waitpid.o fake-getaddrinfo.o fake-getnameinfo.o next-posix.o
+LIBSSH_OBJS=atomicio.o authfd.o authfile.o bufaux.o buffer.o canohost.o channels.o cipher.o cli.o compat.o compress.o crc32.o deattack.o dispatch.o hmac.o hostfile.o key.o kex.o log.o match.o misc.o mpaux.o nchan.o packet.o radix.o rijndael.o entropy.o readpass.o rsa.o ssh-dss.o ssh-rsa.o tildexpand.o ttymodes.o uidswap.o uuencode.o xmalloc.o
SSHOBJS= ssh.o sshconnect.o sshconnect1.o sshconnect2.o log-client.o readconf.o clientloop.o
@@ -79,9 +77,8 @@ $(LIBOPENBSD_COMPAT_OBJS): config.h
.c.o:
$(CC) $(CFLAGS) $(CPPFLAGS) -c $<
-libopenbsd-compat.a: $(LIBOPENBSD_COMPAT_OBJS)
- $(AR) rv $@ $(LIBOPENBSD_COMPAT_OBJS)
- $(RANLIB) $@
+libopenbsd-compat.a:
+ (cd openbsd-compat; make)
libssh.a: $(LIBSSH_OBJS)
$(AR) rv $@ $(LIBSSH_OBJS)
@@ -119,10 +116,12 @@ $(MANPAGES) $(CONFIGFILES)::
$(FIXPATHSCMD) $(srcdir)/$@
clean:
+ (cd openbsd-compat; make clean)
rm -f *.o *.a $(TARGETS) logintest config.cache config.log
rm -f *.out core
distclean: clean
+ (cd openbsd-compat; make distclean)
rm -f Makefile config.h config.status ssh_prng_cmds *~
mrproper: distclean
diff --git a/configure.in b/configure.in
index d9f59a31..9913442a 100644
--- a/configure.in
+++ b/configure.in
@@ -1641,7 +1641,7 @@ fi
AC_EXEEXT
-AC_OUTPUT(Makefile ssh_prng_cmds)
+AC_OUTPUT(Makefile openbsd-compat/Makefile ssh_prng_cmds)
# Print summary of options
diff --git a/includes.h b/includes.h
index 18693c7f..ac83a12f 100644
--- a/includes.h
+++ b/includes.h
@@ -21,7 +21,7 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
#include "config.h"
-#include "next-posix.h"
+#include "bsd-nextstep.h"
#include <sys/types.h>
#include <sys/socket.h>
@@ -95,7 +95,7 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg }
#endif
#include "version.h"
#include "openbsd-compat.h"
-#include "cygwin_util.h"
+#include "bsd-cygwin_util.h"
#include "entropy.h"
#endif /* INCLUDES_H */
diff --git a/openbsd-compat/Makefile.in b/openbsd-compat/Makefile.in
new file mode 100644
index 00000000..1c745fb8
--- /dev/null
+++ b/openbsd-compat/Makefile.in
@@ -0,0 +1,33 @@
+sysconfdir=@sysconfdir@
+piddir=@piddir@
+srcdir=@srcdir@
+top_srcdir=@top_srcdir@
+
+CC=@CC@
+LD=@LD@
+CFLAGS=@CFLAGS@
+CPPFLAGS=@CPPFLAGS@ -I. -I.. -I$(srcdir) @DEFS@
+LIBS=@LIBS@
+AR=@AR@
+RANLIB=@RANLIB@
+INSTALL=@INSTALL@
+LDFLAGS=-L. @LDFLAGS@
+
+OPENBSD=base64.o bindresvport.o daemon.o getcwd.o getgrouplist.o inet_aton.o inet_ntoa.o mktemp.o realpath.o rresvport.o setenv.o setproctitle.o sigaction.o strlcat.o strlcpy.o strmode.o strsep.o strtok.o vis.o
+
+COMPAT=bsd-arc4random.o bsd-cygwin_util.o bsd-misc.o bsd-nextstep.o bsd-snprintf.o bsd-waitpid.o fake-getaddrinfo.o fake-getnameinfo.o
+
+
+all: libopenbsd-compat.a
+
+$(BSDCOMPAT): ../config.h
+
+libopenbsd-compat.a: $(COMPAT) $(OPENBSD)
+ $(AR) rv $@ $(COMPAT) $(OPENBSD)
+ $(RANLIB) $@
+
+clean:
+ rm -f *.o *.a core
+
+distclean: clean
+ rm -f Makefile *~
diff --git a/bsd-base64.c b/openbsd-compat/base64.c
index 8cbf8eee..d12b993b 100644
--- a/bsd-base64.c
+++ b/openbsd-compat/base64.c
@@ -58,7 +58,7 @@
#include <stdlib.h>
#include <string.h>
-#include "bsd-base64.h"
+#include "base64.h"
#define Assert(Cond) if (!(Cond)) abort()
diff --git a/bsd-base64.h b/openbsd-compat/base64.h
index c1d69dd6..c1d69dd6 100644
--- a/bsd-base64.h
+++ b/openbsd-compat/base64.h
diff --git a/bsd-bindresvport.c b/openbsd-compat/bindresvport.c
index 332bcb01..332bcb01 100644
--- a/bsd-bindresvport.c
+++ b/openbsd-compat/bindresvport.c
diff --git a/bsd-bindresvport.h b/openbsd-compat/bindresvport.h
index 6dbf8a2c..6dbf8a2c 100644
--- a/bsd-bindresvport.h
+++ b/openbsd-compat/bindresvport.h
diff --git a/bsd-arc4random.c b/openbsd-compat/bsd-arc4random.c
index c45459f5..c45459f5 100644
--- a/bsd-arc4random.c
+++ b/openbsd-compat/bsd-arc4random.c
diff --git a/bsd-arc4random.h b/openbsd-compat/bsd-arc4random.h
index 9819b848..9819b848 100644
--- a/bsd-arc4random.h
+++ b/openbsd-compat/bsd-arc4random.h
diff --git a/cygwin_util.c b/openbsd-compat/bsd-cygwin_util.c
index b540ebe1..b540ebe1 100644
--- a/cygwin_util.c
+++ b/openbsd-compat/bsd-cygwin_util.c
diff --git a/cygwin_util.h b/openbsd-compat/bsd-cygwin_util.h
index bf90d029..bf90d029 100644
--- a/cygwin_util.h
+++ b/openbsd-compat/bsd-cygwin_util.h
diff --git a/bsd-misc.c b/openbsd-compat/bsd-misc.c
index 2e59019b..2e59019b 100644
--- a/bsd-misc.c
+++ b/openbsd-compat/bsd-misc.c
diff --git a/bsd-misc.h b/openbsd-compat/bsd-misc.h
index e02c6678..e02c6678 100644
--- a/bsd-misc.h
+++ b/openbsd-compat/bsd-misc.h
diff --git a/next-posix.c b/openbsd-compat/bsd-nextstep.c
index 43ec0acd..43ec0acd 100644
--- a/next-posix.c
+++ b/openbsd-compat/bsd-nextstep.c
diff --git a/next-posix.h b/openbsd-compat/bsd-nextstep.h
index 3e16dacb..3e16dacb 100644
--- a/next-posix.h
+++ b/openbsd-compat/bsd-nextstep.h
diff --git a/bsd-snprintf.c b/openbsd-compat/bsd-snprintf.c
index 59fefbf2..59fefbf2 100644
--- a/bsd-snprintf.c
+++ b/openbsd-compat/bsd-snprintf.c
diff --git a/bsd-snprintf.h b/openbsd-compat/bsd-snprintf.h
index ed7a21c9..ed7a21c9 100644
--- a/bsd-snprintf.h
+++ b/openbsd-compat/bsd-snprintf.h
diff --git a/bsd-waitpid.c b/openbsd-compat/bsd-waitpid.c
index 0bf4c7cd..0bf4c7cd 100644
--- a/bsd-waitpid.c
+++ b/openbsd-compat/bsd-waitpid.c
diff --git a/bsd-waitpid.h b/openbsd-compat/bsd-waitpid.h
index 25c6e9c8..25c6e9c8 100644
--- a/bsd-waitpid.h
+++ b/openbsd-compat/bsd-waitpid.h
diff --git a/bsd-daemon.c b/openbsd-compat/daemon.c
index f704a904..f704a904 100644
--- a/bsd-daemon.c
+++ b/openbsd-compat/daemon.c
diff --git a/bsd-daemon.h b/openbsd-compat/daemon.h
index cd91ea07..cd91ea07 100644
--- a/bsd-daemon.h
+++ b/openbsd-compat/daemon.h
diff --git a/fake-gai-errnos.h b/openbsd-compat/fake-gai-errnos.h
index 27f6089e..27f6089e 100644
--- a/fake-gai-errnos.h
+++ b/openbsd-compat/fake-gai-errnos.h
diff --git a/fake-getaddrinfo.c b/openbsd-compat/fake-getaddrinfo.c
index 73c122ed..73c122ed 100644
--- a/fake-getaddrinfo.c
+++ b/openbsd-compat/fake-getaddrinfo.c
diff --git a/fake-getaddrinfo.h b/openbsd-compat/fake-getaddrinfo.h
index 7da87142..7da87142 100644
--- a/fake-getaddrinfo.h
+++ b/openbsd-compat/fake-getaddrinfo.h
diff --git a/fake-getnameinfo.c b/openbsd-compat/fake-getnameinfo.c
index 203621f0..203621f0 100644
--- a/fake-getnameinfo.c
+++ b/openbsd-compat/fake-getnameinfo.c
diff --git a/fake-getnameinfo.h b/openbsd-compat/fake-getnameinfo.h
index 0d25f427..0d25f427 100644
--- a/fake-getnameinfo.h
+++ b/openbsd-compat/fake-getnameinfo.h
diff --git a/fake-regex.h b/openbsd-compat/fake-regex.h
index 8f7f6edd..8f7f6edd 100644
--- a/fake-regex.h
+++ b/openbsd-compat/fake-regex.h
diff --git a/fake-socket.h b/openbsd-compat/fake-socket.h
index b51caa03..b51caa03 100644
--- a/fake-socket.h
+++ b/openbsd-compat/fake-socket.h
diff --git a/bsd-getcwd.c b/openbsd-compat/getcwd.c
index 273a0487..273a0487 100644
--- a/bsd-getcwd.c
+++ b/openbsd-compat/getcwd.c
diff --git a/bsd-getcwd.h b/openbsd-compat/getcwd.h
index bee73865..bee73865 100644
--- a/bsd-getcwd.h
+++ b/openbsd-compat/getcwd.h
diff --git a/bsd-getgrouplist.c b/openbsd-compat/getgrouplist.c
index f7a27c33..f7a27c33 100644
--- a/bsd-getgrouplist.c
+++ b/openbsd-compat/getgrouplist.c
diff --git a/bsd-getgrouplist.h b/openbsd-compat/getgrouplist.h
index ef9e6011..ef9e6011 100644
--- a/bsd-getgrouplist.h
+++ b/openbsd-compat/getgrouplist.h
diff --git a/bsd-inet_aton.c b/openbsd-compat/inet_aton.c
index 18e31e7f..18e31e7f 100644
--- a/bsd-inet_aton.c
+++ b/openbsd-compat/inet_aton.c
diff --git a/bsd-inet_aton.h b/openbsd-compat/inet_aton.h
index ec3c225c..ec3c225c 100644
--- a/bsd-inet_aton.h
+++ b/openbsd-compat/inet_aton.h
diff --git a/bsd-inet_ntoa.c b/openbsd-compat/inet_ntoa.c
index fe5539be..fe5539be 100644
--- a/bsd-inet_ntoa.c
+++ b/openbsd-compat/inet_ntoa.c
diff --git a/bsd-inet_ntoa.h b/openbsd-compat/inet_ntoa.h
index e3d48e4a..e3d48e4a 100644
--- a/bsd-inet_ntoa.h
+++ b/openbsd-compat/inet_ntoa.h
diff --git a/bsd-mktemp.c b/openbsd-compat/mktemp.c
index 9ed1bc80..9ed1bc80 100644
--- a/bsd-mktemp.c
+++ b/openbsd-compat/mktemp.c
diff --git a/bsd-mktemp.h b/openbsd-compat/mktemp.h
index faddc916..faddc916 100644
--- a/bsd-mktemp.h
+++ b/openbsd-compat/mktemp.h
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h
new file mode 100644
index 00000000..4758a9c5
--- /dev/null
+++ b/openbsd-compat/openbsd-compat.h
@@ -0,0 +1,37 @@
+#ifndef _OPENBSD_H
+#define _OPENBSD_H
+
+#include "config.h"
+
+/* OpenBSD function replacements */
+#include "bindresvport.h"
+#include "getcwd.h"
+#include "realpath.h"
+#include "rresvport.h"
+#include "strlcpy.h"
+#include "strlcat.h"
+#include "strmode.h"
+#include "mktemp.h"
+#include "daemon.h"
+#include "base64.h"
+#include "sigaction.h"
+#include "inet_aton.h"
+#include "inet_ntoa.h"
+#include "strsep.h"
+#include "strtok.h"
+#include "vis.h"
+#include "setproctitle.h"
+#include "getgrouplist.h"
+
+/* Home grown routines */
+#include "bsd-arc4random.h"
+#include "bsd-misc.h"
+#include "bsd-snprintf.h"
+#include "bsd-waitpid.h"
+
+/* rfc2553 socket API replacements */
+#include "fake-getaddrinfo.h"
+#include "fake-getnameinfo.h"
+#include "fake-socket.h"
+
+#endif /* _OPENBSD_H */
diff --git a/bsd-queue.h b/openbsd-compat/queue.h
index 269af413..269af413 100644
--- a/bsd-queue.h
+++ b/openbsd-compat/queue.h
diff --git a/bsd-realpath.c b/openbsd-compat/realpath.c
index baf17f1a..baf17f1a 100644
--- a/bsd-realpath.c
+++ b/openbsd-compat/realpath.c
diff --git a/bsd-realpath.h b/openbsd-compat/realpath.h
index dc3579dd..dc3579dd 100644
--- a/bsd-realpath.h
+++ b/openbsd-compat/realpath.h
diff --git a/bsd-rresvport.c b/openbsd-compat/rresvport.c
index 44eac203..44eac203 100644
--- a/bsd-rresvport.c
+++ b/openbsd-compat/rresvport.c
diff --git a/bsd-rresvport.h b/openbsd-compat/rresvport.h
index d139895e..d139895e 100644
--- a/bsd-rresvport.h
+++ b/openbsd-compat/rresvport.h
diff --git a/bsd-setenv.c b/openbsd-compat/setenv.c
index d69f8825..d69f8825 100644
--- a/bsd-setenv.c
+++ b/openbsd-compat/setenv.c
diff --git a/bsd-setenv.h b/openbsd-compat/setenv.h
index 62ebc201..62ebc201 100644
--- a/bsd-setenv.h
+++ b/openbsd-compat/setenv.h
diff --git a/bsd-setproctitle.c b/openbsd-compat/setproctitle.c
index 38eca9ad..38eca9ad 100644
--- a/bsd-setproctitle.c
+++ b/openbsd-compat/setproctitle.c
diff --git a/bsd-setproctitle.h b/openbsd-compat/setproctitle.h
index 000689fa..000689fa 100644
--- a/bsd-setproctitle.h
+++ b/openbsd-compat/setproctitle.h
diff --git a/bsd-sigaction.c b/openbsd-compat/sigaction.c
index d6966d4f..47d853fe 100644
--- a/bsd-sigaction.c
+++ b/openbsd-compat/sigaction.c
@@ -35,7 +35,7 @@
#include <signal.h>
#include "config.h"
-#include "bsd-sigaction.h"
+#include "sigaction.h"
/* This file provides sigaction() emulation using sigvec() */
/* Use only if this is non POSIX system */
diff --git a/bsd-sigaction.h b/openbsd-compat/sigaction.h
index b37c1f84..b37c1f84 100644
--- a/bsd-sigaction.h
+++ b/openbsd-compat/sigaction.h
diff --git a/bsd-strlcat.c b/openbsd-compat/strlcat.c
index 10ad9e71..10ad9e71 100644
--- a/bsd-strlcat.c
+++ b/openbsd-compat/strlcat.c
diff --git a/bsd-strlcat.h b/openbsd-compat/strlcat.h
index 562dc704..562dc704 100644
--- a/bsd-strlcat.h
+++ b/openbsd-compat/strlcat.h
diff --git a/bsd-strlcpy.c b/openbsd-compat/strlcpy.c
index 276c25c3..276c25c3 100644
--- a/bsd-strlcpy.c
+++ b/openbsd-compat/strlcpy.c
diff --git a/bsd-strlcpy.h b/openbsd-compat/strlcpy.h
index dafa44af..dafa44af 100644
--- a/bsd-strlcpy.h
+++ b/openbsd-compat/strlcpy.h
diff --git a/bsd-strmode.c b/openbsd-compat/strmode.c
index 67e0e4d3..67e0e4d3 100644
--- a/bsd-strmode.c
+++ b/openbsd-compat/strmode.c
diff --git a/bsd-strmode.h b/openbsd-compat/strmode.h
index 773d6bdc..773d6bdc 100644
--- a/bsd-strmode.h
+++ b/openbsd-compat/strmode.h
diff --git a/bsd-strsep.c b/openbsd-compat/strsep.c
index c03649cf..c03649cf 100644
--- a/bsd-strsep.c
+++ b/openbsd-compat/strsep.c
diff --git a/bsd-strsep.h b/openbsd-compat/strsep.h
index d5ba6e0f..d5ba6e0f 100644
--- a/bsd-strsep.h
+++ b/openbsd-compat/strsep.h
diff --git a/bsd-strtok.c b/openbsd-compat/strtok.c
index d197734c..d197734c 100644
--- a/bsd-strtok.c
+++ b/openbsd-compat/strtok.c
diff --git a/bsd-strtok.h b/openbsd-compat/strtok.h
index 5a3a5695..5a3a5695 100644
--- a/bsd-strtok.h
+++ b/openbsd-compat/strtok.h
diff --git a/bsd-vis.c b/openbsd-compat/vis.c
index 94283a07..94283a07 100644
--- a/bsd-vis.c
+++ b/openbsd-compat/vis.c
diff --git a/bsd-vis.h b/openbsd-compat/vis.h
index 52e867b9..52e867b9 100644
--- a/bsd-vis.h
+++ b/openbsd-compat/vis.h