Do not convert exceptions to CYON before display.

[cycript.git] / Trampoline.t.cpp

diff --git a/Trampoline.t.cpp b/Trampoline.t.cpp
index 5bf77cea2339d6c969452da851fcd40ffd9daa31..267a25353dd42f64a0ed23e647c2a1cf2960081a 100644 (file)
--- a/Trampoline.t.cpp
+++ b/Trampoline.t.cpp
@@ -38,6 +38,14 @@ static _finline void dlset(Baton *baton, Type_ &function, const char *name, void
 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 +66,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 +95,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");