Due to cynject, there is no reason to turn off -p.

diff --git a/Console.cpp b/Console.cpp
index 62dadcbbb60b841d56aa8eed85ba25a0396307e2..2f24e5842975035fd16a5423cab5e92b3c4d410b 100644 (file)
--- a/Console.cpp
+++ b/Console.cpp
@@ -343,7 +343,6 @@ class CYSocketRemote :
 
 void InjectLibrary(pid_t, std::ostream &stream, int, const char *const []);
 
 
 void InjectLibrary(pid_t, std::ostream &stream, int, const char *const []);
 

-#ifdef CY_ATTACH

 class CYInjectRemote :
     public CYRemote
 {
 class CYInjectRemote :
     public CYRemote
 {


@@ -367,7 +366,6 @@ class CYInjectRemote :
         return CYUTF8String(strdup(json.c_str()), json.size());
     }
 };
         return CYUTF8String(strdup(json.c_str()), json.size());
     }
 };

-#endif

 
 static std::ostream *out_;
 
 
 static std::ostream *out_;
 


@@ -876,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);


@@ -892,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));


@@ -916,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"
                 );


@@ -928,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;


@@ -965,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;


@@ -1015,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));


@@ -1053,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;


@@ -1075,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);

diff --git a/Makefile.am b/Makefile.am
index 341f993d3c7f853843828da48279333dbd820197..289dd16b4453784832b78c9bbdb43e32829672f1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -155,13 +155,10 @@ libcycript_la_SOURCES += ObjectiveC/Output.cpp ObjectiveC/Replace.cpp ObjectiveC
 libcycript_la_LIBADD += $(LTOBJECTIVEC)
 endif
 
 libcycript_la_LIBADD += $(LTOBJECTIVEC)
 endif
 

-if CY_ATTACH

 libcycript_la_SOURCES += Handler.cpp
 
 if CY_CONSOLE
 cycript_SOURCES += Inject.cpp
 libcycript_la_SOURCES += Handler.cpp
 
 if CY_CONSOLE
 cycript_SOURCES += Inject.cpp

-AM_CPPFLAGS += -DCY_ATTACH
-endif

 endif
 
 CLEANFILES += Parser.ypp
 endif
 
 CLEANFILES += Parser.ypp

diff --git a/Makefile.in b/Makefile.in
index cc2f245eafa3483c57349ff8ab35e9312296ae1e..232244b799fb47c48820e0b0815c559500723ccf 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -145,9 +145,6 @@ host_triplet = @host@
 @CY_OBJECTIVEC_TRUE@am__append_24 = ObjectiveC
 @CY_OBJECTIVEC_TRUE@am__append_25 = ObjectiveC/Output.cpp ObjectiveC/Replace.cpp ObjectiveC/Library.mm
 @CY_OBJECTIVEC_TRUE@am__append_26 = $(LTOBJECTIVEC)
 @CY_OBJECTIVEC_TRUE@am__append_24 = ObjectiveC
 @CY_OBJECTIVEC_TRUE@am__append_25 = ObjectiveC/Output.cpp ObjectiveC/Replace.cpp ObjectiveC/Library.mm
 @CY_OBJECTIVEC_TRUE@am__append_26 = $(LTOBJECTIVEC)

-@CY_ATTACH_TRUE@am__append_27 = Handler.cpp
-@CY_ATTACH_TRUE@@CY_CONSOLE_TRUE@am__append_28 = Inject.cpp
-@CY_ATTACH_TRUE@@CY_CONSOLE_TRUE@am__append_29 = -DCY_ATTACH

 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \


@@ -223,12 +220,11 @@ am__dirstamp = $(am__leading_dot)dirstamp
 @CY_OBJECTIVEC_TRUE@am__objects_6 = ObjectiveC/Output.lo \
 @CY_OBJECTIVEC_TRUE@   ObjectiveC/Replace.lo \
 @CY_OBJECTIVEC_TRUE@   ObjectiveC/Library.lo
 @CY_OBJECTIVEC_TRUE@am__objects_6 = ObjectiveC/Output.lo \
 @CY_OBJECTIVEC_TRUE@   ObjectiveC/Replace.lo \
 @CY_OBJECTIVEC_TRUE@   ObjectiveC/Library.lo

-@CY_ATTACH_TRUE@am__objects_7 = Handler.lo

 am_libcycript_la_OBJECTS = ConvertUTF.lo Decode.lo Driver.lo Error.lo \
        Highlight.lo Library.lo Network.lo Output.lo Replace.lo \
        Syntax.lo Parser.lo Scanner.lo $(am__objects_1) \
        $(am__objects_2) $(am__objects_3) $(am__objects_4) \
 am_libcycript_la_OBJECTS = ConvertUTF.lo Decode.lo Driver.lo Error.lo \
        Highlight.lo Library.lo Network.lo Output.lo Replace.lo \
        Syntax.lo Parser.lo Scanner.lo $(am__objects_1) \
        $(am__objects_2) $(am__objects_3) $(am__objects_4) \

