update autoconf for latest compat functions

5 files changed, 62 insertions, 0 deletions

diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index d2c7431..4bf6b46 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -87,6 +87,7 @@ if HOST_WIN
         -echo posix_write >> crypto_portable.sym
         -echo posix_getsockopt >> crypto_portable.sym
         -echo posix_setsockopt >> crypto_portable.sym
+        -echo getuid >> crypto_portable.sym
         -grep -v BIO_s_log crypto_portable.sym > crypto_portable.sym.tmp
         -mv crypto_portable.sym.tmp crypto_portable.sym
 endif
@@ -162,6 +163,15 @@ if !HAVE_GETPAGESIZE
 libcompat_la_SOURCES += compat/getpagesize.c
 endif
 
+if !HAVE_GETPROGNAME
+if HOST_LINUX
+libcompat_la_SOURCES += compat/getprogname_linux.c
+endif
+if HOST_WIN
+libcompat_la_SOURCES += compat/getprogname_windows.c
+endif
+endif
+
 if !HAVE_TIMEGM
 libcompat_la_SOURCES += compat/timegm.c
 endif
@@ -174,6 +184,10 @@ if !HAVE_RECALLOCARRAY
 libcompat_la_SOURCES += compat/recallocarray.c
 endif
 
+if !HAVE_SYSLOG_R
+libcompat_la_SOURCES += compat/syslog_r.c
+endif
+
 if !HAVE_TIMINGSAFE_MEMCMP
 libcompat_la_SOURCES += compat/timingsafe_memcmp.c
 endif
diff --git a/crypto/compat/getprogname_linux.c b/crypto/compat/getprogname_linux.c
new file mode 100644
index 0000000..fefe5ea
--- /dev/null
+++ b/crypto/compat/getprogname_linux.c
@@ -0,0 +1,9 @@
+#include <stdlib.h>
+
+#include <errno.h>
+
+const char *
+getprogname(void)
+{
+        return program_invocation_short_name;
+}
diff --git a/crypto/compat/getprogname_windows.c b/crypto/compat/getprogname_windows.c
new file mode 100644
index 0000000..eb04ec0
--- /dev/null
+++ b/crypto/compat/getprogname_windows.c
@@ -0,0 +1,13 @@
+#include <stdlib.h>
+
+#include <windows.h>
+
+const char *
+getprogname(void)
+{
+        static char progname[MAX_PATH + 1];
+        DWORD length = GetModuleFileName(NULL, progname, sizeof (progname) - 1);
+        if (length < 0)
+                return "?";
+        return progname;
+}
diff --git a/crypto/compat/posix_win.c b/crypto/compat/posix_win.c
index d6e2dcb..b73f023 100644
--- a/crypto/compat/posix_win.c
+++ b/crypto/compat/posix_win.c
@@ -4,6 +4,7 @@
  * BSD socket emulation code for Winsock2
  * File IO compatibility shims
  * Brent Cook <bcook@openbsd.org>
+ * Kinichiro Inoguchi <inoguchi@openbsd.org>
  */
 
 #define NO_REDEF_POSIX_FUNCTIONS
@@ -208,6 +209,12 @@ posix_setsockopt(int sockfd, int level, int optname,
         return rc == 0 ? 0 : wsa_errno(WSAGetLastError());
 }
 
+uid_t getuid(void)
+{
+        /* Windows fstat sets 0 as st_uid */
+        return 0;
+}
+
 #ifdef _MSC_VER
 struct timezone;
 int gettimeofday(struct timeval * tp, struct timezone * tzp)
diff --git a/crypto/compat/syslog_r.c b/crypto/compat/syslog_r.c
new file mode 100644
index 0000000..d68169d
--- /dev/null
+++ b/crypto/compat/syslog_r.c
@@ -0,0 +1,19 @@
+#include <syslog.h>
+
+void
+syslog_r(int pri, struct syslog_data *data, const char *fmt, ...)
+{
+    va_list ap;
+
+    va_start(ap, fmt);
+    vsyslog_r(pri, data, fmt, ap);
+    va_end(ap);
+}
+
+void
+vsyslog_r(int pri, struct syslog_data *data, const char *fmt, va_list ap)
+{
+#ifdef HAVE_SYSLOG
+        vsyslog(pri, fmt, ap);
+#endif
+}