Make CYExecute take a CYUTF8String and fix the size shell game in Console's Run.

[cycript.git] / Console.cpp

diff --git a/Console.cpp b/Console.cpp
index 4a27c64999b58aafc9c7b208f895e711cd9c34c6..ae5802c87ee262481ed5ad6a2bc49eb2659beaa0 100644 (file)
--- a/Console.cpp
+++ b/Console.cpp
@@ -136,7 +136,7 @@ static CYUTF8String Run(CYPool &pool, int client, CYUTF8String code) {
     if (client == -1) {
         mode_ = Running;
 #ifdef CY_EXECUTE
-        json = CYExecute(pool, code.data);
+        json = CYExecute(pool, code);
 #else
         json = NULL;
 #endif
@@ -145,8 +145,9 @@ static CYUTF8String Run(CYPool &pool, int client, CYUTF8String code) {
             size = strlen(json);
     } else {
         mode_ = Sending;
+        size = code.size;
         CYSendAll(client, &size, sizeof(size));
-        CYSendAll(client, code.data, size);
+        CYSendAll(client, code.data, code.size);
         mode_ = Waiting;
         CYRecvAll(client, &size, sizeof(size));
         if (size == _not(size_t))
@@ -351,6 +352,10 @@ static char **Complete(const char *word, int start, int end) {
         common = common.substr(size);
     }
 
+    size_t colon(common.find(':'));
+    if (colon != std::string::npos)
+        common = common.substr(0, colon + 1);
+
     char **results(reinterpret_cast<char **>(malloc(sizeof(char *) * (count + 2))));
 
     results[0] = strdup(common.c_str());
@@ -391,6 +396,8 @@ static void Console(apr_pool_t *pool, CYOptions &options) {
 
     // rl_completer_word_break_characters is broken in libedit
     rl_basic_word_break_characters = break_;
+
+    rl_completer_word_break_characters = break_;
     rl_attempted_completion_function = &Complete;
     rl_bind_key('\t', rl_complete);