diff options
| -rw-r--r-- | include/string.h | 40 | ||||
| -rw-r--r-- | include/wchar.h | 40 | ||||
| -rw-r--r-- | src/string/strspn.c | 96 | ||||
| -rw-r--r-- | src/wchar/wcsspn.c | 81 |
4 files changed, 257 insertions, 0 deletions
diff --git a/include/string.h b/include/string.h index 8034973..676a721 100644 --- a/include/string.h +++ b/include/string.h @@ -973,6 +973,46 @@ void* memmem(const void*, size_t, const void*, size_t) /* TODO Add case right-to-left substring searching functions. */ +/** + * Returns length of the initial substring + * that consists entirely of a set of specified + * bytes. + * + * @param string The string. + * @param skipset Bytes allowed in the substring. + * @return The length of the substring. + */ +size_t strspn(const char*, const char*) + __GCC_ONLY(__attribute__((warn_unused_result, nonnull))); + +/** + * Returns length of the initial substring + * that consists entirely of the complement + * of a set of specified bytes. + * + * @param string The string. + * @param stopset Bytes disallowed in the substring. + * @return The length of the substring. + */ +size_t strcspn(const char*, const char*) + __GCC_ONLY(__attribute__((warn_unused_result, nonnull))); + +/** + * This function works like `strcspn`, + * except it returns the pointer to the + * location of the first found non-matching + * byte. + * + * @param string The string. + * @param stopset Bytes disallowed in the substring. + * @return A pointer to the first occurrence in + * `string` of a byte found in `stopset`. + * `NULL` is returned if none is found. + */ +char* stpbrk(const char*, const char*) + __GCC_ONLY(__attribute__((warn_unused_result, nonnull))); + + #endif diff --git a/include/wchar.h b/include/wchar.h index 16644c8..31e985d 100644 --- a/include/wchar.h +++ b/include/wchar.h @@ -938,6 +938,46 @@ wchar_t* wmemmem(const wchar_t*, size_t, const wchar_t*, size_t) /* TODO Add case right-to-left substring searching functions. */ +/** + * Returns length of the initial substring + * that consists entirely of a set of specified + * wide characters. + * + * @param string The string. + * @param skipset Characters allowed in the substring. + * @return The length of the substring. + */ +size_t wcsspn(const wchar_t*, const wchar_t*) + __GCC_ONLY(__attribute__((warn_unused_result, nonnull))); + +/** + * Returns length of the initial substring + * that consists entirely of the complement + * of a set of specified wide characters. + * + * @param string The string. + * @param stopset Characters disallowed in the substring. + * @return The length of the substring. + */ +size_t wcscspn(const wchar_t*, const wchar_t*) + __GCC_ONLY(__attribute__((warn_unused_result, nonnull))); + +/** + * This function works like `strcspn`, + * except it returns the pointer to the + * location of the first found non-matching + * wide character. + * + * @param string The string. + * @param stopset Bytes disallowed in the substring. + * @return A pointer to the first occurrence in + * `string` of a character found in `stopset`. + * `NULL` is returned if none is found. + */ +wchar_t* wcpbrk(const wchar_t*, const wchar_t*) + __GCC_ONLY(__attribute__((warn_unused_result, nonnull))); + + #endif #endif diff --git a/src/string/strspn.c b/src/string/strspn.c new file mode 100644 index 0000000..cf82529 --- /dev/null +++ b/src/string/strspn.c @@ -0,0 +1,96 @@ +/** + * slibc — Yet another C library + * Copyright © 2015 Mattias Andrée (maandree@member.fsf.org) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +#include <string.h> +#include <stddef.h> + + + +/** + * Returns length of the initial substring + * that consists entirely of a set of specified + * bytes. + * + * @param string The string. + * @param skipset Bytes allowed in the substring. + * @return The length of the substring. + */ +size_t strspn(const char* string, const char* skipset) +{ + char set[256]; + char c; + const char* s = string; + memset(set, 0, 256); + while ((c = *skipset++)) + set[(size_t)c] = 1; + while ((c = *s++)) + if (set[(size_t)c]) + break; + return (size_t)(s - 1 - string); +} + + +/** + * Returns length of the initial substring + * that consists entirely of the complement + * of a set of specified bytes. + * + * @param string The string. + * @param stopset Bytes disallowed in the substring. + * @return The length of the substring. + */ +size_t strcspn(const char* string, const char* stopset) +{ + char set[256]; + char c; + const char* s = string; + memset(set, 0, 256); + while ((c = *skipset++)) + set[(size_t)c] = 1; + while ((c = *s++)) + if (!set[(size_t)c]) + break; + return (size_t)(s - 1 - string); +} + + +/** + * This function works like `strcspn`, + * except it returns the pointer to the + * location of the first found non-matching + * byte. + * + * @param string The string. + * @param stopset Bytes disallowed in the substring. + * @return A pointer to the first occurrence in + * `string` of a byte found in `stopset`. + * `NULL` is returned if none is found. + */ +char* stpbrk(const char* string, const char* stopset) +{ + char set[256]; + char c; + const char* s = string; + memset(set, 0, 256); + while ((c = *skipset++)) + set[(size_t)c] = 1; + while ((c = *s++)) + if (!set[(size_t)c]) + break; + return c ? (s - 1) : NULL; +} + diff --git a/src/wchar/wcsspn.c b/src/wchar/wcsspn.c new file mode 100644 index 0000000..360ab5f --- /dev/null +++ b/src/wchar/wcsspn.c @@ -0,0 +1,81 @@ +/** + * slibc — Yet another C library + * Copyright © 2015 Mattias Andrée (maandree@member.fsf.org) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +#include <wchar.h> +#include <stddef.h> + + + +/** + * Returns length of the initial substring + * that consists entirely of a set of specified + * wide characters. + * + * @param string The string. + * @param skipset Characters allowed in the substring. + * @return The length of the substring. + */ +size_t wcsspn(const wchar_t* string, const wchar_t* skipset) +{ + wchar_t* s = string; + wchar_t c; + while ((c = *s++)) + if (wcschr(skipset, c) == NULL) + break; + return (size_t)(s - 1 - string); +} + + +/** + * Returns length of the initial substring + * that consists entirely of the complement + * of a set of specified wide characters. + * + * @param string The string. + * @param stopset Characters disallowed in the substring. + * @return The length of the substring. + */ +size_t wcscspn(const wchar_t* string, const wchar_t* stopset) +{ + size_t end = wcslen(string); + wchar_t* p; + wchar_t c; + while ((c = *skipset++)) + if (p = wcsnchr(string, c, end), p != NULL) + end = (size_t)(p - string); + return end; +} + + +/** + * This function works like `strcspn`, + * except it returns the pointer to the + * location of the first found non-matching + * wide character. + * + * @param string The string. + * @param stopset Bytes disallowed in the substring. + * @return A pointer to the first occurrence in + * `string` of a character found in `stopset`. + * `NULL` is returned if none is found. + */ +wchar_t* wcpbrk(const wchar_t* string, const wchar_t* stopset) +{ + string += wcscspn(string, stopset); + return *string ? string : NULL; +} + |