Use class extension syntax as part of Object CYON.

[cycript.git] / Console.cpp

diff --git a/Console.cpp b/Console.cpp
index 344203f9f3a6bbb2756589c6957578d17083a0e8..8f8ff0a028c67f6655d434ffe8ace12213e40ac4 100644 (file)
--- a/Console.cpp
+++ b/Console.cpp
@@ -363,7 +363,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';


@@ -375,7 +375,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());


@@ -604,8 +607,16 @@ static void CYConsolePrepTerm(int meta) {
     CYConsoleRemapKeys(vi_movement_keymap);
 }
 
     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;
 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 {


@@ -616,6 +627,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);


@@ -640,6 +652,8 @@ static void Console(CYOptions &options) {
         rl_prep_term_function = CYConsolePrepTerm;
     }
 
         rl_prep_term_function = CYConsolePrepTerm;
     }
 

+    CYOutputRun("");
+

     struct sigaction action;
     sigemptyset(&action.sa_mask);
     action.sa_handler = &sigint;
     struct sigaction action;
     sigemptyset(&action.sa_mask);
     action.sa_handler = &sigint;


@@ -761,8 +775,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);

     }
 }
 
     }
 }
 


@@ -1150,7 +1163,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) {