Plan 9 from Bell Labs 2012-06-19

sys/include/ape/bsd.h

@@ -34,11 +34,9 @@ extern int	ffs(unsigned int);
 extern void	bhappy(void*);
 extern int	rresvport(int*);
 extern int	rcmd(char**, int, char*, char*, char*, int*);
-extern char*	strdup(char*);
 extern int	strcasecmp(char*, char*);
 extern int 	putenv(char*);
 extern int	strncasecmp(char*, char*,int);
-extern void* memccpy(void*, void*, int, size_t);
 
 extern int	getopt(int, char**, char*);
 extern int	opterr;

sys/include/ape/string.h

@@ -9,6 +9,7 @@ extern "C" {
 #endif
 
 extern void *memcpy(void *, const void *, size_t);
+extern void* memccpy(void*, void*, int, size_t);
 extern void *memmove(void *, const void *, size_t);
 extern char *strcpy(char *, const char *);
 extern char *strncpy(char *, const char *, size_t);
@@ -17,6 +18,7 @@ extern char *strncat(char *, const char *, size_t);
 extern int memcmp(const void *, const void *, size_t);
 extern int strcmp(const char *, const char *);
 extern int strcoll(const char *, const char *);
+extern char* strdup(char*);
 extern int strncmp(const char *, const char *, size_t);
 extern size_t strxfrm(char *, const char *, size_t);
 extern void *memchr(const void *, int, size_t);

sys/src/ape/lib/ap/gen/mkfile

@@ -37,6 +37,7 @@ ALLOFILES=\
 	strcoll.$O\
 	strcpy.$O\
 	strcspn.$O\
+	strdup.$O\
 	strftime.$O\
 	strlen.$O\
 	strncat.$O\

sys/src/ape/lib/ap/gen/strcpy.c

@@ -2,7 +2,7 @@
 #define	N	10000
 
 static void*
-memccpy(void *a1, void *a2, int c, unsigned long n)
+pmemccpy(void *a1, void *a2, int c, size_t n)
 {
 	char *s1, *s2;
 
@@ -22,7 +22,7 @@ strcpy(char *s1, const char *s2)
 	char *os1;
 
 	os1 = s1;
-	while(!memccpy(s1, s2, 0, N)) {
+	while(!pmemccpy(s1, s2, 0, N)) {
 		s1 += N;
 		s2 += N;
 	}

sys/src/ape/lib/bsd/mkfile

@@ -44,7 +44,6 @@ OFILES=\
 	strncasecmp.$O\
 	socket.$O\
 	socketpair.$O\
-	strdup.$O\
 	pty.$O\
 	writev.$O\