sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

libutil: minix efun.c

Browse source
This commit is contained in:
Ben Gras 2010-06-09 12:05:53 +00:00
parent 7b87ff5b11
commit a0147a8c32
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/libutil/Makefile
View file

@ -4,6 +4,6 @@ CPPFLAGS+=-O -D_MINIX -D_POSIX_SOURCE
LIB= util LIB= util
SRCS= openpty.c sha2.c SRCS= openpty.c sha2.c efun.c
.include <minix.lib.mk> .include <minix.lib.mk>

5
lib/libutil/efun.c
View file

@ -44,6 +44,7 @@ __RCSID("$NetBSD: efun.c,v 1.6 2008/04/28 20:23:02 martin Exp $");
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <stdarg.h> #include <stdarg.h>
#include <err.h>
#include <util.h> #include <util.h>
static void (*efunc)(int, const char *, ...) = err; static void (*efunc)(int, const char *, ...) = err;
@ -91,6 +92,7 @@ estrdup(const char *s)
return d; return d;
} }
#ifndef __minix
char * char *
estrndup(const char *s, size_t len) estrndup(const char *s, size_t len)
{ {
@ -99,6 +101,7 @@ estrndup(const char *s, size_t len)
(*efunc)(1, "Cannot copy string"); (*efunc)(1, "Cannot copy string");
return d; return d;
} }
#endif
void * void *
emalloc(size_t n) emalloc(size_t n)
@ -136,6 +139,7 @@ efopen(const char *p, const char *m)
return fp; return fp;
} }
#ifndef _MINIX
int int
easprintf(char ** __restrict ret, const char * __restrict format, ...) 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"); (*efunc)(1, "Cannot format string");
return rv; return rv;
} }
#endif