Instance's toPointer() should return as CFTypeRef.

[cycript.git] / Console.cpp

diff --git a/Console.cpp b/Console.cpp
index c3ebd77da5dde602de3a0a7b418142b0d70bb194..2f24e5842975035fd16a5423cab5e92b3c4d410b 100644 (file)
--- a/Console.cpp
+++ b/Console.cpp
@@ -874,9 +874,7 @@ int Main(int argc, char * const argv[], char const * const envp[]) {
 
     append_history$ = (int (*)(int, const char *)) (dlsym(RTLD_DEFAULT, "append_history"));
 
 
     append_history$ = (int (*)(int, const char *)) (dlsym(RTLD_DEFAULT, "append_history"));
 

-#ifdef CY_ATTACH

     pid_t pid(_not(pid_t));
     pid_t pid(_not(pid_t));

-#endif

 
     const char *host(NULL);
     const char *port(NULL);
 
     const char *host(NULL);
     const char *port(NULL);


@@ -890,18 +888,14 @@ int Main(int argc, char * const argv[], char const * const envp[]) {
             "c"
             "g:"
             "n:"
             "c"
             "g:"
             "n:"

-#ifdef CY_ATTACH

             "p:"
             "p:"

-#endif

             "r:"
             "s"
         , (const struct option[]) {
             {NULL, no_argument, NULL, 'c'},
             {NULL, required_argument, NULL, 'g'},
             {NULL, required_argument, NULL, 'n'},
             "r:"
             "s"
         , (const struct option[]) {
             {NULL, no_argument, NULL, 'c'},
             {NULL, required_argument, NULL, 'g'},
             {NULL, required_argument, NULL, 'n'},

-#ifdef CY_ATTACH

             {NULL, required_argument, NULL, 'p'},
             {NULL, required_argument, NULL, 'p'},

-#endif

             {NULL, required_argument, NULL, 'r'},
             {NULL, no_argument, NULL, 's'},
         {0, 0, 0, 0}}, NULL));
             {NULL, required_argument, NULL, 'r'},
             {NULL, no_argument, NULL, 's'},
         {0, 0, 0, 0}}, NULL));


@@ -914,9 +908,7 @@ int Main(int argc, char * const argv[], char const * const envp[]) {
             case '?':
                 fprintf(stderr,
                     "usage: cycript [-c]"
             case '?':
                 fprintf(stderr,
                     "usage: cycript [-c]"

-#ifdef CY_ATTACH

                     " [-p <pid|name>]"
                     " [-p <pid|name>]"

-#endif

                     " [-r <host:port>]"
                     " [<script> [<arg>...]]\n"
                 );
                     " [-r <host:port>]"
                     " [<script> [<arg>...]]\n"
                 );


@@ -926,11 +918,7 @@ int Main(int argc, char * const argv[], char const * const envp[]) {
                 if (!target)
                     target = true;
                 else {
                 if (!target)
                     target = true;
                 else {

-                    fprintf(stderr, "only one of -[c"
-#ifdef CY_ATTACH
-                    "p"
-#endif
-                    "r] may be used at a time\n");
+                    fprintf(stderr, "only one of -[cpr] may be used at a time\n");

                     return 1;
                 }
             break;
                     return 1;
                 }
             break;


@@ -963,7 +951,6 @@ int Main(int argc, char * const argv[], char const * const envp[]) {
                 }
             break;
 
                 }
             break;
 

-#ifdef CY_ATTACH

             case 'p': {
                 size_t size(strlen(optarg));
                 char *end;
             case 'p': {
                 size_t size(strlen(optarg));
                 char *end;


@@ -1013,7 +1000,6 @@ int Main(int argc, char * const argv[], char const * const envp[]) {
                     }
                 }
             } goto target;
                     }
                 }
             } goto target;

-#endif

 
             case 'r': {
                 //size_t size(strlen(optarg));
 
             case 'r': {
                 //size_t size(strlen(optarg));


@@ -1051,12 +1037,10 @@ int Main(int argc, char * const argv[], char const * const envp[]) {
 
     const char *script;
 
 
     const char *script;
 

-#ifdef CY_ATTACH

     if (pid != _not(pid_t) && argc > 1) {
         fprintf(stderr, "-p cannot set argv\n");
         return 1;
     }
     if (pid != _not(pid_t) && argc > 1) {
         fprintf(stderr, "-p cannot set argv\n");
         return 1;
     }

-#endif

 
     if (argc == 0)
         script = NULL;
 
     if (argc == 0)
         script = NULL;


@@ -1073,10 +1057,8 @@ int Main(int argc, char * const argv[], char const * const envp[]) {
     CYSetArgs(argv0, script, argc, const_cast<const char **>(argv));
 #endif
 
     CYSetArgs(argv0, script, argc, const_cast<const char **>(argv));
 #endif
 

-#ifdef CY_ATTACH

     if (remote_ == NULL && pid != _not(pid_t))
         remote_ = new CYInjectRemote(pid);
     if (remote_ == NULL && pid != _not(pid_t))
         remote_ = new CYInjectRemote(pid);

-#endif

 
     if (remote_ == NULL && host != NULL && port != NULL)
         remote_ = new CYSocketRemote(host, port);
 
     if (remote_ == NULL && host != NULL && port != NULL)
         remote_ = new CYSocketRemote(host, port);