Maybe fully separated the backend library from Console.

diff --git a/Console.cpp b/Console.cpp
index 0c5a13bed1211ce96e241986607734ad0bd9a252..dfc5c8c497dec9ec719c2ad0b98958e4b4a0d50c 100644 (file)
--- a/Console.cpp
+++ b/Console.cpp
@@ -118,7 +118,11 @@ void Run(int socket, const char *data, size_t size, FILE *fout = NULL, bool expa
     const char *json;
     if (socket == -1) {
         mode_ = Running;
     const char *json;
     if (socket == -1) {
         mode_ = Running;

+#ifdef CY_EXECUTE

         json = CYExecute(pool, data);
         json = CYExecute(pool, data);

+#else
+        json = NULL;
+#endif

         mode_ = Working;
         if (json != NULL)
             size = strlen(json);
         mode_ = Working;
         if (json != NULL)
             size = strlen(json);


@@ -332,14 +336,27 @@ static void *Map(const char *path, size_t *psize) {
 
 int main(int argc, char *argv[]) {
     bool tty(isatty(STDIN_FILENO));
 
 int main(int argc, char *argv[]) {
     bool tty(isatty(STDIN_FILENO));

-    pid_t pid(_not(pid_t));

     bool compile(false);
 
     bool compile(false);
 

-    for (;;) switch (getopt(argc, argv, "cg:n:p:s")) {
+#ifdef CY_ATTACH
+    pid_t pid(_not(pid_t));
+#endif
+
+    for (;;) switch (getopt(argc, argv,
+        "cg:n:"
+#ifdef CY_ATTACH
+        "p:"
+#endif
+        "s"
+    )) {

         case -1:
             goto getopt;
         case '?':
         case -1:
             goto getopt;
         case '?':

-            fprintf(stderr, "usage: cycript [-c] [-p <pid>] [<script> [<arg>...]]\n");
+            fprintf(stderr, "usage: cycript [-c]"
+#ifdef CY_ATTACH
+            " [-p <pid>]"
+#endif
+            " [<script> [<arg>...]]\n");

             return 1;
 
         case 'c':
             return 1;
 
         case 'c':


@@ -368,6 +385,7 @@ int main(int argc, char *argv[]) {
             }
         break;
 
             }
         break;
 

+#ifdef CY_ATTACH

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


@@ -377,6 +395,7 @@ int main(int argc, char *argv[]) {
                 return 1;
             }
         } break;
                 return 1;
             }
         } break;

+#endif

 
         case 's':
             strict_ = true;
 
         case 's':
             strict_ = true;


@@ -385,6 +404,7 @@ int main(int argc, char *argv[]) {
 
     const char *script;
 
 
     const char *script;
 

+#ifdef CY_ATTACH

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


@@ -394,6 +414,7 @@ int main(int argc, char *argv[]) {
         fprintf(stderr, "-p conflicts with -c\n");
         return 1;
     }
         fprintf(stderr, "-p conflicts with -c\n");
         return 1;
     }

+#endif

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


@@ -405,13 +426,16 @@ int main(int argc, char *argv[]) {
             script = NULL;
     }
 
             script = NULL;
     }
 

-    if (script == NULL && !tty && pid != _not(pid_t)) {
-        fprintf(stderr, "non-terminal attaching to remove console\n");
+#ifdef CY_ATTACH
+    if (pid != _not(pid_t) && script == NULL && !tty) {
+        fprintf(stderr, "non-terminal attaching to remote console\n");

         return 1;
     }
         return 1;
     }

+#endif

 
     int socket;
 
 
     int socket;
 

+#ifdef CY_ATTACH

     if (pid == _not(pid_t))
         socket = -1;
     else {
     if (pid == _not(pid_t))
         socket = -1;
     else {


@@ -424,6 +448,9 @@ int main(int argc, char *argv[]) {
 
         _syscall(connect(socket, reinterpret_cast<sockaddr *>(&address), SUN_LEN(&address)));
     }
 
         _syscall(connect(socket, reinterpret_cast<sockaddr *>(&address), SUN_LEN(&address)));
     }

+#else
+    socket = -1;
+#endif

 
     if (script == NULL && tty)
         Console(socket);
 
     if (script == NULL && tty)
         Console(socket);

diff --git a/Darwin.mk b/Darwin.mk
index 7a63d7d9902878e590a63a8c79a6919903a45c99..e98526d444904d48440c999f0ba25460ce34ea82 100644 (file)
--- a/Darwin.mk
+++ b/Darwin.mk
@@ -3,8 +3,9 @@ dll := dylib
 # XXX: objective-c exists on non-Darwin
 
 header += Struct.hpp ObjectiveC.hpp
 # XXX: objective-c exists on non-Darwin
 
 header += Struct.hpp ObjectiveC.hpp

-code += ObjectiveC.o
+code += ObjectiveC.o Library.o

 filters += ObjC
 filters += ObjC

+flags += -DCY_ATTACH -DCY_EXECUTE

 
 Struct.hpp:
        $$($(target)gcc -print-prog-name=cc1obj) -print-objc-runtime-info </dev/null >$@
 
 Struct.hpp:
        $$($(target)gcc -print-prog-name=cc1obj) -print-objc-runtime-info </dev/null >$@

diff --git a/Library.mm b/Library.mm
index c5027c052ab77afcd70c9cbf7c652560de4cd12e..08170eaa7b1ccf75fc849e2cba0fd00b1d0c4ad3 100644 (file)
--- a/Library.mm
+++ b/Library.mm
@@ -3400,24 +3400,6 @@ const char *CYExecute(apr_pool_t *pool, const char *code) { _pooled
     return json;
 }
 
     return json;
 }
 

-bool CYRecvAll_(int socket, uint8_t *data, size_t size) {
-    while (size != 0) if (size_t writ = _syscall(recv(socket, data, size, 0))) {
-        data += writ;
-        size -= writ;
-    } else
-        return false;
-    return true;
-}
-
-bool CYSendAll_(int socket, const uint8_t *data, size_t size) {
-    while (size != 0) if (size_t writ = _syscall(send(socket, data, size, 0))) {
-        data += writ;
-        size -= writ;
-    } else
-        return false;
-    return true;
-}
-

 static apr_pool_t *Pool_;
 
 struct CYExecute_ {
 static apr_pool_t *Pool_;
 
 struct CYExecute_ {

diff --git a/makefile b/makefile
index 8b4711b28610f1061b45e6b9b357376bfb66a7ba..8bc4301dc1b3c17730750075a6a66089be61ba4f 100644 (file)
--- a/makefile
+++ b/makefile
@@ -21,7 +21,7 @@ arch := $(shell $(dpkg_architecture) -qDEB_HOST_ARCH 2>/dev/null)
 endif
 
 header := Cycript.tab.hh Parser.hpp Pooling.hpp cycript.hpp
 endif
 
 header := Cycript.tab.hh Parser.hpp Pooling.hpp cycript.hpp

-code := ffi_type.o parse.o Replace.o Output.o Cycript.tab.o lex.cy.o Library.o
+code := ffi_type.o parse.o Replace.o Output.o Cycript.tab.o lex.cy.o Network.o

 
 dll := so
 
 
 dll := so