X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/7341eedbaf526ef2f0986b576c656906050e270a..6845c3c750d5faae242a182cb88e4a5d27bc65c1:/Console.cpp

diff --git a/Console.cpp b/Console.cpp
index 6587106..8f8ff0a 100644
--- a/Console.cpp
+++ b/Console.cpp
@@ -219,7 +219,9 @@ static void sigint(int) {
         case Parsing:
             longjmp(ctrlc_, 1);
         case Running:
+#ifndef __ANDROID__
             CYCancel();
+#endif
             return;
         case Sending:
             return;
@@ -361,7 +363,7 @@ class History {
                 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';
@@ -373,7 +375,10 @@ class History {
         } 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());
@@ -602,8 +607,16 @@ static void CYConsolePrepTerm(int meta) {
     CYConsoleRemapKeys(vi_movement_keymap);
 }
 
+static void CYOutputRun(const std::string &code, bool expand = false) {
+    CYPool pool;
+    Output(Run(pool, client_, code), &std::cout, expand);
+}
+
 static void Console(CYOptions &options) {
     std::string basedir;
+#ifdef __ANDROID__
+    basedir = "/data/local/tmp";
+#else
     if (const char *home = getenv("HOME"))
         basedir = home;
     else {
@@ -614,6 +627,7 @@ static void Console(CYOptions &options) {
             passwd = getpwuid(getuid());
         basedir = passwd->pw_dir;
     }
+#endif
 
     basedir += "/.cycript";
     mkdir(basedir.c_str(), 0700);
@@ -633,8 +647,12 @@ static void Console(CYOptions &options) {
     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);
@@ -757,8 +775,7 @@ static void Console(CYOptions &options) {
             std::cout << std::endl;
         }
 
-        CYPool pool;
-        Output(Run(pool, client_, code), &std::cout, expand);
+        CYOutputRun(code, expand);
     }
 }
 
@@ -1024,7 +1041,7 @@ int Main(int argc, char * const argv[], char const * const envp[]) {
             }
         } 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));
@@ -1146,7 +1163,7 @@ int Main(int argc, char * const argv[], char const * const envp[]) {
     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) {