diff options
| -rw-r--r-- | nuttx/ChangeLog | 1 | ||||
| -rw-r--r-- | nuttx/include/net/uip/uip.h | 4 | ||||
| -rw-r--r-- | nuttx/include/string.h | 1 | ||||
| -rw-r--r-- | nuttx/lib/string/Make.defs | 6 | ||||
| -rw-r--r-- | nuttx/lib/string/lib_strndup.c | 93 | ||||
| -rw-r--r-- | nuttx/mm/mm_internal.h | 2 |
6 files changed, 101 insertions, 6 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index e4f09183b..4ba9404b5 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -1788,4 +1788,5 @@ less than or equal to 64Kb. In this case, CONFIG_MM_SMALL can be defined so that those MCUs will also benefit from the smaller, 16- bit-based allocation overhead. + * lib/string/lib_strndup.c: Add standard strndup() library function. diff --git a/nuttx/include/net/uip/uip.h b/nuttx/include/net/uip/uip.h index 57407e632..ea11dede8 100644 --- a/nuttx/include/net/uip/uip.h +++ b/nuttx/include/net/uip/uip.h @@ -535,8 +535,8 @@ extern void uip_send(struct uip_driver_s *dev, const void *buf, int len); (((in_addr_t)(addr1) & (in_addr_t)(mask)) == \ ((in_addr_t)(addr2) & (in_addr_t)(mask))) #else -extern bool uip_ipaddr_maskcmp(uip_addr_t addr1, uip_addr_t addr2, - uip_addr_t mask); +extern bool uip_ipaddr_maskcmp(uip_ipaddr_t addr1, uip_ipaddr_t addr2, + uip_ipaddr_t mask); #endif /* Mask out the network part of an IP address. diff --git a/nuttx/include/string.h b/nuttx/include/string.h index 7d7dc21d4..0fbf996cd 100644 --- a/nuttx/include/string.h +++ b/nuttx/include/string.h @@ -62,6 +62,7 @@ extern "C" { EXTERN char *strchr(const char *s, int c); EXTERN FAR char *strdup(const char *s); +EXTERN FAR char *strndup(FAR const char *s, size_t size); EXTERN const char *strerror(int); EXTERN size_t strlen(const char *); EXTERN size_t strnlen(const char *, size_t); diff --git a/nuttx/lib/string/Make.defs b/nuttx/lib/string/Make.defs index ad9340a82..d3f1eed3a 100644 --- a/nuttx/lib/string/Make.defs +++ b/nuttx/lib/string/Make.defs @@ -38,6 +38,6 @@ STRING_SRCS = lib_checkbase.c lib_isbasedigit.c lib_memset.c lib_memcpy.c \ lib_strcat.c lib_strchr.c lib_strcpy.c lib_strcmp.c lib_strcspn.c \ lib_strdup.c lib_strerror.c lib_strlen.c lib_strnlen.c \ lib_strncasecmp.c lib_strncat.c lib_strncmp.c lib_strncpy.c \ - lib_strpbrk.c lib_strrchr.c lib_strspn.c lib_strstr.c lib_strtok.c \ - lib_strtokr.c lib_strtol.c lib_strtoll.c lib_strtoul.c \ - lib_strtoull.c lib_strtod.c + lib_strndup.c lib_strpbrk.c lib_strrchr.c lib_strspn.c \ + lib_strstr.c lib_strtok.c lib_strtokr.c lib_strtol.c lib_strtoll.c \ + lib_strtoul.c lib_strtoull.c lib_strtod.c diff --git a/nuttx/lib/string/lib_strndup.c b/nuttx/lib/string/lib_strndup.c new file mode 100644 index 000000000..68b7c74c3 --- /dev/null +++ b/nuttx/lib/string/lib_strndup.c @@ -0,0 +1,93 @@ +/************************************************************************ + * lib/string//lib_strndup.c + * + * Copyright (C) 2011 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt <spudmonkey@racsa.co.cr> + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name NuttX nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ************************************************************************/ + +/************************************************************************ + * Included Files + ************************************************************************/ + +#include <nuttx/config.h> + +#include <string.h> + +#include "lib_internal.h" + +/************************************************************************ + * Global Functions + ************************************************************************/ +/************************************************************************ + * Name: strndup + * + * Description: + * The strndup() function is equivalent to the strdup() function, + * duplicating the provided 's' in a new block of memory allocated as + * if by using malloc(), with the exception being that strndup() copies + * at most 'size' plus one bytes into the newly allocated memory, + * terminating the new string with a NUL character. If the length of 's' + * is larger than 'size', only 'size' bytes will be duplicated. If + * 'size' is larger than the length of 's', all bytes in s will be + * copied into the new memory buffer, including the terminating NUL + * character. The newly created string will always be properly + * terminated. + * + ************************************************************************/ + +FAR char *strndup(FAR const char *s, size_t size) +{ + FAR char *news = NULL; + if (s) + { + /* Get the size of the new string = MIN(strlen(s), size) */ + + size_t allocsize = strlen(s); + if (allocsize > size) + { + allocsize = size; + } + + /* Allocate the new string, adding 1 for the NUL terminator */ + + news = (FAR char*)lib_malloc(allocsize + 1); + if (news) + { + /* Copy the string into the allocated memory and add a NUL + * terminator in any case. + */ + + memcpy(news, s, allocsize); + news[allocsize] = '\0'; + } + } + return news; +} diff --git a/nuttx/mm/mm_internal.h b/nuttx/mm/mm_internal.h index 429559328..4fb2d1778 100644 --- a/nuttx/mm/mm_internal.h +++ b/nuttx/mm/mm_internal.h @@ -155,7 +155,7 @@ struct mm_freenode_s FAR struct mm_freenode_s *blink; }; -/* Free is the size of the freenode */ +/* What is the size of the freenode? */ #ifdef CONFIG_MM_SMALL # ifdef CONFIG_SMALL_MEMORY |