Remove old iOS build environment from sysroot.sh.

[cycript.git] / Console.cpp

diff --git a/Console.cpp b/Console.cpp
index 596f804b19b4472b6374297cf2a85a6b38de6411..e955311e9ed622059e29e4ca6e52b770e2d9ed49 100644 (file)
--- a/Console.cpp
+++ b/Console.cpp
@@ -1,20 +1,20 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
 /* Cycript - Optimizing JavaScript Compiler/Runtime

- * Copyright (C) 2009-2012  Jay Freeman (saurik)
+ * Copyright (C) 2009-2013  Jay Freeman (saurik)

 */
 
 */
 

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

 /*
 /*

- * 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.
+ * Cycript is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.

  *
  *

- * 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.
+ * 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 General Public License for more details.

  *
  *

- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License

  * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
 **/
 /* }}} */
  * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
 **/
 /* }}} */


@@ -60,10 +60,13 @@
 #include <pwd.h>
 
 #include <apr_getopt.h>
 #include <pwd.h>
 
 #include <apr_getopt.h>

+#include <apr_pools.h>
+#include <apr_strings.h>

 
 #include <dlfcn.h>
 
 #include "Replace.hpp"
 
 #include <dlfcn.h>
 
 #include "Replace.hpp"

+#include "Display.hpp"

 
 static volatile enum {
     Working,
 
 static volatile enum {
     Working,


@@ -113,7 +116,7 @@ void Setup(CYOutput &out, CYDriver &driver, CYOptions &options) {
 
 static CYUTF8String Run(CYPool &pool, int client, CYUTF8String code) {
     const char *json;
 
 static CYUTF8String Run(CYPool &pool, int client, CYUTF8String code) {
     const char *json;

-    size_t size;
+    uint32_t size;

 
     if (client == -1) {
         mode_ = Running;
 
     if (client == -1) {
         mode_ = Running;


@@ -134,7 +137,7 @@ static CYUTF8String Run(CYPool &pool, int client, CYUTF8String code) {
         CYSendAll(client, code.data, code.size);
         mode_ = Waiting;
         CYRecvAll(client, &size, sizeof(size));
         CYSendAll(client, code.data, code.size);
         mode_ = Waiting;
         CYRecvAll(client, &size, sizeof(size));

-        if (size == _not(size_t))
+        if (size == _not(uint32_t))

             json = NULL;
         else {
             char *temp(new(pool) char[size + 1]);
             json = NULL;
         else {
             char *temp(new(pool) char[size + 1]);


@@ -391,8 +394,8 @@ static void Console(CYOptions &options) {
     else
         passwd = getpwuid(getuid());
 
     else
         passwd = getpwuid(getuid());
 

-    const char *basedir(apr_psprintf(pool, "%s/.cycript", passwd->pw_dir));
-    const char *histfile(apr_psprintf(pool, "%s/history", basedir));
+    const char *basedir(pool.strcat(passwd->pw_dir, "/.cycript", NULL));
+    const char *histfile(pool.strcat(basedir, "/history", NULL));

     size_t histlines(0);
 
     rl_initialize();
     size_t histlines(0);
 
     rl_initialize();


@@ -404,7 +407,7 @@ static void Console(CYOptions &options) {
     bool bypass(false);
     bool debug(false);
     bool expand(false);
     bool bypass(false);
     bool debug(false);
     bool expand(false);

-    bool syntax(false);
+    bool syntax(true);

 
     out_ = &std::cout;
 
 
     out_ = &std::cout;
 


@@ -435,9 +438,23 @@ static void Console(CYOptions &options) {
         }
 
       read:
         }
 
       read:

+
+#if RL_READLINE_VERSION >= 0x0600
+        if (syntax) {
+            rl_prep_term_function = CYDisplayStart;
+            rl_redisplay_function = CYDisplayUpdate;
+            rl_deprep_term_function = CYDisplayFinish;
+        } else {
+            rl_prep_term_function = rl_prep_terminal;
+            rl_redisplay_function = rl_redisplay;
+            rl_deprep_term_function = rl_deprep_terminal;
+        }
+#endif
+

         mode_ = Parsing;
         char *line(readline(prompt));
         mode_ = Working;
         mode_ = Parsing;
         char *line(readline(prompt));
         mode_ = Working;

+

         if (line == NULL)
             break;
         if (line[0] == '\0')
         if (line == NULL)
             break;
         if (line[0] == '\0')


@@ -583,6 +600,11 @@ static void *Map(const char *path, size_t *psize) {
 void InjectLibrary(pid_t pid);
 
 int Main(int argc, char const * const argv[], char const * const envp[]) {
 void InjectLibrary(pid_t pid);
 
 int Main(int argc, char const * const argv[], char const * const envp[]) {

+    _aprcall(apr_initialize());
+
+    apr_pool_t *pool;
+    apr_pool_create(&pool, NULL);
+

     bool tty(isatty(STDIN_FILENO));
     bool compile(false);
     CYOptions options;
     bool tty(isatty(STDIN_FILENO));
     bool compile(false);
     CYOptions options;


@@ -593,7 +615,6 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
     pid_t pid(_not(pid_t));
 #endif
 
     pid_t pid(_not(pid_t));
 #endif
 

-    CYPool pool;

     apr_getopt_t *state;
     _aprcall(apr_getopt_init(&state, pool, argc, argv));
 
     apr_getopt_t *state;
     _aprcall(apr_getopt_init(&state, pool, argc, argv));
 


@@ -663,7 +684,7 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
                 pid = strtoul(arg, &end, 0);
                 if (arg + size != end) {
                     // XXX: arg needs to be escaped in some horrendous way of doom
                 pid = strtoul(arg, &end, 0);
                 if (arg + size != end) {
                     // XXX: arg needs to be escaped in some horrendous way of doom

-                    const char *command(apr_psprintf(pool, "ps axc|sed -e '/^ *[0-9]/{s/^ *\\([0-9]*\\)\\( *[^ ]*\\)\\{3\\} *-*\\([^ ]*\\)/\\3 \\1/;/^%s /{s/^[^ ]* //;q;};};d'", arg));
+                    const char *command(apr_pstrcat(pool, "ps axc|sed -e '/^ *[0-9]/{s/^ *\\([0-9]*\\)\\( *[^ ]*\\)\\{3\\} *-*\\([^ ]*\\)/\\3 \\1/;/^", arg, " /{s/^[^ ]* //;q;};};d'", NULL));

 
                     if (FILE *pids = popen(command, "r")) {
                         char value[32];
 
                     if (FILE *pids = popen(command, "r")) {
                         char value[32];


@@ -835,6 +856,8 @@ int Main(int argc, char const * const argv[], char const * const envp[]) {
             }
     }
 
             }
     }
 

+    apr_pool_destroy(pool);
+

     return 0;
 }
 
     return 0;
 }