(no commit message)

[gacela.git] / src / gacela.c

diff --git a/src/gacela.c b/src/gacela.c
index 3357b0c1e05d6d76c0461c4ef4e330d9a2f4b434..9503f4146a1c66ea56725cd49615570ad0aea1b1 100644 (file)
--- a/src/gacela.c
+++ b/src/gacela.c
@@ -154,9 +154,10 @@ gacela_client (SCM rec_channel, SCM send_channel)
     if (line && *line)
       {
        add_history (line);
-       scm_write (scm_from_locale_string ("("), send_channel);
+       //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_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;
@@ -165,7 +166,7 @@ gacela_client (SCM rec_channel, SCM send_channel)
        if (ctrl_c)
          ctrl_c = 0;
        else {
-         buffer = scm_read_line (rec_channel);
+         buffer = scm_read (rec_channel);
          printf ("%s\n", scm_to_locale_string (buffer));
        }
       }
@@ -267,7 +268,7 @@ main (int argc, char *argv[])
   char *host;
   int port = 0;
   int i;
-  SCM pipes;
+  SCM fd1, fd2;
   int pid;
 
   // Checking arguments
@@ -304,11 +305,36 @@ main (int argc, char *argv[])
     //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_CAR (pipes), 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");
+    }
+    */
   }
 }