Theoretically fix bug with in operators in messages.

[cycript.git] / Trampoline.t.cpp

diff --git a/Trampoline.t.cpp b/Trampoline.t.cpp
index 78c81837098ff6bc0bcf97171d6c44c137da3369..5b5fc4efe523a4701a6a1acf8ff5f3d17df8bbd9 100644 (file)
--- a/Trampoline.t.cpp
+++ b/Trampoline.t.cpp
@@ -1,40 +1,22 @@
-/* Cycript - Inlining/Optimizing JavaScript Compiler
- * Copyright (C) 2009  Jay Freeman (saurik)
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2012  Jay Freeman (saurik)

 */
 
 */
 

-/* Modified BSD License {{{ */
+/* GNU Lesser General Public License, Version 3 {{{ */

 /*
 /*

- *        Redistribution and use in source and binary
- * forms, with or without modification, are permitted
- * provided that the following conditions are met:
+ * 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.

  *
  *

- * 1. Redistributions of source code must retain the
- *    above copyright notice, this list of conditions
- *    and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the
- *    above copyright notice, this list of conditions
- *    and the following disclaimer in the documentation
- *    and/or other materials provided with the
- *    distribution.
- * 3. The name of the author may not be used to endorse
- *    or promote products derived from this software
- *    without specific prior written permission.
+ * 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.

  *
  *

- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
+**/

 /* }}} */
 
 #define _PTHREAD_ATTR_T
 /* }}} */
 
 #define _PTHREAD_ATTR_T


@@ -50,12 +32,22 @@ static _finline void dlset(Baton *baton, Type_ &function, const char *name, void
         baton->dlerror();
 }
 
         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));
 
 #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");
 
     void *(*dlopen)(const char *, int);
     dlset(baton, dlopen, "dlopen");
 


@@ -76,9 +68,12 @@ void *Routine(void *arg) {
 
     void (*CYHandleServer)(pid_t);
     dlset(baton, CYHandleServer, "CYHandleServer", handle);
 
     void (*CYHandleServer)(pid_t);
     dlset(baton, CYHandleServer, "CYHandleServer", handle);

+    if (CYHandleServer == NULL) {
+        baton->dlerror();
+        return NULL;
+    }

 
     CYHandleServer(baton->pid);
 
     CYHandleServer(baton->pid);

-

     return NULL;
 }
 
     return NULL;
 }
 


@@ -96,23 +91,17 @@ extern "C" void Start(Baton *baton) {
     self.tsd[0] = &self;
     baton->__pthread_set_self(&self);
 
     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;
     baton->pthread_create(&thread, NULL, &Routine, 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");
+    //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");

 
     baton->thread_terminate(baton->mach_thread_self());
 }
 
     baton->thread_terminate(baton->mach_thread_self());
 }