diff options
| author | cinap_lenrek <cinap_lenrek@felloff.net> | 2013-12-28 05:14:10 +0100 |
|---|---|---|
| committer | cinap_lenrek <cinap_lenrek@felloff.net> | 2013-12-28 05:14:10 +0100 |
| commit | 7143b286b7b57eed2b49ba143dcae90be3716b0e (patch) | |
| tree | 51d097b34895fd2e86dd76e37a78792aadf49638 | |
| parent | 4aa68d2f3a10b81fecc27550c9e1bb05b7b74887 (diff) | |
ape: move strdup() from libbsd to libap (from sources)
including <string.h> should be enougth to make strdup()
available.
| -rw-r--r-- | sys/include/ape/bsd.h | 2 | ||||
| -rw-r--r-- | sys/include/ape/string.h | 2 | ||||
| -rw-r--r-- | sys/src/ape/lib/ap/gen/mkfile | 1 | ||||
| -rw-r--r-- | sys/src/ape/lib/ap/gen/strdup.c (renamed from sys/src/ape/lib/bsd/strdup.c) | 0 | ||||
| -rw-r--r-- | sys/src/ape/lib/bsd/mkfile | 1 |
5 files changed, 3 insertions, 3 deletions
diff --git a/sys/include/ape/bsd.h b/sys/include/ape/bsd.h index 4fda476e0..c41c36b8e 100644 --- a/sys/include/ape/bsd.h +++ b/sys/include/ape/bsd.h @@ -34,10 +34,8 @@ 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 strncasecmp(char*, char*,int); -extern void* memccpy(void*, void*, int, size_t); extern int getopt(int, char**, char*); extern int opterr; diff --git a/sys/include/ape/string.h b/sys/include/ape/string.h index 0e2144c72..52813b15d 100644 --- a/sys/include/ape/string.h +++ b/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); diff --git a/sys/src/ape/lib/ap/gen/mkfile b/sys/src/ape/lib/ap/gen/mkfile index 970e04aff..6594587f4 100644 --- a/sys/src/ape/lib/ap/gen/mkfile +++ b/sys/src/ape/lib/ap/gen/mkfile @@ -55,6 +55,7 @@ ALLOFILES=\ strtoull.$O\ strxfrm.$O\ toupper.$O\ + strdup.$O\ # cull things in the per-machine directories from this list OFILES= `{rc ./reduce $O $objtype $ALLOFILES} diff --git a/sys/src/ape/lib/bsd/strdup.c b/sys/src/ape/lib/ap/gen/strdup.c index 5e4a3759e..5e4a3759e 100644 --- a/sys/src/ape/lib/bsd/strdup.c +++ b/sys/src/ape/lib/ap/gen/strdup.c diff --git a/sys/src/ape/lib/bsd/mkfile b/sys/src/ape/lib/bsd/mkfile index 886b599ee..90fefd36b 100644 --- a/sys/src/ape/lib/bsd/mkfile +++ b/sys/src/ape/lib/bsd/mkfile @@ -49,7 +49,6 @@ OFILES=\ strncasecmp.$O\ socket.$O\ socketpair.$O\ - strdup.$O\ pty.$O\ writev.$O\ |