diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index f772c834a..6216f38e4 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -136,5 +136,6 @@ * Added missing irqrestore() in timer_deletall(). * close() was not closing the underlying device. * Added fsync() + * Added strspn() and strcspn() * Started m68322 diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html index 5b813de34..4050e7258 100644 --- a/nuttx/Documentation/NuttX.html +++ b/nuttx/Documentation/NuttX.html @@ -515,6 +515,7 @@ Other memory: * Added missing irqrestore() in timer_deletall(). * close() was not closing the underlying device. * Added fsync() + * Added strspn() and strcspn() * Started m68322 diff --git a/nuttx/TODO b/nuttx/TODO index 670330116..f5cf5bff5 100644 --- a/nuttx/TODO +++ b/nuttx/TODO @@ -35,14 +35,13 @@ o Network o USB o Libraries -- sscanf() needs strtod and strcspn +- sscanf() and lib_vsprintf() do not support floating point values. o File system -- Add disk usage stats, stat(), sync(), unlink(), mkdir(), chmod(), rename(), +- Add disk usage stats, stat(), unlink(), mkdir(), chmod(), rename(), etc. - FAT32: long file names - o Console Output o Documentation diff --git a/nuttx/lib/Makefile b/nuttx/lib/Makefile index a861d43a7..a01dbcb91 100644 --- a/nuttx/lib/Makefile +++ b/nuttx/lib/Makefile @@ -44,6 +44,7 @@ MISC_SRCS = lib_init.c lib_streamsem.c lib_filesem.c STRING_SRCS = lib_memset.c lib_memcpy.c lib_memcmp.c lib_memmove.c \ lib_strcpy.c lib_strncpy.c lib_strcmp.c \ lib_strlen.c lib_strdup.c lib_strtol.c lib_strchr.c \ + lib_strspn.c lib_strcspn.c \ lib_strtok.c lib_strtokr.c lib_strerror.c CTYPE_SRCS = STDIO_SRCS = lib_fopen.c lib_fclose.c \ diff --git a/nuttx/lib/lib_sscanf.c b/nuttx/lib/lib_sscanf.c index 13d8c3c0d..af3193e44 100644 --- a/nuttx/lib/lib_sscanf.c +++ b/nuttx/lib/lib_sscanf.c @@ -260,6 +260,13 @@ int vsscanf(char *buf, const char *s, va_list ap) else if (*s == 'f') { +#if 1 +# warning "No floating point conversions" + void *pv = va_arg(ap, void*); + + vdbg("vsscanf: Return 0.0 to %p\n", pv); + *((double_t*)pv) = 0.0; +#else vdbg("vsscanf: Performing floating point conversion\n"); /* Skip over any white space before the real string */ @@ -301,7 +308,7 @@ int vsscanf(char *buf, const char *s, va_list ap) #endif void *pv = va_arg(ap, void*); - vdbg("vsscanf: Return %f to 0x%p\n", dvalue, pv); + vdbg("vsscanf: Return %f to %p\n", dvalue, pv); /* But we have to check whether we need to return a * float or a double. @@ -318,6 +325,7 @@ int vsscanf(char *buf, const char *s, va_list ap) *((float*)pv) = (float)dvalue; } } +#endif } if (!noassign) diff --git a/nuttx/lib/lib_strcspn.c b/nuttx/lib/lib_strcspn.c new file mode 100644 index 000000000..92a60fc0b --- /dev/null +++ b/nuttx/lib/lib_strcspn.c @@ -0,0 +1,67 @@ +/**************************************************************************** + * lib_strcspn.c + * + * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * 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 Gregory Nutt 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. + * + ****************************************************************************/ + +/**************************************************************************** + * Compilation Switches + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include +#include +#include + +/**************************************************************************** + * Global Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: strcspn + * + * Description: + * strspn() calculates the length of the initial segment of s which + * consists entirely of characters not in reject + * + ****************************************************************************/ + +size_t strspn(const char *s, const char *reject) +{ + size_t i; + for (i = 0; s[i] && strchr(reject, s[i]) == NULL; i++); + return i; +} + diff --git a/nuttx/lib/lib_strspn.c b/nuttx/lib/lib_strspn.c new file mode 100644 index 000000000..763119714 --- /dev/null +++ b/nuttx/lib/lib_strspn.c @@ -0,0 +1,66 @@ +/**************************************************************************** + * lib_strspn.c + * + * Copyright (C) 2007 Gregory Nutt. All rights reserved. + * Author: Gregory Nutt + * + * 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 Gregory Nutt 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. + * + ****************************************************************************/ + +/**************************************************************************** + * Compilation Switches + ****************************************************************************/ + +/**************************************************************************** + * Included Files + ****************************************************************************/ + +#include +#include +#include + +/**************************************************************************** + * Global Functions + ****************************************************************************/ + +/**************************************************************************** + * Name: strspn + * + * Description: + * strspn() calculates the length of the initial segment of s which + * consists entirely of characters in accept. + * + ****************************************************************************/ + +size_t strspn(const char *s, const char *accept) +{ + size_t i; + for (i = 0; s[i] && strchr(accept, s[i]) != NULL; i++); + return i; +}