With -p on all platforms, we can't use asprintf().

[cycript.git] / Inject.cpp

diff --git a/Inject.cpp b/Inject.cpp
index b5136f6b94340a2c6b2c5b6178064be2f57fdb09..a451b3db74fb3210a3dcac66f4ef4df2c08745aa 100644 (file)
--- a/Inject.cpp
+++ b/Inject.cpp
@@ -1,5 +1,5 @@
-/* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2015  Jay Freeman (saurik)
+/* Cycript - The Truly Universal Scripting Language
+ * Copyright (C) 2009-2016  Jay Freeman (saurik)

 */
 
 /* GNU Affero General Public License, Version 3 {{{ */
 */
 
 /* GNU Affero General Public License, Version 3 {{{ */


@@ -55,7 +55,7 @@ Type_ *shift(Type_ *data, size_t size) {
     return reinterpret_cast<Type_ *>(reinterpret_cast<uint8_t *>(data) + size);
 }
 
     return reinterpret_cast<Type_ *>(reinterpret_cast<uint8_t *>(data) + size);
 }
 

-void InjectLibrary(int pid, int argc, const char *const argv[]) {
+void InjectLibrary(int pid, std::ostream &stream, int argc, const char *const argv[]) {

     auto cynject(LibraryFor(reinterpret_cast<void *>(&main)));
     auto slash(cynject.rfind('/'));
     _assert(slash != std::string::npos);
     auto cynject(LibraryFor(reinterpret_cast<void *>(&main)));
     auto slash(cynject.rfind('/'));
     _assert(slash != std::string::npos);


@@ -113,8 +113,32 @@ void InjectLibrary(int pid, int argc, const char *const argv[]) {
 
     std::ostringstream inject;
     inject << cynject << " " << std::dec << pid << " " << library;
 
     std::ostringstream inject;
     inject << cynject << " " << std::dec << pid << " " << library;

-    for (decltype(argc) i(0); i != argc; ++i)
-        inject << " " << argv[i];
+    for (decltype(argc) i(0); i != argc; ++i) {
+        inject << " '";
+        for (const char *arg(argv[i]); *arg != '\0'; ++arg)
+            if (*arg != '\'')
+                inject.put(*arg);
+            else
+                inject << "'\\''";
+        inject << "'";
+    }
+
+    FILE *process(popen(inject.str().c_str(), "r"));
+    _assert(process != NULL);
+
+    for (;;) {
+        char data[1024];
+        auto writ(fread(data, 1, sizeof(data), process));
+        stream.write(data, writ);
+
+        if (writ == sizeof(data))
+            continue;
+        _assert(!ferror(process));
+        if (feof(process))
+            break;
+    }

 
 

-    _assert(system(inject.str().c_str()) == 0);
+    auto status(pclose(process)); // XXX: _scope (sort of?)
+    _assert(status != -1);
+    _assert(status == 0);

 }
 }