diff --git a/ChangeLog b/ChangeLog
index f772c834a67d2d585d9a42bc6d96f552cc6abc9d..6216f38e49b6c642a5c250e0207a0638165ec0bd 100644
--- a/ChangeLog
+++ b/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/Documentation/NuttX.html b/Documentation/NuttX.html
index 5b813de34387c8c6301d93906fb2d1a4dfa414a8..4050e7258c7a0eae1c6bc8e84bfe41e44ed170ec 100644
--- a/Documentation/NuttX.html
+++ b/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
</pre></ul>
diff --git a/TODO b/TODO
index 6703301164b22f1444f015ac00024dc3917ae64f..f5cf5bff58277de11cf188e64e9e9f6350303239 100644
--- a/TODO
+++ b/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/lib/Makefile b/lib/Makefile
index a861d43a7141e797d27a0f539b5bb44ca1a238c0..a01dbcb917e7ebce57c3b42432a7b52fda2274ff 100644
--- a/lib/Makefile
+++ b/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/lib/lib_sscanf.c b/lib/lib_sscanf.c
index 13d8c3c0da302bb42570875faf372515acb772ff..af3193e44d9e131d826776d476ef9bf66e4b15b2 100644
--- a/lib/lib_sscanf.c
+++ b/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/lib/lib_strcspn.c b/lib/lib_strcspn.c
new file mode 100644
index 0000000000000000000000000000000000000000..92a60fc0b0c452f91a7f5e4d1cf32bb60e5bc909
--- /dev/null
+++ b/lib/lib_strcspn.c
@@ -0,0 +1,67 @@
+/****************************************************************************
+ * lib_strcspn.c
+ *
+ * Copyright (C) 2007 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 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 <nuttx/config.h>
+#include <sys/types.h>
+#include <string.h>
+
+/****************************************************************************
+ * 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/lib/lib_strspn.c b/lib/lib_strspn.c
new file mode 100644
index 0000000000000000000000000000000000000000..763119714747f1103beb489519f01f9323ebc7b2
--- /dev/null
+++ b/lib/lib_strspn.c
@@ -0,0 +1,66 @@
+/****************************************************************************
+ * lib_strspn.c
+ *
+ * Copyright (C) 2007 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 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 <nuttx/config.h>
+#include <sys/types.h>
+#include <string.h>
+
+/****************************************************************************
+ * 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;
+}