X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/d336c0247563c5a1a95fb205386945fc76251e7e..97343f3189a3ad66364ec26c35716f6894237fb9:/Trampoline.t.cpp

diff --git a/Trampoline.t.cpp b/Trampoline.t.cpp
index a0f5aef..f8780bc 100644
--- a/Trampoline.t.cpp
+++ b/Trampoline.t.cpp
@@ -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,9 +68,12 @@ void *Routine(void *arg) {
 
     void (*CYHandleServer)(pid_t);
     dlset(baton, CYHandleServer, "CYHandleServer", handle);
+    if (CYHandleServer == NULL) {
+        baton->dlerror();
+        return NULL;
+    }
 
     CYHandleServer(baton->pid);
-
     return NULL;
 }
 
@@ -78,23 +91,17 @@ extern "C" void Start(Baton *baton) {
     self.tsd[0] = &self;
     baton->__pthread_set_self(&self);
 
-    int (*pthread_create)(pthread_t *, const pthread_attr_t *, void *(*)(void *), void *);
-    dlset(baton, pthread_create, "pthread_create");
+    //int (*pthread_create)(pthread_t *, const pthread_attr_t *, void *(*)(void *), void *);
+    //dlset(baton, pthread_create, "pthread_create");
 
     pthread_t thread;
-    pthread_create(&thread, NULL, &Routine, baton);
-
-    int (*pthread_join)(pthread_t, void **);
-    dlset(baton, pthread_join, "pthread_join");
-
-    void *result;
-    pthread_join(thread, &result);
+    baton->pthread_create(&thread, NULL, &Routine, baton);
 
-    mach_port_t (*mach_thread_self)();
-    dlset(baton, mach_thread_self, "mach_thread_self");
+    //mach_port_t (*mach_thread_self)();
+    //dlset(baton, mach_thread_self, "mach_thread_self");
 
-    kern_return_t (*thread_terminate)(thread_act_t);
-    dlset(baton, thread_terminate, "thread_terminate");
+    //kern_return_t (*thread_terminate)(thread_act_t);
+    //dlset(baton, thread_terminate, "thread_terminate");
 
-    thread_terminate(mach_thread_self());
+    baton->thread_terminate(baton->mach_thread_self());
 }