Add () to non-properties and complete "real" ones.

[cycript.git] / Console.cpp

diff --git a/Console.cpp b/Console.cpp
index 43012acb96712a988c6d781104e4eeac20a803c7..db86eb82f5000fcc2f7a95d451a80ccd254d32d9 100644 (file)
--- a/Console.cpp
+++ b/Console.cpp
@@ -400,6 +400,9 @@ class History {
     } }
 
     void operator +=(std::string command) {
+        if (HIST_ENTRY *entry = history_get(where_history()))
+            if (command == entry->line)
+                return;
         add_history(command.c_str());
         ++histlines_;
     }
@@ -674,13 +677,13 @@ static void Console(CYOptions &options) {
 
     CYOutputRun("");
 
-    struct sigaction action;
-    sigemptyset(&action.sa_mask);
-    action.sa_handler = &sigint;
-    action.sa_flags = 0;
-    sigaction(SIGINT, &action, NULL);
-
     for (;;) {
+        struct sigaction action;
+        sigemptyset(&action.sa_mask);
+        action.sa_handler = &sigint;
+        action.sa_flags = 0;
+        sigaction(SIGINT, &action, NULL);
+
         if (setjmp(ctrlc_) != 0) {
             mode_ = Working;
             *out_ << std::endl;
@@ -829,6 +832,8 @@ int Main(int argc, char * const argv[], char const * const envp[]) {
     const char *host(NULL);
     const char *port(NULL);
 
+    const char *argv0(argv[0]);
+
     optind = 1;
 
     for (;;) {
@@ -1007,15 +1012,18 @@ int Main(int argc, char * const argv[], char const * const envp[]) {
     if (argc == 0)
         script = NULL;
     else {
-#ifdef CY_EXECUTE
-        // XXX: const_cast?! wtf gcc :(
-        CYSetArgs(argc - 1, const_cast<const char **>(argv + 1));
-#endif
         script = argv[0];
         if (strcmp(script, "-") == 0)
             script = NULL;
+        --argc;
+        ++argv;
     }
 
+#ifdef CY_EXECUTE
+    // XXX: const_cast?! wtf gcc :(
+    CYSetArgs(argv0, script, argc, const_cast<const char **>(argv));
+#endif
+
 #ifdef CY_ATTACH
     if (pid == _not(pid_t))
         client_ = -1;