(no commit message)

[gacela.git] / src / gacela.c

diff --git a/src/gacela.c b/src/gacela.c
index ef4ca1dc4898bcb92b96b49654bf86d8133bffc9..af78da97433302a1a775cd16ffdbb95fe72972a0 100644 (file)
--- a/src/gacela.c
+++ b/src/gacela.c
@@ -30,9 +30,11 @@
 #include "gacela_GL.h"
 #include "gacela_FTGL.h"
 
-// Generic variables
+// Global variables
 int ctrl_c = 0;
 int pid = 0;
+char *history_path = NULL;
+
 
 static int
 find_matching_paren (int k)
@@ -117,15 +119,16 @@ ctrl_c_handler (int signum)
 }
 
 void
-look_child_handler (int signum)
+child_dies_handler (int signum)
 {
-  printf ("Hola\n");
+  write_history (history_path);
+  exit (0);
 }
 
 static void
 init_gacela_client ()
 {
-  struct sigaction ctrl_c_action, look_child_action;
+  struct sigaction ctrl_c_action, child_dies_action;
 
   // init bouncing parens
   rl_bind_key (')', match_paren);
@@ -141,11 +144,11 @@ init_gacela_client ()
 
   // SIGALRM
   if (pid != 0) {
-    look_child_action.sa_handler = look_child_handler;
-    sigemptyset (&look_child_action.sa_mask);
-    look_child_action.sa_flags = 0;
+    child_dies_action.sa_handler = child_dies_handler;
+    sigemptyset (&child_dies_action.sa_mask);
+    child_dies_action.sa_flags = 0;
 
-    sigaction (SIGALRM, &look_child_action, NULL);
+    sigaction (SIGALRM, &child_dies_action, NULL);
   }
 
 }
@@ -175,6 +178,10 @@ opened_parens (char *line, int k)
            && line[i - 1] != '\\')
              break;
     }
+    else if (line[i] == ';') {
+      // Comment until endline
+      break;
+    }
     else if (line[i] == c)
       opened++;
     else if (line[i] == k)
@@ -190,7 +197,6 @@ gacela_client (SCM rec_channel, SCM send_channel)
   int n;
   SCM buffer;
   char *line = NULL, *line_for_sending = NULL;
-  char *history_path;
   int opened = 0;
 
   // Command line
@@ -218,7 +224,7 @@ gacela_client (SCM rec_channel, SCM send_channel)
        }
        else {
          line_for_sending = realloc (line_for_sending, strlen (line_for_sending) + strlen (line) + 2);
-         line_for_sending = strcat (line_for_sending, " ");
+         line_for_sending = strcat (line_for_sending, "\n");
          line_for_sending = strcat (line_for_sending, line);
        }
 
@@ -359,6 +365,7 @@ main (int argc, char *argv[])
       scm_close (SCM_CDR (fd2));
       init_gacela (dirname (argv[0]));
       start_local_server (scm_cons (SCM_CAR (fd2), SCM_CDR (fd1)));
+      kill (getppid (), SIGALRM);
     }
     else {
       scm_close (SCM_CDR (fd1));