fs/Traits: use string.h API wrappers

3 files changed, 138 insertions, 16 deletions

diff --git a/Makefile.am b/Makefile.am
index 11718e86f..ca26bcae1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -378,6 +378,7 @@ libutil_a_SOURCES = \
 	src/util/CharUtil.hxx \
 	src/util/NumberParser.hxx \
 	src/util/StringUtil.cxx src/util/StringUtil.hxx \
+	src/util/StringAPI.hxx \
 	src/util/DivideString.cxx src/util/DivideString.hxx \
 	src/util/SplitString.cxx src/util/SplitString.hxx \
 	src/util/FormatString.cxx src/util/FormatString.hxx \
diff --git a/src/fs/Traits.hxx b/src/fs/Traits.hxx
index 0860dfb8a..1a2cd8226 100644
--- a/src/fs/Traits.hxx
+++ b/src/fs/Traits.hxx
@@ -22,6 +22,7 @@
 
 #include "check.h"
 #include "Compiler.h"
+#include "util/StringAPI.hxx"
 
 #ifdef WIN32
 #include "util/CharUtil.hxx"
@@ -29,7 +30,6 @@
 
 #include <string>
 
-#include <string.h>
 #include <assert.h>
 
 /**
@@ -71,7 +71,7 @@ struct PathTraitsFS {
 			--pos;
 		return IsSeparator(*pos) ? pos : nullptr;
 #else
-		return strrchr(p, SEPARATOR);
+		return StringFindLast(p, SEPARATOR);
 #endif
 	}
 
@@ -98,17 +98,12 @@ struct PathTraitsFS {
 
 	gcc_pure gcc_nonnull_all
 	static size_t GetLength(const_pointer p) {
-		return char_traits::length(p);
-	}
-
-	gcc_pure gcc_nonnull_all
-	static const_pointer Find(const_pointer p, size_t n, value_type ch) {
-		return char_traits::find(p, n, ch);
+		return StringLength(p);
 	}
 
 	gcc_pure gcc_nonnull_all
 	static const_pointer Find(const_pointer p, value_type ch) {
-		return strchr(p, ch);
+		return StringFind(p, ch);
 	}
 
 	/**
@@ -202,17 +197,12 @@ struct PathTraitsUTF8 {
 
 	gcc_pure gcc_nonnull_all
 	static size_t GetLength(const_pointer p) {
-		return char_traits::length(p);
-	}
-
-	gcc_pure gcc_nonnull_all
-	static const_pointer Find(const_pointer p, size_t n, value_type ch) {
-		return char_traits::find(p, n, ch);
+		return StringLength(p);
 	}
 
 	gcc_pure gcc_nonnull_all
 	static const_pointer Find(const_pointer p, value_type ch) {
-		return strchr(p, ch);
+		return StringFind(p, ch);
 	}
 
 	/**
diff --git a/src/util/StringAPI.hxx b/src/util/StringAPI.hxx
new file mode 100644
index 000000000..c02055437
--- /dev/null
+++ b/src/util/StringAPI.hxx
@@ -0,0 +1,131 @@
+/*
+ * Copyright (C) 2010-2015 Max Kellermann <max@duempel.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - 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.
+ *
+ * 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
+ * FOUNDATION 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.
+ */
+
+#ifndef STRING_API_HPP
+#define STRING_API_HPP
+
+#include "Compiler.h"
+
+#include <string.h>
+
+gcc_pure gcc_nonnull_all
+static inline size_t
+StringLength(const char *p)
+{
+	return strlen(p);
+}
+
+gcc_pure gcc_nonnull_all
+static inline const char *
+StringFind(const char *haystack, const char *needle)
+{
+	return strstr(haystack, needle);
+}
+
+gcc_pure gcc_nonnull_all
+static inline char *
+StringFind(char *haystack, char needle, size_t size)
+{
+	return (char *)memchr(haystack, needle, size);
+}
+
+gcc_pure gcc_nonnull_all
+static inline const char *
+StringFind(const char *haystack, char needle, size_t size)
+{
+	return (const char *)memchr(haystack, needle, size);
+}
+
+gcc_pure gcc_nonnull_all
+static inline const char *
+StringFind(const char *haystack, char needle)
+{
+	return strchr(haystack, needle);
+}
+
+gcc_pure gcc_nonnull_all
+static inline char *
+StringFind(char *haystack, char needle)
+{
+	return strchr(haystack, needle);
+}
+
+gcc_pure gcc_nonnull_all
+static inline const char *
+StringFindLast(const char *haystack, char needle)
+{
+	return strrchr(haystack, needle);
+}
+
+gcc_pure gcc_nonnull_all
+static inline char *
+StringFindLast(char *haystack, char needle)
+{
+	return strrchr(haystack, needle);
+}
+
+gcc_nonnull_all
+static inline void
+UnsafeCopyString(char *dest, const char *src)
+{
+	strcpy(dest, src);
+}
+
+/**
+ * Checks whether #a and #b are equal.
+ */
+gcc_pure gcc_nonnull_all
+static inline bool
+StringIsEqual(const char *a, const char *b)
+{
+	return strcmp(a, b) == 0;
+}
+
+/**
+ * Checks whether #a and #b are equal.
+ */
+gcc_pure gcc_nonnull_all
+static inline bool
+StringIsEqual(const char *a, const char *b, size_t length)
+{
+	return strncmp(a, b, length) == 0;
+}
+
+/**
+ * Copy the string to a new allocation.  The return value must be
+ * freed with free().
+ */
+gcc_malloc gcc_nonnull_all
+static inline char *
+DuplicateString(const char *p)
+{
+	return strdup(p);
+}
+
+#endif