libutil: minix efun.c

diff --git a/lib/libutil/Makefile b/lib/libutil/Makefile
index 9b5dba9213282df077521c95d9f5f311d3f4b121..e06878d9975db6b64597a5135107e10b9ecbb9eb 100644 (file)
--- a/lib/libutil/Makefile
+++ b/lib/libutil/Makefile
@@ -4,6 +4,6 @@ CPPFLAGS+=-O -D_MINIX -D_POSIX_SOURCE
 
 LIB=   util
 
-SRCS=  openpty.c sha2.c
+SRCS=  openpty.c sha2.c efun.c
 
 .include <minix.lib.mk>

diff --git a/lib/libutil/efun.c b/lib/libutil/efun.c
index 0f9019fc7040563e1d2d0a246360604474b35009..175e7c602b85dd4bb8cafde5fb58c5ed6f1cc0be 100644 (file)
--- a/lib/libutil/efun.c
+++ b/lib/libutil/efun.c
@@ -44,6 +44,7 @@ __RCSID("$NetBSD: efun.c,v 1.6 2008/04/28 20:23:02 martin Exp $");
 #include <stdlib.h>
 #include <stdio.h>
 #include <stdarg.h>
+#include <err.h>
 #include <util.h>
 
 static void (*efunc)(int, const char *, ...) = err;
@@ -91,6 +92,7 @@ estrdup(const char *s)
        return d;
 }
 
+#ifndef __minix
 char *
 estrndup(const char *s, size_t len)
 {
@@ -99,6 +101,7 @@ estrndup(const char *s, size_t len)
                (*efunc)(1, "Cannot copy string");
        return d;
 }
+#endif
 
 void *
 emalloc(size_t n)
@@ -136,6 +139,7 @@ efopen(const char *p, const char *m)
        return fp;
 }
 
+#ifndef _MINIX
 int
 easprintf(char ** __restrict ret, const char * __restrict format, ...)
 {
@@ -156,3 +160,4 @@ evasprintf(char ** __restrict ret, const char * __restrict format, va_list ap)
                (*efunc)(1, "Cannot format string");
        return rv;
 }
+#endif