diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-05-12 09:07:57 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2000-05-12 09:07:57 +0000 |
| commit | a6dcd4ff38476c301f3385a3999fb6452bd462c7 (patch) | |
| tree | c0805e6c95d6396e28e6129d88905c4dee085f4e /ext/socket | |
| parent | 23d67024ca56858b2fd6bfb95156f2355bc0a2b5 (diff) | |
| download | ruby-a6dcd4ff38476c301f3385a3999fb6452bd462c7.tar.gz ruby-a6dcd4ff38476c301f3385a3999fb6452bd462c7.tar.xz ruby-a6dcd4ff38476c301f3385a3999fb6452bd462c7.zip | |
2000-05-12
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@687 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/socket')
| -rw-r--r-- | ext/socket/socket.c | 20 | ||||
| -rw-r--r-- | ext/socket/sockport.h | 2 |
2 files changed, 15 insertions, 7 deletions
diff --git a/ext/socket/socket.c b/ext/socket/socket.c index bbd505774..cadadd2b6 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -15,6 +15,11 @@ #include "rubysig.h" #include <stdio.h> #include <sys/types.h> + +#ifdef HAVE_UNISTD_H +#include <unistd.h> +#endif + #ifndef NT #include <sys/socket.h> #include <netinet/in.h> @@ -538,7 +543,7 @@ ip_addrsetup(host, port) portp = 0; } else if (FIXNUM_P(port)) { - snprintf(pbuf, sizeof(pbuf), "%d", FIX2INT(port)); + snprintf(pbuf, sizeof(pbuf), "%ld", FIX2INT(port)); portp = pbuf; } else { @@ -726,7 +731,7 @@ open_inet(class, h, serv, type) host = NULL; } if (FIXNUM_P(serv)) { - snprintf(pbuf, sizeof(pbuf), "%d", FIX2UINT(serv)); + snprintf(pbuf, sizeof(pbuf), "%ld", FIX2UINT(serv)); portp = pbuf; } else { @@ -1748,7 +1753,7 @@ sock_s_getaddrinfo(argc, argv) pptr = NULL; } else if (FIXNUM_P(port)) { - snprintf(pbuf, sizeof(pbuf), "%d", FIX2INT(port)); + snprintf(pbuf, sizeof(pbuf), "%ld", FIX2INT(port)); pptr = pbuf; } else { @@ -1788,7 +1793,7 @@ sock_s_getnameinfo(argc, argv) int argc; VALUE *argv; { - VALUE sa, af, host, port, flags; + VALUE sa, af = Qnil, host = Qnil, port = Qnil, flags; static char hbuf[1024], pbuf[1024]; char *hptr, *pptr; int fl; @@ -1824,6 +1829,10 @@ sock_s_getnameinfo(argc, argv) host = RARRAY(sa)->ptr[2]; } } + else { + rb_raise(rb_eArgError, "array size should be 3 or 4, %d given", + RARRAY(sa)->len); + } if (NIL_P(host)) { hptr = NULL; } @@ -1837,7 +1846,7 @@ sock_s_getnameinfo(argc, argv) pptr = NULL; } else if (!NIL_P(port)) { - snprintf(pbuf, sizeof(pbuf), "%d", NUM2INT(port)); + snprintf(pbuf, sizeof(pbuf), "%ld", NUM2INT(port)); pptr = pbuf; } else { @@ -1872,7 +1881,6 @@ sock_s_getnameinfo(argc, argv) fl = NUM2INT(flags); } - gotsap: error = getnameinfo(sap, SA_LEN(sap), hbuf, sizeof(hbuf), pbuf, sizeof(pbuf), fl); if (error) { diff --git a/ext/socket/sockport.h b/ext/socket/sockport.h index 99bec91a1..1639fcf82 100644 --- a/ext/socket/sockport.h +++ b/ext/socket/sockport.h @@ -37,7 +37,7 @@ # define SET_SIN_LEN(si,len) (si)->sin_len = (len) #else # define SIN_LEN(si) sizeof(struct sockaddr_in) -# define SET_SIN_LEN(si,len) (len) +# define SET_SIN_LEN(si,len) #endif #endif |