diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-05-25 05:55:12 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-05-25 05:55:12 +0000 |
| commit | d7fe17edf08c1cee7f5b87251d2f09345900fcf9 (patch) | |
| tree | 071d640b5afb70e2d3cd24f69342479768cdfd5f /ext | |
| parent | 106eb09a382fa9003b67a29e33598ef4205b83b9 (diff) | |
2000-05-25
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@715 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/pty/pty.c | 4 | ||||
| -rw-r--r-- | ext/socket/socket.c | 19 |
2 files changed, 12 insertions, 11 deletions
diff --git a/ext/pty/pty.c b/ext/pty/pty.c index 52257b0560..66907416eb 100644 --- a/ext/pty/pty.c +++ b/ext/pty/pty.c @@ -15,8 +15,8 @@ #endif #include <ctype.h> -#include <ruby.h> -#include <rubyio.h> +#include "ruby.h" +#include "rubyio.h" #include <signal.h> #ifdef HAVE_SYS_STROPTS_H diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 3f479a303a..0d55e9db30 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -104,9 +104,9 @@ struct sockaddr_storage { }; #endif -#define LOOKUP_ORDER_INET 0 -#define LOOKUP_ORDER_INET6 1 -#define LOOKUP_ORDER_UNSPEC 2 +#define LOOKUP_ORDER_UNSPEC 0 +#define LOOKUP_ORDER_INET 1 +#define LOOKUP_ORDER_INET6 2 #if defined(DEFAULT_LOOKUP_ORDER_UNSPEC) # define LOOKUP_ORDER_DEFAULT LOOKUP_ORDER_UNSPEC @@ -1928,6 +1928,11 @@ sock_s_getnameinfo(argc, argv) sa = flags = Qnil; rb_scan_args(argc, argv, "11", &sa, &flags); + fl = 0; + if (!NIL_P(flags)) { + fl = NUM2INT(flags); + } + if (TYPE(sa) == T_STRING) { if (sizeof(ss) < RSTRING(sa)->len) { rb_raise(rb_eTypeError, "sockaddr length too big"); @@ -1968,9 +1973,10 @@ sock_s_getnameinfo(argc, argv) strcpy(pbuf, "0"); pptr = NULL; } - else if (!NIL_P(port)) { + else if (FIXNUM_P(port)) { snprintf(pbuf, sizeof(pbuf), "%ld", NUM2INT(port)); pptr = pbuf; + fl |= NI_NUMERICSERV; } else { strncpy(pbuf, STR2CSTR(port), sizeof(pbuf)); @@ -1999,11 +2005,6 @@ sock_s_getnameinfo(argc, argv) rb_raise(rb_eTypeError, "expecting String or Array"); } - fl = 0; - if (!NIL_P(flags)) { - fl = NUM2INT(flags); - } - error = getnameinfo(sap, SA_LEN(sap), hbuf, sizeof(hbuf), pbuf, sizeof(pbuf), fl); if (error) { |