-       $(am__objects_5) $(am__objects_6) $(am__objects_7)
+       $(am__objects_5) $(am__objects_6) Handler.lo

 libcycript_la_OBJECTS = $(am_libcycript_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 libcycript_la_OBJECTS = $(am_libcycript_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)


@@ -240,9 +236,8 @@ libcycript_la_LINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
 @CY_ANDROID_TRUE@@CY_CONSOLE_TRUE@am__EXEEXT_1 = cycript-pie$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS)
 am__cycript_SOURCES_DIST = Console.cpp Inject.cpp
 @CY_ANDROID_TRUE@@CY_CONSOLE_TRUE@am__EXEEXT_1 = cycript-pie$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS)
 am__cycript_SOURCES_DIST = Console.cpp Inject.cpp

-@CY_ATTACH_TRUE@@CY_CONSOLE_TRUE@am__objects_8 = Inject.$(OBJEXT)

 @CY_CONSOLE_TRUE@am_cycript_OBJECTS = Console.$(OBJEXT) \
 @CY_CONSOLE_TRUE@am_cycript_OBJECTS = Console.$(OBJEXT) \

-@CY_CONSOLE_TRUE@      $(am__objects_8)
+@CY_CONSOLE_TRUE@      Inject.$(OBJEXT)

 cycript_OBJECTS = $(am_cycript_OBJECTS)
 @CY_CONSOLE_TRUE@cycript_DEPENDENCIES = libcycript.la \
 @CY_CONSOLE_TRUE@      $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
 cycript_OBJECTS = $(am_cycript_OBJECTS)
 @CY_CONSOLE_TRUE@cycript_DEPENDENCIES = libcycript.la \
 @CY_CONSOLE_TRUE@      $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \


@@ -608,7 +603,7 @@ SUBDIRS =
 ACLOCAL_AMFLAGS = -I m4
 AM_CPPFLAGS = -DYYDEBUG=1 -DCY_SYSTEM="\"$(CY_SYSTEM)\"" -include \
        config.h -include $(srcdir)/unconfig.h $(am__append_8) \
 ACLOCAL_AMFLAGS = -I m4
 AM_CPPFLAGS = -DYYDEBUG=1 -DCY_SYSTEM="\"$(CY_SYSTEM)\"" -include \
        config.h -include $(srcdir)/unconfig.h $(am__append_8) \

-       $(am__append_23) $(am__append_29)
+       $(am__append_23)

 CY_FLAGS = -fvisibility=hidden $(am__append_1)
 AM_CFLAGS = $(CY_FLAGS)
 AM_CXXFLAGS = $(CY_FLAGS)
 CY_FLAGS = -fvisibility=hidden $(am__append_1)
 AM_CFLAGS = $(CY_FLAGS)
 AM_CXXFLAGS = $(CY_FLAGS)


@@ -626,10 +621,10 @@ libcycript_la_SOURCES = ConvertUTF.c Decode.cpp Driver.cpp Error.cpp \
        Highlight.cpp Library.cpp Network.cpp Output.cpp Replace.cpp \
        Syntax.cpp Parser.cpp Scanner.cpp $(am__append_3) \
        $(am__append_5) $(am__append_14) $(am__append_18) \
        Highlight.cpp Library.cpp Network.cpp Output.cpp Replace.cpp \
        Syntax.cpp Parser.cpp Scanner.cpp $(am__append_3) \
        $(am__append_5) $(am__append_14) $(am__append_18) \

-       $(am__append_21) $(am__append_25) $(am__append_27)
+       $(am__append_21) $(am__append_25) Handler.cpp

 filters = $(am__append_9) $(am__append_13) $(am__append_17) \
        $(am__append_20) $(am__append_24)
 filters = $(am__append_9) $(am__append_13) $(am__append_17) \
        $(am__append_20) $(am__append_24)

-@CY_CONSOLE_TRUE@cycript_SOURCES = Console.cpp $(am__append_28)
+@CY_CONSOLE_TRUE@cycript_SOURCES = Console.cpp Inject.cpp

 @CY_CONSOLE_TRUE@cycript_LDADD = libcycript.la $(LTLIBREADLINE) $(LTLIBTERMCAP) $(LTLIBGCC) $(PTHREAD_CFLAGS) -ldl
 @CY_ANDROID_TRUE@@CY_CONSOLE_TRUE@cycript_pie_SOURCES = pie.c
 @CY_ANDROID_TRUE@@CY_CONSOLE_TRUE@cycript_pie_LDFLAGS = -fno-PIE
 @CY_CONSOLE_TRUE@cycript_LDADD = libcycript.la $(LTLIBREADLINE) $(LTLIBTERMCAP) $(LTLIBGCC) $(PTHREAD_CFLAGS) -ldl
 @CY_ANDROID_TRUE@@CY_CONSOLE_TRUE@cycript_pie_SOURCES = pie.c
 @CY_ANDROID_TRUE@@CY_CONSOLE_TRUE@cycript_pie_LDFLAGS = -fno-PIE