With -p on all platforms, we can't use asprintf().

[cycript.git] / String.hpp

diff --git a/String.hpp b/String.hpp
index 57814a486ee1f1d42f7764d7a16bf7cbbf95d683..0bc55199754e354241e69827658748e987388e9a 100644 (file)
--- a/String.hpp
+++ b/String.hpp
@@ -1,5 +1,5 @@
-/* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2015  Jay Freeman (saurik)
+/* Cycript - The Truly Universal Scripting Language
+ * Copyright (C) 2009-2016  Jay Freeman (saurik)
 */
 
 /* GNU Affero General Public License, Version 3 {{{ */
@@ -54,6 +54,11 @@ struct CYUTF8String {
         return length == size && memcmp(value, data, length) == 0;
     }
 
+    bool operator !=(const char *value) const {
+        size_t length(strlen(data));
+        return length != size || memcmp(value, data, length) != 0;
+    }
+
     operator std::string() const {
         return std::string(data, size);
     }
@@ -77,10 +82,23 @@ struct CYUTF16String {
 
 size_t CYGetIndex(const CYUTF8String &value);
 bool CYIsKey(CYUTF8String value);
+
 bool CYGetOffset(const char *value, ssize_t &index);
 
 bool CYStartsWith(const CYUTF8String &haystack, const CYUTF8String &needle);
 
+_finline const char *CYPoolCString(CYPool &pool, CYUTF8String utf8) {
+    return pool.strndup(utf8.data, utf8.size);
+}
+
+_finline CYUTF8String CYPoolUTF8String(CYPool &pool, CYUTF8String utf8) {
+    return {pool.strndup(utf8.data, utf8.size), utf8.size};
+}
+
+_finline CYUTF8String CYPoolUTF8String(CYPool &pool, const std::string &value) {
+    return {pool.strndup(value.data(), value.size()), value.size()};
+}
+
 CYUTF8String CYPoolUTF8String(CYPool &pool, CYUTF16String utf16);
 CYUTF16String CYPoolUTF16String(CYPool &pool, CYUTF8String utf8);