aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--TODO1
-rw-r--r--include/string.h104
-rw-r--r--include/wchar.h102
-rw-r--r--src/string/strchr.c149
-rw-r--r--src/wchar/wcschr.c151
5 files changed, 504 insertions, 3 deletions
diff --git a/TODO b/TODO
index b98ef49..7aa53e2 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,6 @@
functions to lock and unlock pages (3.4.3 p76)
character class determination for wide characters (4.3 p82)
collation functions (5.6 p109)
-search functions (5.7 p114)
finding tokens in a string (5.8 p119)
strfry (5.9 p124)
trivial encryption (5.10 p124)
diff --git a/include/string.h b/include/string.h
index 604fe1a..f1cc0c1 100644
--- a/include/string.h
+++ b/include/string.h
@@ -744,8 +744,108 @@ int strncmp(const char*, const char*, size_t)
#if defined(_GNU_SOURCE) && !defined(__PORTABLE)
int strverscmp(const char*, const char*)
- __GCC_ONLY(__attribute__((warn_unused_result, nonnull))); /* TODO document and implement strverscmp */
-#end if
+ __GCC_ONLY(__attribute__((warn_unused_result, nonnull)));
+/* TODO document and implement strverscmp */
+#endif
+
+
+/**
+ * Find the first occurrence of a byte in a memory segment.
+ *
+ * @param segment The memory segment to search.
+ * @param c The sought after character.
+ * @param size The size of the memory segment.
+ * @return Pointer to the first occurrence of `c`,
+ * `NULL` if none were found.
+ */
+void* memchr(const void*, int, size_t)
+ __GCC_ONLY(__attribute__((warn_unused_result)));
+
+#if (defined(_GNU_SOURCE) || defined(_SLIBC_SOURCE)) && !defined(__PORTABLE)
+/**
+ * Find the first occurrence of a byte in a memory segment.
+ * The memory segment must be known to contain the sought after byte.
+ *
+ * This is a GNU-compliant slibc extension.
+ *
+ * @param segment The memory segment to search.
+ * @param c The sought after character.
+ * @return Pointer to the first occurrence of `c`.
+ */
+void* rawmemchr(const void*, int)
+ __GCC_ONLY(__attribute__((warn_unused_result, returns_nonnull, nonnull)));
+#endif
+
+/**
+ * Find the last occurrence of a byte in a memory segment.
+ *
+ * For improved performace, use this function instead
+ * of `strrchr` if you already know the length of the
+ * string.
+ *
+ * @param segment The memory segment to search.
+ * @param c The sought after character.
+ * @param size The size of the memory segment.
+ * @return Pointer to the last occurrence of `c`,
+ * `NULL` if none were found.
+ */
+void* memrchr(const void*, int, size_t)
+ __GCC_ONLY(__attribute__((warn_unused_result)));
+
+/**
+ * Find the first occurrence of a byte in a string.
+ *
+ * `s = strchr(s, 0)` is a faster alternative to
+ * `s = s + strlen(s)`.
+ *
+ * @param string The string to search.
+ * The terminating NUL character is
+ * considered a part of the string.
+ * @param c The sought after character.
+ * @return Pointer to the first occurrence of `c`,
+ * `NULL` if none were found.
+ */
+char* strchr(const char*, int)
+ __GCC_ONLY(__attribute__((warn_unused_result, nonnull)));
+
+#if (defined(_GNU_SOURCE) || defined(_SLIBC_SOURCE)) && !defined(__PORTABLE)
+/**
+ * Find the first occurrence of a byte in a string, or
+ * if there is no such byte, the end of the string.
+ *
+ * This is a GNU-compliant slibc extension.
+ *
+ * @param string The string to search.
+ * The terminating NUL character is
+ * considered a part of the string.
+ * @param c The sought after character.
+ * @return Pointer to the first occurrence of `c`,
+ * Pointer to the terminating NUL character
+ * if none were found.
+ */
+char* strchrnul(const char*, int)
+ __GCC_ONLY(__attribute__((warn_unused_result, returns_nonnull, nonnull)));
+#endif
+
+/**
+ * Find the last occurrence of a byte in a string.
+ *
+ * For improved performace, use `memrchr` instead of
+ * this function if you already know the length of the
+ * string.
+ *
+ * @param string The string to search.
+ * The terminating NUL character is
+ * considered a part of the string.
+ * @param c The sought after character.
+ * @return Pointer to the last occurrence of `c`,
+ * `NULL` if none were found.
+ */
+char* strrchr(const char*, int)
+ __GCC_ONLY(__attribute__((warn_unused_result, nonnull)));
+
+
+/* TODO Add case insensitive character searching functions. */
diff --git a/include/wchar.h b/include/wchar.h
index 1b44690..66c4127 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -702,6 +702,108 @@ int wcsncasecmp(const wchar_t*, const wchar_t*, size_t)
#endif
+/**
+ * Find the first occurrence of a wide character
+ * in a memory segment.
+ *
+ * @param segment The memory segment to search.
+ * @param c The sought after character.
+ * @param size The size of the memory segment.
+ * @return Pointer to the first occurrence of `c`,
+ * `NULL` if none were found.
+ */
+wchar_t* wmemchr(const wchar_t*, wchar_t, size_t)
+ __GCC_ONLY(__attribute__((warn_unused_result)));
+
+#if defined(_SLIBC_SOURCE) && !defined(__PORTABLE)
+/**
+ * Find the first occurrence of a wide character in a
+ * memory segment. The memory segment must be known to
+ * contain the sought after character.
+ *
+ * This is a slibc extension added for completeness.
+ *
+ * @param segment The memory segment to search.
+ * @param c The sought after character.
+ * @return Pointer to the first occurrence of `c`.
+ */
+wchar_t* rawwmemchr(const wchar_t*, wchar_t)
+ __GCC_ONLY(__attribute__((warn_unused_result, returns_nonnull, nonnull)));
+
+/**
+ * Find the last occurrence of a wide character in
+ * a memory segment.
+ *
+ * For improved performace, use this function instead
+ * of `wcssrchr` if you already know the length of the
+ * string.
+ *
+ * This is a slibc extension added for completeness.
+ *
+ * @param segment The memory segment to search.
+ * @param c The sought after character.
+ * @param size The size of the memory segment.
+ * @return Pointer to the last occurrence of `c`,
+ * `NULL` if none were found.
+ */
+wchar_t* wmemrchr(const wchar_t*, wchar_t, size_t)
+ __GCC_ONLY(__attribute__((warn_unused_result)));
+#endif
+
+/**
+ * Find the first occurrence of a wide character in a string.
+ *
+ * @param string The string to search.
+ * The terminating NUL character is
+ * considered a part of the string.
+ * @param c The sought after character.
+ * @return Pointer to the first occurrence of `c`,
+ * `NULL` if none were found.
+ */
+wchar_t* wcschr(const wchar_t*, wchar_t)
+ __GCC_ONLY(__attribute__((warn_unused_result, nonnull)));
+
+#if (defined(_GNU_SOURCE) || defined(_SLIBC_SOURCE)) && !defined(__PORTABLE)
+/**
+ * Find the first occurrence of a wide character in a
+ * string, or if there is no such character, the end of
+ * the string.
+ *
+ * This is a GNU-compliant slibc extension.
+ *
+ * @param string The string to search.
+ * The terminating NUL character is
+ * considered a part of the string.
+ * @param c The sought after character.
+ * @return Pointer to the first occurrence of `c`,
+ * Pointer to the terminating NUL character
+ * if none were found.
+ */
+wchar_t* wcschrnul(const wchar_t*, wchar_t)
+ __GCC_ONLY(__attribute__((warn_unused_result, returns_nonnull, nonnull)));
+#endif
+
+/**
+ * Find the last occurrence of a wide character in a string.
+ *
+ * For improved performace, use `wmemrchr` instead of
+ * this function if you already know the length of the
+ * string.
+ *
+ * @param string The string to search.
+ * The terminating NUL character is
+ * considered a part of the string.
+ * @param c The sought after character.
+ * @return Pointer to the last occurrence of `c`,
+ * `NULL` if none were found.
+ */
+wchar_t* wcsrchr(const wchar_t*, wchar_t)
+ __GCC_ONLY(__attribute__((warn_unused_result, nonnull)));
+
+
+/* TODO Add case insensitive character searching functions. */
+
+
#endif
#endif
diff --git a/src/string/strchr.c b/src/string/strchr.c
new file mode 100644
index 0000000..6a25f78
--- /dev/null
+++ b/src/string/strchr.c
@@ -0,0 +1,149 @@
+/**
+ * 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>
+
+
+
+/**
+ * Find the first occurrence of a byte in a memory segment.
+ *
+ * @param segment The memory segment to search.
+ * @param c The sought after character.
+ * @param size The size of the memory segment.
+ * @return Pointer to the first occurrence of `c`,
+ * `NULL` if none were found.
+ */
+void* memchr(const void* segment, int c, size_t size)
+{
+ while (size--)
+ if (*segment++ == c)
+ return segment - 1;
+ return NULL;
+}
+
+
+/**
+ * Find the first occurrence of a byte in a memory segment.
+ * The memory segment must be known to contain the sought after byte.
+ *
+ * This is a GNU-compliant slibc extension.
+ *
+ * @param segment The memory segment to search.
+ * @param c The sought after character.
+ * @return Pointer to the first occurrence of `c`.
+ */
+void* rawmemchr(const void* segment, int c)
+{
+ for (;;)
+ if (*segment++ == c)
+ return segment - 1;
+}
+
+
+/**
+ * Find the last occurrence of a byte in a memory segment.
+ *
+ * For improved performace, use this function instead
+ * of `strrchr` if you already know the length of the
+ * string.
+ *
+ * @param segment The memory segment to search.
+ * @param c The sought after character.
+ * @param size The size of the memory segment.
+ * @return Pointer to the last occurrence of `c`,
+ * `NULL` if none were found.
+ */
+void* memrchr(const void* segment, int c, size_t size)
+{
+ while (size--)
+ if (segment[size] == c)
+ return segment + size;
+ return NULL;
+}
+
+
+/**
+ * Find the first occurrence of a byte in a string.
+ *
+ * `s = strchr(s, 0)` is a faster alternative to
+ * `s = s + strlen(s)`.
+ *
+ * @param string The string to search.
+ * The terminating NUL character is
+ * considered a part of the string.
+ * @param c The sought after character.
+ * @return Pointer to the first occurrence of `c`,
+ * `NULL` if none were found.
+ */
+char* strchr(const char* string, int c)
+{
+ while (; *string; string++)
+ if (*string == c)
+ return string;
+ return NULL;
+}
+/* TODO Ensure that `s = strchr(s, 0)` is faster than `s = s + strlen(s)`. */
+
+
+/**
+ * Find the first occurrence of a byte in a string, or
+ * if there is no such byte, the end of the string.
+ *
+ * This is a GNU-compliant slibc extension.
+ *
+ * @param string The string to search.
+ * The terminating NUL character is
+ * considered a part of the string.
+ * @param c The sought after character.
+ * @return Pointer to the first occurrence of `c`,
+ * Pointer to the terminating NUL character
+ * if none were found.
+ */
+char* strchrnul(const char* string, int c)
+{
+ while (; *string; string++)
+ if (*string == c)
+ return string;
+ return string;
+}
+
+
+/**
+ * Find the last occurrence of a byte in a string.
+ *
+ * For improved performace, use `memrchr` instead of
+ * this function if you already know the length of the
+ * string.
+ *
+ * @param string The string to search.
+ * The terminating NUL character is
+ * considered a part of the string.
+ * @param c The sought after character.
+ * @return Pointer to the last occurrence of `c`,
+ * `NULL` if none were found.
+ */
+char* strrchr(const char* string, int c)
+{
+ char* r = NULL;
+ while (; *string; string++)
+ if (*string == c)
+ r = string;
+ return r;
+}
+
diff --git a/src/wchar/wcschr.c b/src/wchar/wcschr.c
new file mode 100644
index 0000000..e96a90a
--- /dev/null
+++ b/src/wchar/wcschr.c
@@ -0,0 +1,151 @@
+/**
+ * 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>
+
+
+
+/**
+ * Find the first occurrence of a wide character
+ * in a memory segment.
+ *
+ * @param segment The memory segment to search.
+ * @param c The sought after character.
+ * @param size The size of the memory segment.
+ * @return Pointer to the first occurrence of `c`,
+ * `NULL` if none were found.
+ */
+wchar_t* wmemchr(const wchar_t* segment, wchar_t c, size_t size)
+{
+ while (size--)
+ if (*segment++ == c)
+ return segment - 1;
+ return NULL;
+}
+
+
+/**
+ * Find the first occurrence of a wide character in a
+ * memory segment. The memory segment must be known to
+ * contain the sought after character.
+ *
+ * This is a slibc extension added for completeness.
+ *
+ * @param segment The memory segment to search.
+ * @param c The sought after character.
+ * @return Pointer to the first occurrence of `c`.
+ */
+wchar_t* rawwmemchr(const wchar_t* segment, wchar_t c)
+{
+ for (;;)
+ if (*segment++ == c)
+ return segment - 1;
+}
+
+
+/**
+ * Find the last occurrence of a wide character in
+ * a memory segment.
+ *
+ * For improved performace, use this function instead
+ * of `wcssrchr` if you already know the length of the
+ * string.
+ *
+ * This is a slibc extension added for completeness.
+ *
+ * @param segment The memory segment to search.
+ * @param c The sought after character.
+ * @param size The size of the memory segment.
+ * @return Pointer to the last occurrence of `c`,
+ * `NULL` if none were found.
+ */
+wchar_t* wmemrchr(const wchar_t* segment, wchar_t c, size_t size)
+{
+ while (size--)
+ if (segment[size] == c)
+ return segment + size;
+ return NULL;
+}
+
+
+/**
+ * Find the first occurrence of a wide character in a string.
+ *
+ * @param string The string to search.
+ * The terminating NUL character is
+ * considered a part of the string.
+ * @param c The sought after character.
+ * @return Pointer to the first occurrence of `c`,
+ * `NULL` if none were found.
+ */
+wchar_t* wcschr(const wchar_t* string, wchar_t c)
+{
+ while (; *string; string++)
+ if (*string == c)
+ return string;
+ return NULL;
+}
+
+
+/**
+ * Find the first occurrence of a wide character in a
+ * string, or if there is no such character, the end of
+ * the string.
+ *
+ * This is a GNU-compliant slibc extension.
+ *
+ * @param string The string to search.
+ * The terminating NUL character is
+ * considered a part of the string.
+ * @param c The sought after character.
+ * @return Pointer to the first occurrence of `c`,
+ * Pointer to the terminating NUL character
+ * if none were found.
+ */
+wchar_t* wcschrnul(const wchar_t* string, wchar_t c)
+{
+ while (; *string; string++)
+ if (*string == c)
+ return string;
+ return string;
+}
+
+
+/**
+ * Find the last occurrence of a wide character in a string.
+ *
+ * For improved performace, use `wmemrchr` instead of
+ * this function if you already know the length of the
+ * string.
+ *
+ * @param string The string to search.
+ * The terminating NUL character is
+ * considered a part of the string.
+ * @param c The sought after character.
+ * @return Pointer to the last occurrence of `c`,
+ * `NULL` if none were found.
+ */
+wchar_t* wcsrchr(const wchar_t* string, wchar_t c)
+{
+ wchar_t* r = NULL;
+ while (; *string; string++)
+ if (*string == c)
+ r = string;
+ return r;
+}
+