HCoop
/
bpt
/
guile.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libguile/Makefile.am (snarfcppopts): Remove CFLAGS
[bpt/guile.git]
/
guile-readline
/
readline.c
diff --git
a/guile-readline/readline.c
b/guile-readline/readline.c
index
1e697eb
..
aac6e18
100644
(file)
--- a/
guile-readline/readline.c
+++ b/
guile-readline/readline.c
@@
-1,6
+1,7
@@
/* readline.c --- line editing support for Guile */
/* readline.c --- line editing support for Guile */
-/* Copyright (C) 1997,1999,2000,2001, 2002, 2003, 2006, 2007, 2008, 2009, 2010, 2013 Free Software Foundation, Inc.
+/* Copyright (C) 1997,1999,2000,2001, 2002, 2003, 2006, 2007, 2008,
+ * 2009, 2010, 2013 Free Software Foundation, Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-27,19
+28,13
@@
#ifdef HAVE_RL_GETC_FUNCTION
#include "libguile.h"
#ifdef HAVE_RL_GETC_FUNCTION
#include "libguile.h"
-#include "libguile/iselect.h"
#include <stdio.h>
#include <stdio.h>
-#ifdef HAVE_UNISTD_H
#include <unistd.h>
#include <unistd.h>
-#endif
#include <readline/readline.h>
#include <readline/history.h>
#include <readline/readline.h>
#include <readline/history.h>
-#ifndef __MINGW32__
#include <sys/time.h>
#include <sys/time.h>
-#else
-#include <io.h>
-#endif
+#include <sys/select.h>
#include <signal.h>
#include "libguile/validate.h"
#include <signal.h>
#include "libguile/validate.h"
@@
-207,10
+202,8
@@
SCM_DEFINE (scm_readline, "%readline", 0, 4, 0,
scm_dynwind_end ();
scm_dynwind_end ();
-#ifndef __MINGW32__
fclose (rl_instream);
fclose (rl_outstream);
fclose (rl_instream);
fclose (rl_outstream);
-#endif
--in_readline;
return ans;
--in_readline;
return ans;
@@
-240,10
+233,8
@@
unwind_readline (void *unused)
rl_free_line_state ();
rl_cleanup_after_signal ();
fputc ('\n', rl_outstream); /* We don't want next output on this line */
rl_free_line_state ();
rl_cleanup_after_signal ();
fputc ('\n', rl_outstream); /* We don't want next output on this line */
-#ifndef __MINGW32__
fclose (rl_instream);
fclose (rl_outstream);
fclose (rl_instream);
fclose (rl_outstream);
-#endif
--in_readline;
}
--in_readline;
}
@@
-314,10
+305,8
@@
scm_readline_init_ports (SCM inp, SCM outp)
input_port = inp;
output_port = outp;
input_port = inp;
output_port = outp;
-#ifndef __MINGW32__
rl_instream = stream_from_fport (inp, "r", s_scm_readline);
rl_outstream = stream_from_fport (outp, "w", s_scm_readline);
rl_instream = stream_from_fport (inp, "r", s_scm_readline);
rl_outstream = stream_from_fport (outp, "w", s_scm_readline);
-#endif
}
}
@@
-489,11
+478,9
@@
static int
match_paren (int x, int k)
{
int tmp;
match_paren (int x, int k)
{
int tmp;
-#ifndef __MINGW32__
int fno;
int fno;
-
SELECT_TYPE
readset;
+
fd_set
readset;
struct timeval timeout;
struct timeval timeout;
-#endif
rl_insert (x, k);
if (!SCM_READLINE_BOUNCE_PARENS)
rl_insert (x, k);
if (!SCM_READLINE_BOUNCE_PARENS)
@@
-504,14
+491,12
@@
match_paren (int x, int k)
&& rl_line_buffer[rl_point - 2] == '\\')
return 0;
&& rl_line_buffer[rl_point - 2] == '\\')
return 0;
-#ifndef __MINGW32__
tmp = 1000 * SCM_READLINE_BOUNCE_PARENS;
timeout.tv_sec = tmp / 1000000;
timeout.tv_usec = tmp % 1000000;
FD_ZERO (&readset);
fno = fileno (rl_instream);
FD_SET (fno, &readset);
tmp = 1000 * SCM_READLINE_BOUNCE_PARENS;
timeout.tv_sec = tmp / 1000000;
timeout.tv_usec = tmp % 1000000;
FD_ZERO (&readset);
fno = fileno (rl_instream);
FD_SET (fno, &readset);
-#endif
if (rl_point > 1)
{
if (rl_point > 1)
{
@@
-520,12
+505,7
@@
match_paren (int x, int k)
if (rl_point > -1)
{
rl_redisplay ();
if (rl_point > -1)
{
rl_redisplay ();
-#ifndef __MINGW32__
- scm_std_select (fno + 1, &readset, NULL, NULL, &timeout);
-#else
- WaitForSingleObject (GetStdHandle(STD_INPUT_HANDLE),
- SCM_READLINE_BOUNCE_PARENS);
-#endif
+ select (fno + 1, &readset, NULL, NULL, &timeout);
}
rl_point = tmp;
}
}
rl_point = tmp;
}
@@
-542,9
+522,7
@@
scm_init_readline ()
#include "guile-readline/readline.x"
scm_readline_completion_function_var
= scm_c_define ("*readline-completion-function*", SCM_BOOL_F);
#include "guile-readline/readline.x"
scm_readline_completion_function_var
= scm_c_define ("*readline-completion-function*", SCM_BOOL_F);
-#ifndef __MINGW32__
rl_getc_function = current_input_getc;
rl_getc_function = current_input_getc;
-#endif
#if defined (_RL_FUNCTION_TYPEDEF)
rl_completion_entry_function = (rl_compentry_func_t*) completion_function;
#else
#if defined (_RL_FUNCTION_TYPEDEF)
rl_completion_entry_function = (rl_compentry_func_t*) completion_function;
#else