(no commit message)

[gacela.git] / src / gacela.c

diff --git a/src/gacela.c b/src/gacela.c
index cfc96603dffd0a8001812b5453fd0e8075e0870b..9503f4146a1c66ea56725cd49615570ad0aea1b1 100644 (file)
--- a/src/gacela.c
+++ b/src/gacela.c
@@ -134,10 +134,10 @@ init_gacela_client ()
 }
 
 void
-gacela_client (int rec_channel, int send_channel)
+gacela_client (SCM rec_channel, SCM send_channel)
 {
   int n;
-  char buffer[256];
+  SCM buffer;
   char *line;
   char *history_path;
 
@@ -154,25 +154,21 @@ gacela_client (int rec_channel, int send_channel)
     if (line && *line)
       {
        add_history (line);
-       write (send_channel, "(", 1);
-       n = write (send_channel, line, strlen (line));
-       write (send_channel, ")", 1);
-       if (n < 0)
-         error("ERROR writing to socket");
-
-       bzero (buffer, 256);
-       n = read (rec_channel, buffer, sizeof (buffer));
-       while (n == 0) {
+       //scm_write (scm_from_locale_string ("("), send_channel);
+       scm_write (scm_from_locale_string (line), send_channel);
+       //scm_write (scm_from_locale_string (")"), send_channel);
+       scm_force_output (send_channel);
+
+       while (scm_char_ready_p (rec_channel) == SCM_BOOL_F) {
          if (ctrl_c) break;
          sleep (1);
-         n = read (rec_channel, buffer, sizeof (buffer));
        }
-       if (n < 0)
-         error("ERROR reading from socket");
        if (ctrl_c)
          ctrl_c = 0;
-       else
-         printf ("%s\n", buffer);
+       else {
+         buffer = scm_read (rec_channel);
+         printf ("%s\n", scm_to_locale_string (buffer));
+       }
       }
     free (line);
   }
@@ -240,7 +236,7 @@ start_local_server (char *working_path, SCM pipes)
   scm_c_define ("pipes", pipes);
   scm_c_eval_string ("(start-server pipes)");
 }
-
+/*
 void
 start_remote_client (char *hostname, int port)
 {
@@ -263,7 +259,7 @@ start_remote_client (char *hostname, int port)
     close (sockfd);
   }
 }
-
+*/
 int
 main (int argc, char *argv[])
 {
@@ -272,7 +268,7 @@ main (int argc, char *argv[])
   char *host;
   int port = 0;
   int i;
-  SCM pipes;
+  SCM fd1, fd2;
   int pid;
 
   // Checking arguments
@@ -306,13 +302,39 @@ main (int argc, char *argv[])
   else if (mode == 2 && port != 0)
     start_server (dirname (argv[0]), port);
   else if (mode == 3 && port != 0)
-    start_remote_client (host, port);
+    //start_remote_client (host, port);
+    return;
   else {
-    pipes = scm_pipe ();
+    fd1 = scm_pipe ();
+    fd2 = scm_pipe ();
     pid = fork ();
-    if (pid == 0)
-      start_local_server (dirname (argv[0]), pipes);
-    else
-      gacela_client (scm_to_int (SCM_CAR (pipes)), scm_to_int (SCM_CDR (pipes)));
+
+    if (pid == 0) {
+      scm_close (SCM_CAR (fd1));
+      scm_close (SCM_CDR (fd2));
+      start_local_server (dirname (argv[0]), scm_cons (SCM_CAR (fd2), SCM_CDR (fd1)));
+    }
+    else {
+      scm_close (SCM_CDR (fd1));
+      scm_close (SCM_CAR (fd2));
+      gacela_client (SCM_CAR (fd1), SCM_CDR (fd2));
+      kill (pid, SIGKILL);
+    }
+
+    /*
+    SCM buffer;
+    if (pid == 0) {
+      printf ("Hijo: 0\n");
+      scm_write (scm_from_locale_string ("Hola mundo\n"), SCM_CDR (pipes));
+      scm_force_output (SCM_CDR (pipes));
+      printf ("Hijo: 1\n");
+    }
+    else {
+      printf ("Padre: 0\n");
+      buffer = scm_read (SCM_CAR (pipes));
+      printf ("%s\n", scm_to_locale_string (buffer));
+      printf ("Padre: 1\n");
+    }
+    */
   }
 }