Fixed a minor packaging SNAFU that broke the iPhone build.

[cycript.git] / Library.cpp

diff --git a/Library.cpp b/Library.cpp
index 80a17f7510ed3c11733a4390ebe59e8301a329e2..cccd69bb6e7f6ded3b714aa8bccdb69f8cd09130 100644 (file)
--- a/Library.cpp
+++ b/Library.cpp
@@ -140,16 +140,21 @@ static CYUTF16String CYCastUTF16String(JSStringRef value) {
     return CYUTF16String(JSStringGetCharactersPtr(value), JSStringGetLength(value));
 }
 
     return CYUTF16String(JSStringGetCharactersPtr(value), JSStringGetLength(value));
 }
 

-static CYUTF8String CYPoolUTF8String(apr_pool_t *pool, JSContextRef context, JSStringRef value) {
+template <typename Type_>
+_finline size_t iconv_(size_t (*iconv)(iconv_t, Type_, size_t *, char **, size_t *), iconv_t cd, char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft) {
+    return iconv(cd, const_cast<Type_>(inbuf), inbytesleft, outbuf, outbytesleft);
+}
+
+CYUTF8String CYPoolUTF8String(apr_pool_t *pool, JSContextRef context, JSStringRef value) {

     _assert(pool != NULL);
 
     CYUTF16String utf16(CYCastUTF16String(value));
     const char *in(reinterpret_cast<const char *>(utf16.data));
 
     _assert(pool != NULL);
 
     CYUTF16String utf16(CYCastUTF16String(value));
     const char *in(reinterpret_cast<const char *>(utf16.data));
 

-#ifdef __APPLE__
-    iconv_t conversion(_syscall(iconv_open("UTF-8", "UCS-2-INTERNAL")));
-#else
+#ifdef __GLIBC__

     iconv_t conversion(_syscall(iconv_open("UTF-8", "UCS-2")));
     iconv_t conversion(_syscall(iconv_open("UTF-8", "UCS-2")));

+#else
+    iconv_t conversion(_syscall(iconv_open("UTF-8", "UCS-2-INTERNAL")));

 #endif
 
     size_t size(JSStringGetMaximumUTF8CStringSize(value));
 #endif
 
     size_t size(JSStringGetMaximumUTF8CStringSize(value));


@@ -157,7 +162,7 @@ static CYUTF8String CYPoolUTF8String(apr_pool_t *pool, JSContextRef context, JSS
     CYUTF8String utf8(out, size);
 
     size = utf16.size * 2;
     CYUTF8String utf8(out, size);
 
     size = utf16.size * 2;

-    _syscall(iconv(conversion, const_cast<char **>(&in), &size, &out, &utf8.size));
+    _syscall(iconv_(&iconv, conversion, const_cast<char **>(&in), &size, &out, &utf8.size));

 
     *out = '\0';
     utf8.size = out - utf8.data;
 
     *out = '\0';
     utf8.size = out - utf8.data;


@@ -245,8 +250,9 @@ void CYStringify(std::ostringstream &str, const char *data, size_t size) {
             break;
 
             default:
             break;
 
             default:

+                // this test is designed to be "awewsome", generating neither warnings nor incorrect results

                 if (*value < 0x20 || *value >= 0x7f)
                 if (*value < 0x20 || *value >= 0x7f)

-                    str << "\\x" << std::setbase(16) << std::setw(2) << std::setfill('0') << unsigned(*value);
+                    str << "\\x" << std::setbase(16) << std::setw(2) << std::setfill('0') << unsigned(uint8_t(*value));

                 else simple:
                     str << *value;
         }
                 else simple:
                     str << *value;
         }


@@ -1296,19 +1302,24 @@ static JSStaticFunction Type_staticFunctions[4] = {
     {NULL, NULL, 0}
 };
 
     {NULL, NULL, 0}
 };
 

+static JSObjectRef (*$JSObjectMakeArray)(JSContextRef, size_t, const JSValueRef[], JSValueRef *);
+

 void CYSetArgs(int argc, const char *argv[]) {
     JSContextRef context(CYGetJSContext());
     JSValueRef args[argc];
     for (int i(0); i != argc; ++i)
         args[i] = CYCastJSValue(context, argv[i]);
 void CYSetArgs(int argc, const char *argv[]) {
     JSContextRef context(CYGetJSContext());
     JSValueRef args[argc];
     for (int i(0); i != argc; ++i)
         args[i] = CYCastJSValue(context, argv[i]);

-#ifdef __APPLE__
-    JSValueRef exception(NULL);
-    JSObjectRef array(JSObjectMakeArray(context, argc, args, &exception));
-    CYThrow(context, exception);
-#else
-    JSValueRef value(CYCallAsFunction(context, Array_, NULL, argc, args));
-    JSObjectRef array(CYCastJSObject(context, value));
-#endif
+
+    JSObjectRef array;
+    if ($JSObjectMakeArray != NULL) {
+        JSValueRef exception(NULL);
+        array = (*$JSObjectMakeArray)(context, argc, args, &exception);
+        CYThrow(context, exception);
+    } else {
+        JSValueRef value(CYCallAsFunction(context, Array_, NULL, argc, args));
+        array = CYCastJSObject(context, value);
+    }
+

     CYSetProperty(context, System_, CYJSString("args"), array);
 }
 
     CYSetProperty(context, System_, CYJSString("args"), array);
 }
 


@@ -1370,6 +1381,8 @@ void CYInitialize() {
     _aprcall(apr_initialize());
     _aprcall(apr_pool_create(&Pool_, NULL));
     _sqlcall(sqlite3_open("/usr/lib/libcycript.db", &Bridge_));
     _aprcall(apr_initialize());
     _aprcall(apr_pool_create(&Pool_, NULL));
     _sqlcall(sqlite3_open("/usr/lib/libcycript.db", &Bridge_));

+
+    $JSObjectMakeArray = reinterpret_cast<JSObjectRef (*)(JSContextRef, size_t, const JSValueRef[], JSValueRef *)>(dlsym(RTLD_DEFAULT, "JSObjectMakeArray"));

 }
 
 apr_pool_t *CYGetGlobalPool() {
 }
 
 apr_pool_t *CYGetGlobalPool() {


@@ -1436,8 +1449,6 @@ CYJSError::CYJSError(JSContextRef context, const char *format, ...) {
     CYThrow(context, exception);
 }
 
     CYThrow(context, exception);
 }
 

-void CYObjectiveC(JSContextRef context, JSObjectRef global);
-

 JSGlobalContextRef CYGetJSContext() {
     CYInitialize();
 
 JSGlobalContextRef CYGetJSContext() {
     CYInitialize();
 


@@ -1556,10 +1567,8 @@ JSGlobalContextRef CYGetJSContext() {
 
         Result_ = JSStringCreateWithUTF8CString("_");
 
 
         Result_ = JSStringCreateWithUTF8CString("_");
 

-// XXX: this is very wrong and sad
-#ifdef __APPLE__
-        CYObjectiveC(context, global);
-#endif
+        if (hooks_ != NULL && hooks_->SetupContext != NULL)
+            (*hooks_->SetupContext)(context);

     }
 
     return Context_;
     }
 
     return Context_;