summaryrefslogtreecommitdiff
path: root/goruby.c
diff options
context:
space:
mode:
Diffstat (limited to 'goruby.c')
-rw-r--r--goruby.c38
1 files changed, 21 insertions, 17 deletions
diff --git a/goruby.c b/goruby.c
index e4119c56f7..5d45277207 100644
--- a/goruby.c
+++ b/goruby.c
@@ -1,4 +1,6 @@
-void Init_golf(void);
+static void Init_golf(void);
+static void *goruby_options(int argc, char **argv);
+static int goruby_run_node(void *arg);
#define ruby_options goruby_options
#define ruby_run_node goruby_run_node
#include "main.c"
@@ -17,6 +19,8 @@ RUBY_EXTERN void *ruby_options(int argc, char **argv);
RUBY_EXTERN int ruby_run_node(void*);
RUBY_EXTERN void ruby_init_ext(const char *name, void (*init)(void));
+#include "golf_prelude.c"
+
static VALUE
init_golf(VALUE arg)
{
@@ -33,21 +37,21 @@ goruby_options(int argc, char **argv)
void *ret;
if ((isatty(0) && isatty(1) && isatty(2)) && (pipe(rw) == 0)) {
- ssize_t n;
- infd = dup(0);
- if (infd < 0) {
- close(rw[0]);
- close(rw[1]);
- goto no_irb;
- }
- dup2(rw[0], 0);
- close(rw[0]);
- n = write(rw[1], cmd, sizeof(cmd) - 1);
- close(rw[1]);
- ret = n > 0 ? ruby_options(argc, argv) : NULL;
- dup2(infd, 0);
- close(infd);
- return ret;
+ ssize_t n;
+ infd = dup(0);
+ if (infd < 0) {
+ close(rw[0]);
+ close(rw[1]);
+ goto no_irb;
+ }
+ dup2(rw[0], 0);
+ close(rw[0]);
+ n = write(rw[1], cmd, sizeof(cmd) - 1);
+ close(rw[1]);
+ ret = n > 0 ? ruby_options(argc, argv) : NULL;
+ dup2(infd, 0);
+ close(infd);
+ return ret;
}
no_irb:
return ruby_options(argc, argv);
@@ -58,7 +62,7 @@ goruby_run_node(void *arg)
{
int state;
if (NIL_P(rb_protect(init_golf, Qtrue, &state))) {
- return state == EXIT_SUCCESS ? EXIT_FAILURE : state;
+ return state == EXIT_SUCCESS ? EXIT_FAILURE : state;
}
return ruby_run_node(arg);
}