From af578b649719273b84859b41e9f1ff993cfa1a6f Mon Sep 17 00:00:00 2001 From: Martin Lenders Date: Thu, 31 Oct 2013 15:29:07 +0100 Subject: [PATCH 1/2] Add POSIX compatible case insensitive compare --- sys/posix/Makefile | 2 +- sys/posix/doc.txt | 16 +++++ sys/posix/include/strings.h | 116 ++++++++++++++++++++++++++++++++++++ sys/posix/strings.c | 16 +++++ 4 files changed, 149 insertions(+), 1 deletion(-) create mode 100644 sys/posix/doc.txt create mode 100644 sys/posix/include/strings.h create mode 100644 sys/posix/strings.c diff --git a/sys/posix/Makefile b/sys/posix/Makefile index 095298af20..bd15ac0af2 100644 --- a/sys/posix/Makefile +++ b/sys/posix/Makefile @@ -1,4 +1,4 @@ -INCLUDES = -I../include -I$(RIOTBASE)/core/include +INCLUDES = -I$(RIOTBASE)/sys/include -I$(RIOTBASE)/core/include -Iinclude MODULE =posix include $(RIOTBASE)/Makefile.base diff --git a/sys/posix/doc.txt b/sys/posix/doc.txt new file mode 100644 index 0000000000..2035986a25 --- /dev/null +++ b/sys/posix/doc.txt @@ -0,0 +1,16 @@ +/** + * Copyright (C) 2013 INRIA. + * + * This file subject to the terms and conditions of the GNU Lesser General + * Public License. See the file LICENSE in the top level directory for more + * details. + */ + +/** + * @defgroup posix POSIX wrapper of RIOT + * @brief POSIX header files + * @see + * The Open Group Specifications Issue 7 + * + * @ingroup posix + */ diff --git a/sys/posix/include/strings.h b/sys/posix/include/strings.h new file mode 100644 index 0000000000..1ead0f04e7 --- /dev/null +++ b/sys/posix/include/strings.h @@ -0,0 +1,116 @@ +/** + * Copyright (C) 2013 INRIA. + * + * This file subject to the terms and conditions of the GNU Lesser General + * Public License. See the file LICENSE in the top level directory for more + * details. + */ + +/** + * @addtogroup posix + * @{ + * @file + * @brief string operations + * + * @see + * The Open Group Base Specifications Issue 7, + * + * + * @author Freie Universität Berlin + * @author Martin Lenders + */ +#ifndef STRINGS_H +#define STRINGS_H + +#include + +/** + * @brief Returns the position of the first (least significant) bit set in + * integer i, or 0 if no bits are set in i. + * + * @param[in] i an integer number. + * + * @return Position (1 for least significant bit) of the first bit set, + * 0 if no bits are set. + * + * @see + * The Open Group Base Specification Issue 7, ffs + * + */ +#define ffs(i) __builtin_ffs(i) + +/** + * @brief Compares two strings s1 and s2, ignoring the case of the characters + * for not more than n bytes from the strings. + * + * @param[in] s1 a string. + * @param[in] s2 another string. + * @param[in] n number of bytes to be compared + * + * @return A value greater 0 if, ignoring the case of the character, s1 is + * greater than s2 up to n bytes, less than 0 if smaller, and 0 if + * equal + * + * @see + * The Open Group Base Specification Issue 7, strcasecmp + * + */ +int strncasecmp(const char *s1, const char *s2, size_t n); + +/** + * @brief Compares two strings s1 and s2, ignoring the case of the characters + * for not more than n bytes from the strings, but using the current + * locale settings to determine the case. + * + * @note Since RIOT does not support locales (yet), this is just an + * alias for strncasecmp() + * + * @param[in] s1 a string. + * @param[in] s2 another string. + * @param[in] n number of bytes to be compared + * + * @return A value greater 0 if, ignoring the case of the character, s1 is + * greater than s2 up to n bytes, less than 0 if smaller, and 0 if + * equal + * + * @see + * The Open Group Base Specification Issue 7, strcasecmp + * + */ +#define strncasecmp_l(s1, s2, n, l) (strncasecmp(s1, s2, n)) + +/** + * @brief Compares two strings s1 and s2, ignoring the case of the characters. + * + * @param[in] s1 a string. + * @param[in] s2 another string. + * + * @return A value greater 0 if, ignoring the case of the character, s1 is + * greater than s2, less than 0 if smaller, and 0 if equal + * + * @see + * The Open Group Base Specification Issue 7, strcasecmp + * + */ +#define strcasecmp(s1, s2) strncasecmp(s1, s2, -1) + +/** + * @brief Compares two strings s1 and s2, ignoring the case of the characters, + * but using the current locale settings to determine the case. + * + * @note Since RIOT does not support locales (yet), this is just an + * alias for strcasecmp() + * + * @param[in] s1 a string. + * @param[in] s2 another string. + * + * @return A value greater 0 if, ignoring the case of the character, s1 is + * greater than s2, less than 0 if smaller, and 0 if equal + * + * @see + * The Open Group Base Specification Issue 7, strcasecmp + * + */ +#define strcasecmp_l(s1, s2, l) strncasecmp(s1, s2, -1) + +#endif /* STRINGS_H */ diff --git a/sys/posix/strings.c b/sys/posix/strings.c new file mode 100644 index 0000000000..2ef5867919 --- /dev/null +++ b/sys/posix/strings.c @@ -0,0 +1,16 @@ +#include +#include + +int strncasecmp(const char *s1, const char *s2, size_t n) +{ + while (n-- && tolower(*s1) == tolower(*s2)) { + if (!n && !*s1) { + break; + } + + s1++; + s2++; + } + + return (tolower(*s1) - tolower(*s2)); +} From 9f9a48db9f9ccf0a3faf2d881ec18194179054dc Mon Sep 17 00:00:00 2001 From: Martin Lenders Date: Mon, 4 Nov 2013 11:25:27 +0100 Subject: [PATCH 2/2] Minor documentation fixes --- sys/posix/doc.txt | 2 +- sys/posix/include/strings.h | 42 ++++++++++++++++++++----------------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/sys/posix/doc.txt b/sys/posix/doc.txt index 2035986a25..95aef02e23 100644 --- a/sys/posix/doc.txt +++ b/sys/posix/doc.txt @@ -1,4 +1,4 @@ -/** +/* * Copyright (C) 2013 INRIA. * * This file subject to the terms and conditions of the GNU Lesser General diff --git a/sys/posix/include/strings.h b/sys/posix/include/strings.h index 1ead0f04e7..f1262aa554 100644 --- a/sys/posix/include/strings.h +++ b/sys/posix/include/strings.h @@ -6,10 +6,13 @@ * details. */ -/** +/** * @addtogroup posix * @{ - * @file + */ + +/** + * @file strings.h * @brief string operations * * @see @@ -26,7 +29,7 @@ /** * @brief Returns the position of the first (least significant) bit set in - * integer i, or 0 if no bits are set in i. + * integer *i*, or 0 if no bits are set in i. * * @param[in] i an integer number. * @@ -40,15 +43,15 @@ #define ffs(i) __builtin_ffs(i) /** - * @brief Compares two strings s1 and s2, ignoring the case of the characters - * for not more than n bytes from the strings. + * @brief Compares two strings *s1* and *s2*, ignoring the case of the + * characters for not more than n bytes from the strings. * * @param[in] s1 a string. * @param[in] s2 another string. * @param[in] n number of bytes to be compared * - * @return A value greater 0 if, ignoring the case of the character, s1 is - * greater than s2 up to n bytes, less than 0 if smaller, and 0 if + * @return A value greater 0 if, ignoring the case of the character, *s1* is + * greater than *s2* up to n bytes, less than 0 if smaller, and 0 if * equal * * @see @@ -58,9 +61,9 @@ int strncasecmp(const char *s1, const char *s2, size_t n); /** - * @brief Compares two strings s1 and s2, ignoring the case of the characters - * for not more than n bytes from the strings, but using the current - * locale settings to determine the case. + * @brief Compares two strings *s1* and *s2*, ignoring the case of the + * characters for not more than n bytes from the strings, but using + * the current locale settings to determine the case. * * @note Since RIOT does not support locales (yet), this is just an * alias for strncasecmp() @@ -69,8 +72,8 @@ int strncasecmp(const char *s1, const char *s2, size_t n); * @param[in] s2 another string. * @param[in] n number of bytes to be compared * - * @return A value greater 0 if, ignoring the case of the character, s1 is - * greater than s2 up to n bytes, less than 0 if smaller, and 0 if + * @return A value greater 0 if, ignoring the case of the character, *s1* is + * greater than *s2* up to n bytes, less than 0 if smaller, and 0 if * equal * * @see @@ -80,13 +83,13 @@ int strncasecmp(const char *s1, const char *s2, size_t n); #define strncasecmp_l(s1, s2, n, l) (strncasecmp(s1, s2, n)) /** - * @brief Compares two strings s1 and s2, ignoring the case of the characters. + * @brief Compares two strings *s1* and *s2*, ignoring the case of the characters. * * @param[in] s1 a string. * @param[in] s2 another string. * - * @return A value greater 0 if, ignoring the case of the character, s1 is - * greater than s2, less than 0 if smaller, and 0 if equal + * @return A value greater 0 if, ignoring the case of the character, *s1* is + * greater than *s2*, less than 0 if smaller, and 0 if equal * * @see * The Open Group Base Specification Issue 7, strcasecmp @@ -95,8 +98,9 @@ int strncasecmp(const char *s1, const char *s2, size_t n); #define strcasecmp(s1, s2) strncasecmp(s1, s2, -1) /** - * @brief Compares two strings s1 and s2, ignoring the case of the characters, - * but using the current locale settings to determine the case. + * @brief Compares two strings *s1* and *s2*, ignoring the case of the + * characters, but using the current locale settings to determine the + * case. * * @note Since RIOT does not support locales (yet), this is just an * alias for strcasecmp() @@ -104,8 +108,8 @@ int strncasecmp(const char *s1, const char *s2, size_t n); * @param[in] s1 a string. * @param[in] s2 another string. * - * @return A value greater 0 if, ignoring the case of the character, s1 is - * greater than s2, less than 0 if smaller, and 0 if equal + * @return A value greater 0 if, ignoring the case of the character, *s1* is + * greater than *s2*, less than 0 if smaller, and 0 if equal * * @see * The Open Group Base Specification Issue 7, strcasecmp