Only link libcycript against libffi (not cycript).

[cycript.git] / Trampoline.t.cpp

diff --git a/Trampoline.t.cpp b/Trampoline.t.cpp
index 5bf77cea2339d6c969452da851fcd40ffd9daa31..73baa3a2b24582d259abe67db399de607b7b3206 100644 (file)
--- a/Trampoline.t.cpp
+++ b/Trampoline.t.cpp
@@ -1,20 +1,20 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2010  Jay Freeman (saurik)
+ * Copyright (C) 2009-2013  Jay Freeman (saurik)
 */
 
-/* GNU Lesser General Public License, Version 3 {{{ */
+/* GNU General Public License, Version 3 {{{ */
 /*
- * Cycript is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
+ * Cycript 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.
  *
- * Cycript 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 Lesser General Public
- * License for more details.
+ * Cycript 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 Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
 **/
 /* }}} */
@@ -32,12 +32,22 @@ static _finline void dlset(Baton *baton, Type_ &function, const char *name, void
         baton->dlerror();
 }
 
+// XXX: where you find this needs to be relative to CoreFoundation (or something)
+// XXX: this needs to check if the framework is under PrivateFrameworks instead
 #define Framework(framework) \
     "/System/Library/Frameworks/" #framework ".framework/" #framework
 
 void *Routine(void *arg) {
     Baton *baton(reinterpret_cast<Baton *>(arg));
 
+    int (*pthread_detach)(pthread_t);
+    dlset(baton, pthread_detach, "pthread_detach");
+
+    pthread_t (*pthread_self)();
+    dlset(baton, pthread_self, "pthread_self");
+
+    pthread_detach(pthread_self());
+
     void *(*dlopen)(const char *, int);
     dlset(baton, dlopen, "dlopen");
 
@@ -58,10 +68,12 @@ void *Routine(void *arg) {
 
     void (*CYHandleServer)(pid_t);
     dlset(baton, CYHandleServer, "CYHandleServer", handle);
+    if (CYHandleServer == NULL) {
+        baton->dlerror();
+        return NULL;
+    }
 
-    if (CYHandleServer != NULL)
-        CYHandleServer(baton->pid);
-
+    CYHandleServer(baton->pid);
     return NULL;
 }
 
@@ -85,12 +97,6 @@ extern "C" void Start(Baton *baton) {
     pthread_t thread;
     baton->pthread_create(&thread, NULL, &Routine, baton);
 
-    //int (*pthread_join)(pthread_t, void **);
-    //dlset(baton, pthread_join, "pthread_join");
-
-    //void *result;
-    //baton->pthread_join(thread, &result);
-
     //mach_port_t (*mach_thread_self)();
     //dlset(baton, mach_thread_self, "mach_thread_self");