if (line && *line)
{
add_history (line);
- //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);
+ sleep (0.5);
}
if (ctrl_c)
ctrl_c = 0;
init_gacela (void *data, int argc, char **argv)
{
// Guile configuration
- scm_c_eval_string ("(set-repl-prompt! \"gacela>\")");
+ scm_c_eval_string ("(set-repl-prompt! \"gacela> \")");
scm_c_eval_string ("(use-modules (ice-9 readline))");
scm_c_eval_string ("(activate-readline)");
scm_c_eval_string ("(use-modules (ice-9 optargs))");
}
void
-start_single (char *working_path)
+start_single ()
{
char *argv = "guile";
- scm_with_guile (&init_gacela, NULL);
- load_scheme_files (working_path);
scm_shell (1, &argv);
}
void
-start_server (char *working_path, int port)
+start_server (int port)
{
- char start_server[100];
+ char *start_server;
- scm_with_guile (&init_gacela, NULL);
- load_scheme_files (working_path);
- sprintf (start_server, "(start-server %d)", port);
+ asprintf (&start_server, "(start-server #:port %d)", port);
scm_c_eval_string (start_server);
}
void
-start_local_server (char *working_path, SCM pipes)
+start_local_server (SCM pipes)
{
char start_server[100];
- scm_with_guile (&init_gacela, NULL);
- load_scheme_files (working_path);
scm_c_define ("pipes", pipes);
- scm_c_eval_string ("(start-server pipes)");
+ scm_c_eval_string ("(start-server #:pipes pipes)");
}
-/*
+
void
start_remote_client (char *hostname, int port)
{
- int sockfd;
- struct hostent *server;
- struct sockaddr_in serv_addr;
-
- // Connect to the server
- sockfd = socket (AF_INET, SOCK_STREAM, 0);
- server = gethostbyname (hostname);
- bzero ((char *) &serv_addr, sizeof (serv_addr));
- serv_addr.sin_family = AF_INET;
- bcopy ((char *)server->h_addr, (char *)&serv_addr.sin_addr.s_addr, server->h_length);
- serv_addr.sin_port = htons (port);
- if (connect (sockfd, (struct sockaddr *) &serv_addr, sizeof (serv_addr)) == -1) {
- printf ("%s [%d.%d.%d.%d] %d: Connection refused\n", hostname, server->h_addr[0], server->h_addr[1], server->h_addr[2], server->h_addr[3], port);
- }
- else {
- gacela_client (sockfd, sockfd);
- close (sockfd);
- }
+ SCM client_socket;
+ char *connect_to_server;
+
+ asprintf (&connect_to_server, "(let ((s (socket PF_INET SOCK_STREAM 0))) (connect s AF_INET (car (hostent:addr-list (gethost \"%s\"))) %d) s)", hostname, port);
+ client_socket = scm_c_eval_string (connect_to_server);
+ gacela_client (client_socket, client_socket);
}
-*/
+
int
main (int argc, char *argv[])
{
scm_init_guile ();
- if (mode == 1)
- start_single (dirname (argv[0]));
- else if (mode == 2 && port != 0)
- start_server (dirname (argv[0]), port);
+ if (mode == 1) {
+ scm_with_guile (&init_gacela, NULL);
+ load_scheme_files (dirname (argv[0]));
+ start_single ();
+ }
+ else if (mode == 2 && port != 0) {
+ scm_with_guile (&init_gacela, NULL);
+ load_scheme_files (dirname (argv[0]));
+ start_server (port);
+ }
else if (mode == 3 && port != 0)
- //start_remote_client (host, port);
- return;
+ start_remote_client (host, port);
else {
fd1 = scm_pipe ();
fd2 = scm_pipe ();
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)));
+ scm_with_guile (&init_gacela, NULL);
+ load_scheme_files (dirname (argv[0]));
+ start_local_server (scm_cons (SCM_CAR (fd2), SCM_CDR (fd1)));
}
else {
scm_close (SCM_CDR (fd1));
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");
- }
- */
}
}