Find JVM with dlopen and register Android natives.

[cycript.git] / Console.cpp

diff --git a/Console.cpp b/Console.cpp
index 4cf0ac16158e9a40b8ceb37a7fff5e33217ff0fc..43012acb96712a988c6d781104e4eeac20a803c7 100644 (file)
--- a/Console.cpp
+++ b/Console.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 {{{ */


@@ -68,6 +68,7 @@
 #include <mach/mach_time.h>
 #endif
 
 #include <mach/mach_time.h>
 #endif
 

+#include "Code.hpp"

 #include "Driver.hpp"
 #include "Error.hpp"
 #include "Highlight.hpp"
 #include "Driver.hpp"
 #include "Error.hpp"
 #include "Highlight.hpp"


@@ -219,7 +220,9 @@ static void sigint(int) {
         case Parsing:
             longjmp(ctrlc_, 1);
         case Running:
         case Parsing:
             longjmp(ctrlc_, 1);
         case Running:

+#ifndef __ANDROID__

             CYCancel();
             CYCancel();

+#endif

             return;
         case Sending:
             return;
             return;
         case Sending:
             return;


@@ -289,7 +292,25 @@ static CYUTF8String Run(CYPool &pool, int client, const std::string &code) {
 
 static std::ostream *out_;
 
 
 static std::ostream *out_;
 

-static void Output(CYUTF8String json, std::ostream *out, bool expand = false) {
+static void Output(CYUTF8String json, std::ostream *out, bool expand = false, bool reparse = false) {
+    CYPool pool;
+
+    if (reparse) do {
+        CYStream stream(json.data, json.data + json.size);
+        CYDriver driver(pool, stream);
+        if (driver.Parse(CYMarkExpression))
+            break;
+        std::stringbuf str;
+        CYOptions options;
+        CYOutput out(str, options);
+        out.pretty_ = true;
+        out << *driver.context_;
+        std::string data(str.str());
+        json = CYPoolUTF8String(pool, data);
+        if (json.size == 0)
+            json.data = NULL;
+    } while (false);
+

     const char *data(json.data);
     size_t size(json.size);
 
     const char *data(json.data);
     size_t size(json.size);
 


@@ -361,7 +382,7 @@ class History {
                 if (*character == '\x01') *character = '\n';
     }
 
                 if (*character == '\x01') *character = '\n';
     }
 

-    ~History() {
+    ~History() { try {

         for (HIST_ENTRY *history((history_set_pos(0), current_history())); history; history = next_history())
             for (char *character(history->line); *character; ++character)
                 if (*character == '\n') *character = '\x01';
         for (HIST_ENTRY *history((history_set_pos(0), current_history())); history; history = next_history())
             for (char *character(history->line); *character; ++character)
                 if (*character == '\n') *character = '\x01';


@@ -373,7 +394,10 @@ class History {
         } else {
             _assert(write_history(histfile_.c_str()) == 0);
         }
         } else {
             _assert(write_history(histfile_.c_str()) == 0);
         }

-    }
+    } catch (const CYException &error) {
+        CYPool pool;
+        std::cout << error.PoolCString(pool) << std::endl;
+    } }

 
     void operator +=(std::string command) {
         add_history(command.c_str());
 
     void operator +=(std::string command) {
         add_history(command.c_str());


@@ -389,11 +413,25 @@ static Type_ *CYmemrchr(Type_ *data, Type_ value, size_t size) {
     return NULL;
 }
 
     return NULL;
 }
 

+static void _lblcall(int (*command)(int, int), int count, int key) {
+    int last(_rl_last_c_pos);
+    // rl_rubout crashes in _rl_erase_at_end_of_line if _rl_last_c_pos != 0
+    if (command == &rl_rubout)
+        _rl_last_c_pos = 0;
+    for (int i(0); i != count; ++i)
+        if (command(1, key) != 0)
+            _assert(false);
+    _rl_last_c_pos = last;
+}
+

 static int CYConsoleKeyReturn(int count, int key) {
     if (rl_point != rl_end) {
 static int CYConsoleKeyReturn(int count, int key) {
     if (rl_point != rl_end) {

-        if (memchr(rl_line_buffer, '\n', rl_end) == NULL)
-            return rl_newline(count, key);
+        if (memchr(rl_line_buffer, '\n', rl_end) == NULL) {
+            _lblcall(&rl_newline, count, key);
+            return 0;
+        }

 
 

+      insert:

         char *before(CYmemrchr(rl_line_buffer, '\n', rl_point));
         if (before == NULL)
             before = rl_line_buffer;
         char *before(CYmemrchr(rl_line_buffer, '\n', rl_point));
         if (before == NULL)
             before = rl_line_buffer;


@@ -404,11 +442,11 @@ static int CYConsoleKeyReturn(int count, int key) {
 
         int adjust(rl_line_buffer + space - 1 - before);
         if (space == rl_point && adjust != 0)
 
         int adjust(rl_line_buffer + space - 1 - before);
         if (space == rl_point && adjust != 0)

-            rl_rubout(adjust, '\b');
+            _lblcall(&rl_rubout, adjust, '\b');

 
 

-        rl_insert(count, '\n');
+        _lblcall(&rl_insert, count, '\n');

         if (adjust != 0)
         if (adjust != 0)

-            rl_insert(adjust, ' ');
+            _lblcall(&rl_insert, adjust, ' ');

 
         return 0;
     }
 
         return 0;
     }


@@ -419,7 +457,7 @@ static int CYConsoleKeyReturn(int count, int key) {
     else {
         std::string command(rl_line_buffer, rl_end);
         command += '\n';
     else {
         std::string command(rl_line_buffer, rl_end);
         command += '\n';

-        std::istringstream stream(command);
+        std::stringbuf stream(command);

 
         size_t last(std::string::npos);
         for (size_t i(0); i != std::string::npos; i = command.find('\n', i + 1))
 
         size_t last(std::string::npos);
         for (size_t i(0); i != std::string::npos; i = command.find('\n', i + 1))


@@ -437,15 +475,17 @@ static int CYConsoleKeyReturn(int count, int key) {
             done = true;
     }
 
             done = true;
     }
 

-    if (done)
-        return rl_newline(count, key);
+    if (done) {
+        _lblcall(&rl_newline, count, key);
+        return 0;
+    }

 
 

-    rl_insert(count, '\n');
-    return 0;
+    // XXX: this was the most obvious fix, but is seriously dumb
+    goto insert;

 }
 
 static int CYConsoleKeyUp(int count, int key) {
 }
 
 static int CYConsoleKeyUp(int count, int key) {

-    while (count-- != 0) {
+    for (; count != 0; --count) {

         char *after(CYmemrchr(rl_line_buffer, '\n', rl_point));
         if (after == NULL) {
             if (int value = rl_get_previous_history(1, key))
         char *after(CYmemrchr(rl_line_buffer, '\n', rl_point));
         if (after == NULL) {
             if (int value = rl_get_previous_history(1, key))


@@ -468,7 +508,7 @@ static int CYConsoleKeyUp(int count, int key) {
 }
 
 static int CYConsoleKeyDown(int count, int key) {
 }
 
 static int CYConsoleKeyDown(int count, int key) {

-    while (count-- != 0) {
+    for (; count != 0; --count) {

         char *after(static_cast<char *>(memchr(rl_line_buffer + rl_point, '\n', rl_end - rl_point)));
         if (after == NULL) {
             int where(where_history());
         char *after(static_cast<char *>(memchr(rl_line_buffer + rl_point, '\n', rl_end - rl_point)));
         if (after == NULL) {
             int where(where_history());


@@ -515,21 +555,28 @@ static int CYConsoleLineEnd(int count, int key) {
 }
 
 static int CYConsoleKeyBack(int count, int key) {
 }
 
 static int CYConsoleKeyBack(int count, int key) {

-    while (count-- != 0) {
+    for (; count != 0; --count) {
+        if (rl_point == 0)
+            return 1;
+

         char *before(CYmemrchr(rl_line_buffer, '\n', rl_point));
         char *before(CYmemrchr(rl_line_buffer, '\n', rl_point));

-        if (before == NULL)
-            return rl_rubout(count, key);
+        if (before == NULL) {
+            int adjust(std::min(count, rl_point));
+            _lblcall(&rl_rubout, adjust, key);
+            count -= adjust - 1;
+            continue;
+        }

 
         int start(before + 1 - rl_line_buffer);
         if (start == rl_point) rubout: {
 
         int start(before + 1 - rl_line_buffer);
         if (start == rl_point) rubout: {

-            rl_rubout(1, key);
+            _lblcall(&rl_rubout, 1, key);

             continue;
         }
 
         for (int i(start); i != rl_point; ++i)
             if (rl_line_buffer[i] != ' ')
                 goto rubout;
             continue;
         }
 
         for (int i(start); i != rl_point; ++i)
             if (rl_line_buffer[i] != ' ')
                 goto rubout;

-        rl_rubout((rl_point - start) % 4 ?: 4, key);
+        _lblcall(&rl_rubout, (rl_point - start) % 4 ?: 4, key);

     }
 
     return 0;
     }
 
     return 0;


@@ -543,7 +590,8 @@ static int CYConsoleKeyTab(int count, int key) {
     for (int i(start); i != rl_point; ++i)
         if (rl_line_buffer[i] != ' ')
             goto complete;
     for (int i(start); i != rl_point; ++i)
         if (rl_line_buffer[i] != ' ')
             goto complete;

-    return rl_insert(4 - (rl_point - start) % 4, ' ');
+    _lblcall(&rl_insert, 4 - (rl_point - start) % 4, ' ');
+    return 0;

 }
 
 static void CYConsoleRemapBind(Keymap map, rl_command_func_t *from, rl_command_func_t *to) {
 }
 
 static void CYConsoleRemapBind(Keymap map, rl_command_func_t *from, rl_command_func_t *to) {


@@ -578,8 +626,16 @@ static void CYConsolePrepTerm(int meta) {
     CYConsoleRemapKeys(vi_movement_keymap);
 }
 
     CYConsoleRemapKeys(vi_movement_keymap);
 }
 

+static void CYOutputRun(const std::string &code, bool expand = false, bool reparse = false) {
+    CYPool pool;
+    Output(Run(pool, client_, code), &std::cout, expand, reparse);
+}
+

 static void Console(CYOptions &options) {
     std::string basedir;
 static void Console(CYOptions &options) {
     std::string basedir;

+#ifdef __ANDROID__
+    basedir = "/data/local/tmp";
+#else

     if (const char *home = getenv("HOME"))
         basedir = home;
     else {
     if (const char *home = getenv("HOME"))
         basedir = home;
     else {


@@ -590,6 +646,7 @@ static void Console(CYOptions &options) {
             passwd = getpwuid(getuid());
         basedir = passwd->pw_dir;
     }
             passwd = getpwuid(getuid());
         basedir = passwd->pw_dir;
     }

+#endif

 
     basedir += "/.cycript";
     mkdir(basedir.c_str(), 0700);
 
     basedir += "/.cycript";
     mkdir(basedir.c_str(), 0700);


@@ -603,14 +660,19 @@ static void Console(CYOptions &options) {
     bool debug(false);
     bool expand(false);
     bool lower(true);
     bool debug(false);
     bool expand(false);
     bool lower(true);

+    bool reparse(false);

 
     out_ = &std::cout;
 
     rl_completer_word_break_characters = break_;
     rl_attempted_completion_function = &Complete;
 
 
     out_ = &std::cout;
 
     rl_completer_word_break_characters = break_;
     rl_attempted_completion_function = &Complete;
 

-    rl_redisplay_function = CYDisplayUpdate;
-    rl_prep_term_function = CYConsolePrepTerm;
+    if (cur_term != NULL) {
+        rl_redisplay_function = CYDisplayUpdate;
+        rl_prep_term_function = CYConsolePrepTerm;
+    }
+
+    CYOutputRun("");

 
     struct sigaction action;
     sigemptyset(&action.sa_mask);
 
     struct sigaction action;
     sigemptyset(&action.sa_mask);


@@ -670,6 +732,9 @@ static void Console(CYOptions &options) {
             } else if (data == "lower") {
                 lower = !lower;
                 *out_ << "lower == " << (lower ? "true" : "false") << std::endl;
             } else if (data == "lower") {
                 lower = !lower;
                 *out_ << "lower == " << (lower ? "true" : "false") << std::endl;

+            } else if (data == "reparse") {
+                reparse = !reparse;
+                *out_ << "reparse == " << (reparse ? "true" : "false") << std::endl;

             }
 
             continue;
             }
 
             continue;


@@ -679,7 +744,7 @@ static void Console(CYOptions &options) {
         if (bypass)
             code = command;
         else try {
         if (bypass)
             code = command;
         else try {

-            std::istringstream stream(command);
+            std::stringbuf stream(command);

 
             CYPool pool;
             CYDriver driver(pool, stream);
 
             CYPool pool;
             CYDriver driver(pool, stream);


@@ -733,8 +798,7 @@ static void Console(CYOptions &options) {
             std::cout << std::endl;
         }
 
             std::cout << std::endl;
         }
 

-        CYPool pool;
-        Output(Run(pool, client_, code), &std::cout, expand);
+        CYOutputRun(code, expand, reparse);

     }
 }
 
     }
 }
 


@@ -1000,7 +1064,7 @@ int Main(int argc, char * const argv[], char const * const envp[]) {
             }
         } file(address.sun_path);
 
             }
         } file(address.sun_path);
 

-        _syscall(bind(server, reinterpret_cast<sockaddr *>(&address), SUN_LEN(&address)));
+        _syscall(bind(server, reinterpret_cast<sockaddr *>(&address), sizeof(address)));

         _syscall(chmod(address.sun_path, 0777));
 
         _syscall(listen(server, 1));
         _syscall(chmod(address.sun_path, 0777));
 
         _syscall(listen(server, 1));


@@ -1065,7 +1129,7 @@ int Main(int argc, char * const argv[], char const * const envp[]) {
                 stream = new std::istringstream(buffer.str());
 
                 CYPool pool;
                 stream = new std::istringstream(buffer.str());
 
                 CYPool pool;

-                CYDriver driver(pool, *stream, script);
+                CYDriver driver(pool, *stream->rdbuf(), script);

                 Setup(driver);
 
                 uint64_t begin(CYGetTime());
                 Setup(driver);
 
                 uint64_t begin(CYGetTime());


@@ -1091,7 +1155,7 @@ int Main(int argc, char * const argv[], char const * const envp[]) {
         }
 
         CYPool pool;
         }
 
         CYPool pool;

-        CYDriver driver(pool, *stream, script);
+        CYDriver driver(pool, *stream->rdbuf(), script);

         Setup(driver);
 
         bool failed(driver.Parse());
         Setup(driver);
 
         bool failed(driver.Parse());


@@ -1122,7 +1186,7 @@ int Main(int argc, char * const argv[], char const * const envp[]) {
     return 0;
 }
 
     return 0;
 }
 

-int main(int argc, char * const argv[], char const * const envp[]) {
+_visible int main(int argc, char * const argv[], char const * const envp[]) {

     try {
         return Main(argc, argv, envp);
     } catch (const CYException &error) {
     try {
         return Main(argc, argv, envp);
     } catch (const CYException &error) {