From 26da2bbeb9781782b1242acc1668f649c336d65f Mon Sep 17 00:00:00 2001
From: Mattias Andrée <maandree@operamail.com>
Date: Mon, 31 Aug 2015 04:15:39 +0200
Subject: add strlen and wcslen
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mattias Andrée <maandree@operamail.com>
---
 include/string.h | 33 +++++++++++++++++++++++++++--
 include/wchar.h  | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 95 insertions(+), 2 deletions(-)
 create mode 100644 include/wchar.h

(limited to 'include')

diff --git a/include/string.h b/include/string.h
index d30184f..560080b 100644
--- a/include/string.h
+++ b/include/string.h
@@ -25,6 +25,7 @@
 
 
 #define __NEED_size_t
+#define __NEED_wchar_t
 #define __NEED_locale_t /* TODO not defined */
 
 #include <bits/types.h>
@@ -50,7 +51,7 @@
  * @return          A description of the error.
  */
 char* strerror(int)
-  __GCC_ONLY(__attribute__((returns_nonnull)));
+  __GCC_ONLY(__attribute__((returns_nonnull, warn_unused_result)));
 
 /**
  * Return a textual representation of an error code.
@@ -68,7 +69,8 @@ char* strerror(int)
  *                  `LC_GLOBAL_LOCALE`, lest the behaviour is undefined.
  * @return          A description of the error.
  */
-char* strerror_l(int, locale_t);
+char* strerror_l(int, locale_t)
+  __GCC_ONLY(__attribute__((warn_unused_result)));
 
 
 #if !defined(_PORTABLE_SOURCE) && !defined(_SLIBC_SOURCE)
@@ -117,6 +119,33 @@ char* __gnu_strerror_r(int, char*, size_t); /* GNU-specific strerror_r */
 #endif
 
 
+/**
+ * Returns the number of bytes in a NUL-terminated
+ * string. This excludes the NUL byte.
+ * 
+ * @param   str  The string.
+ * @return       The number of bytes before the first NUL byte.
+ */
+size_t strlen(const char*)
+  __GCC_ONLY(__attribute__((nonnull, warn_unused_result)));
+
+#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) || \
+    defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || \
+    defined(_BSD_SOURCE)
+/**
+ * Variant of `strlen` that only inspects the
+ * beginning of s string.
+ * 
+ * @param   str     The string.
+ * @param   maxlen  The number of bytes to inspect, at most.
+ * @return          The number of bytes before, the first NUL byte.
+ *                  `maxlen` if no NUL byte was found.
+ */
+size_t strnlen(const char*, size_t)
+  __GCC_ONLY(__attribute__((warn_unused_result)));
+#endif
+
+
 
 #endif
 
diff --git a/include/wchar.h b/include/wchar.h
new file mode 100644
index 0000000..c9901d2
--- /dev/null
+++ b/include/wchar.h
@@ -0,0 +1,64 @@
+/**
+ * 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/>.
+ */
+#ifndef _WCHAR_H
+#define _WCHAR_H
+#ifndef _PORTABLE_SOURCE /* `wchar_t` is not portable. */
+#include <slibc/version.h>
+
+
+#include <slibc/features.h>
+
+
+
+#define __NEED_size_t
+#define __NEED_wchar_t
+
+#include <bits/types.h>
+
+
+/**
+ * `wchar_t` version of `strlen`.
+ * 
+ * @param   str  The string.
+ * @return       The number of `wchar_t`:s before the
+ *               first NUL character.
+ */
+size_t wcslen(const wchar_t*)
+  __GCC_ONLY(__attribute__((nonnull, warn_unused_result)));
+
+#if defined(_POSIX_SOURCE) || defined(_POSIX_C_SOURCE) || \
+    defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) || \
+    defined(_BSD_SOURCE)
+/**
+ * `wchar_t` version of `strnlen`.
+ * 
+ * @param   str     The string.
+ * @param   maxlen  The number of bytes to inspect, at most.
+ * @return          The number of `wchar_t`:s before the
+ *                  first NUL character. `maxlen` if no
+ *                  NUL character was found.
+ */
+size_t wcsnlen(const wchar_t*, size_t)
+  __GCC_ONLY(__attribute__((warn_unused_result)));
+#endif
+
+
+
+#endif
+#endif
+
-- 
cgit v1.2.3-70-g09d2