1 files changed, 4 insertions, 107 deletions
diff --git a/ext/io/wait/wait.c b/ext/io/wait/wait.c
index 61d6527b36..f7575191fe 100644
--- a/ext/io/wait/wait.c
+++ b/ext/io/wait/wait.c
@@ -1,9 +1,9 @@
+/* -*- c-file-style: "ruby"; indent-tabs-mode: t -*- */
 /**********************************************************************
 
   io/wait.c -
 
   $Author$
-  $Date$
   created at: Tue Aug 28 09:08:06 JST 2001
 
   All the files in this distribution are covered under the Ruby's
@@ -11,116 +11,13 @@
 
 **********************************************************************/
 
-#include "ruby.h"
-#include "rubyio.h"
-
-#include <sys/types.h>
-#if defined(FIONREAD_HEADER)
-#include FIONREAD_HEADER
-#endif
-
-#ifdef HAVE_RB_W32_IOCTLSOCKET
-#define ioctl ioctlsocket
-#define ioctl_arg u_long
-#define ioctl_arg2num(i) ULONG2NUM(i)
-#else
-#define ioctl_arg int
-#define ioctl_arg2num(i) INT2NUM(i)
-#endif
-
-#ifdef HAVE_RB_W32_IS_SOCKET
-#define FIONREAD_POSSIBLE_P(fd) rb_w32_is_socket(fd)
-#else
-#define FIONREAD_POSSIBLE_P(fd) ((fd),Qtrue)
-#endif
-
-static VALUE io_ready_p _((VALUE io));
-static VALUE io_wait _((int argc, VALUE *argv, VALUE io));
-void Init_wait _((void));
-
-EXTERN struct timeval rb_time_interval _((VALUE time));
+#include "ruby.h"		/* abi_version */
 
 /*
-=begin
-= IO wait methods.
-=end
+ * IO wait methods are built in ruby now, just for backward compatibility.
  */
 
-/*
-=begin
---- IO#ready?
-    returns non-nil if input available without blocking, or nil.
-=end
-*/
-static VALUE
-io_ready_p(io)
-    VALUE io;
-{
-    OpenFile *fptr;
-    FILE *fp;
-    ioctl_arg n;
-
-    GetOpenFile(io, fptr);
-    rb_io_check_readable(fptr);
-    if (!FIONREAD_POSSIBLE_P(fileno(fptr->f))) return Qfalse;
-    fp = fptr->f;
-    if (feof(fp)) return Qfalse;
-    if (rb_read_pending(fp)) return Qtrue;
-    if (ioctl(fileno(fp), FIONREAD, &n)) rb_sys_fail(0);
-    if (n > 0) return ioctl_arg2num(n);
-    return Qnil;
-}
-
-/*
-=begin
---- IO#wait([timeout])
-    waits until input available or timed out and returns self, or nil
-    when EOF reached.
-=end
-*/
-static VALUE
-io_wait(argc, argv, io)
-    int argc;
-    VALUE *argv;
-    VALUE io;
-{
-    OpenFile *fptr;
-    fd_set rd;
-    FILE *fp;
-    int fd;
-    ioctl_arg n;
-    VALUE timeout;
-    struct timeval *tp, timerec;
-
-    GetOpenFile(io, fptr);
-    rb_io_check_readable(fptr);
-    rb_scan_args(argc, argv, "01", &timeout);
-    if (NIL_P(timeout)) {
-	tp = 0;
-    }
-    else {
-	timerec = rb_time_interval(timeout);
-	tp = &timerec;
-    }
-
-    fp = fptr->f;
-    if (feof(fp)) return Qfalse;
-    if (rb_read_pending(fp)) return Qtrue;
-    fd = fileno(fp);
-    FD_ZERO(&rd);
-    FD_SET(fd, &rd);
-    if (rb_thread_select(fd + 1, &rd, NULL, NULL, tp) < 0)
-	rb_sys_fail(0);
-    rb_io_check_closed(fptr);
-    if (!FIONREAD_POSSIBLE_P(fileno(fptr->f))) return Qfalse;
-    if (ioctl(fileno(fp), FIONREAD, &n)) rb_sys_fail(0);
-    if (n > 0) return io;
-    return Qnil;
-}
-
 void
-Init_wait()
+Init_wait(void)
 {
-    rb_define_method(rb_cIO, "ready?", io_ready_p, 0);
-    rb_define_method(rb_cIO, "wait", io_wait, -1);
 }