summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Arbuckle <programmingkidx@gmail.com>2017-10-25 21:13:46 -0400
committerDavid Gibson <david@gibson.dropbear.id.au>2017-10-27 15:47:52 +0200
commitc8f8194d76cc2dc6d499548431ff62d0ddeca68d (patch)
tree9b8f4ec4eebcdb98509b4602a229344c3c4b57e4
parentc8b38f65fdec4226d43f0e8eb5cf541aff3c80a5 (diff)
downloaddevice-tree-compiler-c8f8194d76cc2dc6d499548431ff62d0ddeca68d.tar.gz
implement strnlen for systems that need it
Prior the Mac OS 10.7, the function strnlen() was not available. This patch implements strnlen() on Mac OS X versions that are below 10.7. Signed-off-by: John Arbuckle <programmingkidx@gmail.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
-rw-r--r--libfdt/libfdt_env.h27
1 files changed, 27 insertions, 0 deletions
diff --git a/libfdt/libfdt_env.h b/libfdt/libfdt_env.h
index 3605d93..bd24746 100644
--- a/libfdt/libfdt_env.h
+++ b/libfdt/libfdt_env.h
@@ -109,4 +109,31 @@ static inline fdt64_t cpu_to_fdt64(uint64_t x)
#undef CPU_TO_FDT16
#undef EXTRACT_BYTE
+#ifdef __APPLE__
+#include <AvailabilityMacros.h>
+
+/* strnlen() is not available on Mac OS < 10.7 */
+# if !defined(MAC_OS_X_VERSION_10_7) || (MAC_OS_X_VERSION_MAX_ALLOWED < \
+ MAC_OS_X_VERSION_10_7)
+
+#define strnlen fdt_strnlen
+
+/*
+ * fdt_strnlen: returns the length of a string or max_count - which ever is
+ * smallest.
+ * Input 1 string: the string whose size is to be determined
+ * Input 2 max_count: the maximum value returned by this function
+ * Output: length of the string or max_count (the smallest of the two)
+ */
+static inline size_t fdt_strnlen(const char *string, size_t max_count)
+{
+ const char *p = memchr(string, 0, max_count);
+ return p ? p - string : max_count;
+}
+
+#endif /* !defined(MAC_OS_X_VERSION_10_7) || (MAC_OS_X_VERSION_MAX_ALLOWED <
+ MAC_OS_X_VERSION_10_7) */
+
+#endif /* __APPLE__ */
+
#endif /* LIBFDT_ENV_H */