From afe142997b61f7a06563e3a7d7203c2546c7675a Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 17 Nov 2015 02:15:55 +0000 Subject: [PATCH] init.c: is_socket * ext/socket/init.c (is_socket): extract predicate to see if the given fd is a socket. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52605 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/socket/init.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/ext/socket/init.c b/ext/socket/init.c index 45070d5d12..df32565b80 100644 --- a/ext/socket/init.c +++ b/ext/socket/init.c @@ -42,24 +42,29 @@ rsock_raise_socket_error(const char *reason, int error) rb_raise(rb_eSocket, "%s: %s", reason, gai_strerror(error)); } -VALUE -rsock_init_sock(VALUE sock, int fd) +#ifdef _WIN32 +#define is_socket(fd) rb_w32_is_socket(fd) +#else +static int +is_socket(int fd) { - rb_io_t *fp; -#ifndef _WIN32 struct stat sbuf; if (fstat(fd, &sbuf) < 0) rb_sys_fail("fstat(2)"); - rb_update_max_fd(fd); - if (!S_ISSOCK(sbuf.st_mode)) - rb_raise(rb_eArgError, "not a socket file descriptor"); -#else - rb_update_max_fd(fd); - if (!rb_w32_is_socket(fd)) - rb_raise(rb_eArgError, "not a socket file descriptor"); + return S_ISSOCK(sbuf.st_mode); +} #endif +VALUE +rsock_init_sock(VALUE sock, int fd) +{ + rb_io_t *fp; + + rb_update_max_fd(fd); + if (!is_socket(fd)) + rb_raise(rb_eArgError, "not a socket file descriptor"); + MakeOpenFile(sock, fp); fp->fd = fd; fp->mode = FMODE_READWRITE|FMODE_DUPLEX;