From d1c8a7fbf527efe688097f348c84bd50a2e4efad Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Wed, 11 Sep 2019 10:18:30 +0200 Subject: Add wrapper for strndup() --- rtemsbsd/include/machine/rtems-bsd-program.h | 11 +++++++++-- rtemsbsd/rtems/rtems-kernel-program.c | 1 + rtemsbsd/rtems/rtems-program.c | 28 +++++++++++++++++++++------- 3 files changed, 31 insertions(+), 9 deletions(-) (limited to 'rtemsbsd') diff --git a/rtemsbsd/include/machine/rtems-bsd-program.h b/rtemsbsd/include/machine/rtems-bsd-program.h index 70030517..f71ac9cd 100644 --- a/rtemsbsd/include/machine/rtems-bsd-program.h +++ b/rtemsbsd/include/machine/rtems-bsd-program.h @@ -107,7 +107,10 @@ void * rtems_bsd_program_reallocf(void *ptr, size_t size); char * -rtems_bsd_program_strdup(const char *s1); +rtems_bsd_program_strdup(const char *s); + +char * +rtems_bsd_program_strndup(const char *s, size_t size); int rtems_bsd_program_vasprintf(char **strp, const char *fmt, va_list ap); @@ -177,7 +180,11 @@ rtems_bsd_program_free(void *ptr); #endif #ifndef RTEMS_BSD_PROGRAM_NO_STRDUP_WRAP - #define strdup(s1) rtems_bsd_program_strdup(s1) + #define strdup(s) rtems_bsd_program_strdup(s) +#endif + +#ifndef RTEMS_BSD_PROGRAM_NO_STRNDUP_WRAP + #define strndup(s, size) rtems_bsd_program_strndup(s, size) #endif #ifndef RTEMS_BSD_PROGRAM_NO_VASPRINTF_WRAP diff --git a/rtemsbsd/rtems/rtems-kernel-program.c b/rtemsbsd/rtems/rtems-kernel-program.c index affbc1af..763878de 100644 --- a/rtemsbsd/rtems/rtems-kernel-program.c +++ b/rtemsbsd/rtems/rtems-kernel-program.c @@ -47,6 +47,7 @@ #undef printf #define RTEMS_BSD_PROGRAM_NO_STRDUP_WRAP +#define RTEMS_BSD_PROGRAM_NO_STRNDUP_WRAP #include struct rtems_bsd_program_control * diff --git a/rtemsbsd/rtems/rtems-program.c b/rtemsbsd/rtems/rtems-program.c index ba8d5c57..204ed248 100644 --- a/rtemsbsd/rtems/rtems-program.c +++ b/rtemsbsd/rtems/rtems-program.c @@ -546,18 +546,32 @@ rtems_bsd_program_reallocf(void *ptr, size_t size) } char * -rtems_bsd_program_strdup(const char *s1) +rtems_bsd_program_strdup(const char *s) { - size_t size = strlen(s1) + 1; /* add one for null termination */ - char *item; + size_t size; + void *s2; - item = rtems_bsd_program_alloc(size, NULL); + size = strlen(s) + 1; + s2 = rtems_bsd_program_alloc(size, NULL); + if (s2 == NULL) { + return (NULL); + } + + return (memcpy(s2, s, size)); +} + +char * +rtems_bsd_program_strndup(const char *s, size_t size) +{ + void *s2; - if (item != NULL) { - memcpy(item, s1, size); + size = strnlen(s, size) + 1; + s2 = rtems_bsd_program_alloc(size, NULL); + if (s2 == NULL) { + return (NULL); } - return item; + return (memcpy(s2, s, size)); } int -- cgit v1.2.3