X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=win32%2Fwin32sck.c;h=4fb20473b4ac7162d3edda9f80b7601379bc9ea1;hb=468f45d50549a232c40d65539180944d7cd0038b;hp=8bd6b6cfd5ab667112564ae68676f4eedf5f4d35;hpb=4f63d0249796d635a70b03245ad972152a3eba76;p=p5sagit%2Fp5-mst-13.2.git diff --git a/win32/win32sck.c b/win32/win32sck.c index 8bd6b6c..4fb2047 100644 --- a/win32/win32sck.c +++ b/win32/win32sck.c @@ -11,6 +11,7 @@ #define WIN32IO_IS_STDIO #define WIN32SCK_IS_STDSCK #define WIN32_LEAN_AND_MEAN +#define PERLIO_NOT_STDIO 0 #ifdef __GNUC__ #define Win32_Winsock #endif @@ -18,12 +19,6 @@ #include "EXTERN.h" #include "perl.h" -#if defined(PERL_OBJECT) -#define NO_XSLOCKS -extern CPerlObj* pPerl; -#include "XSUB.h" -#endif - #include "Win32iop.h" #include #include @@ -40,12 +35,12 @@ extern CPerlObj* pPerl; # define TO_SOCKET(x) (x) #endif /* USE_SOCKETS_AS_HANDLES */ -#ifdef USE_THREADS +#if defined(USE_5005THREADS) || defined(USE_ITHREADS) #define StartSockets() \ STMT_START { \ if (!wsock_started) \ start_sockets(); \ - set_socktype(); \ + set_socktype(); \ } STMT_END #else #define StartSockets() \ @@ -57,12 +52,6 @@ extern CPerlObj* pPerl; } STMT_END #endif -#define EndSockets() \ - STMT_START { \ - if (wsock_started) \ - WSACleanup(); \ - } STMT_END - #define SOCKET_TEST(x, y) \ STMT_START { \ StartSockets(); \ @@ -76,23 +65,19 @@ static struct servent* win32_savecopyservent(struct servent*d, struct servent*s, const char *proto); -#ifdef USE_THREADS -#ifdef USE_DECLSPEC_THREAD -__declspec(thread) struct servent myservent; -__declspec(thread) int init_socktype; -#else -#define myservent (thr->i.Wservent) -#define init_socktype (thr->i.Winit_socktype) -#endif -#else -static struct servent myservent; -#endif - static int wsock_started = 0; +EXTERN_C void +EndSockets(void) +{ + if (wsock_started) + WSACleanup(); +} + void start_sockets(void) { + dTHX; unsigned short version; WSADATA retdata; int ret; @@ -115,18 +100,18 @@ void set_socktype(void) { #ifdef USE_SOCKETS_AS_HANDLES -#ifdef USE_THREADS +#if defined(USE_5005THREADS) || defined(USE_ITHREADS) dTHX; - if(!init_socktype) { + if (!w32_init_socktype) { #endif - int iSockOpt = SO_SYNCHRONOUS_NONALERT; - /* - * Enable the use of sockets as filehandles - */ - setsockopt(INVALID_SOCKET, SOL_SOCKET, SO_OPENTYPE, - (char *)&iSockOpt, sizeof(iSockOpt)); -#ifdef USE_THREADS - init_socktype = 1; + int iSockOpt = SO_SYNCHRONOUS_NONALERT; + /* + * Enable the use of sockets as filehandles + */ + setsockopt(INVALID_SOCKET, SOL_SOCKET, SO_OPENTYPE, + (char *)&iSockOpt, sizeof(iSockOpt)); +#if defined(USE_5005THREADS) || defined(USE_ITHREADS) + w32_init_socktype = 1; } #endif #endif /* USE_SOCKETS_AS_HANDLES */ @@ -154,7 +139,7 @@ my_fdopen(int fd, char *mode) /* * If we get here, then fd is actually a socket. */ - Newz(1310, fp, 1, FILE); + Newz(1310, fp, 1, FILE); /* XXX leak, good thing this code isn't used */ if(fp == NULL) { errno = ENOMEM; return NULL; @@ -429,22 +414,109 @@ win32_socket(int af, int type, int protocol) return s; } +/* + * close RTL fd while respecting sockets + * added as temporary measure until PerlIO has real + * Win32 native layer + * -- BKS, 11-11-2000 +*/ + +int my_close(int fd) +{ + int osf; + if (!wsock_started) /* No WinSock? */ + return(close(fd)); /* Then not a socket. */ + osf = TO_SOCKET(fd);/* Get it now before it's gone! */ + if (osf != -1) { + int err; + err = closesocket(osf); + if (err == 0) { +#if defined(USE_FIXED_OSFHANDLE) || defined(PERL_MSVCRT_READFIX) + _set_osfhnd(fd, INVALID_HANDLE_VALUE); +#endif + (void)close(fd); /* handle already closed, ignore error */ + return 0; + } + else if (err == SOCKET_ERROR) { + err = WSAGetLastError(); + if (err != WSAENOTSOCK) { + (void)close(fd); + errno = err; + return EOF; + } + } + } + return close(fd); +} + #undef fclose int my_fclose (FILE *pf) { - int osf, retval; + int osf; if (!wsock_started) /* No WinSock? */ return(fclose(pf)); /* Then not a socket. */ - osf = TO_SOCKET(fileno(pf));/* Get it now before it's gone! */ - retval = fclose(pf); /* Must fclose() before closesocket() */ - if (osf != -1 - && closesocket(osf) == SOCKET_ERROR - && WSAGetLastError() != WSAENOTSOCK) - { - return EOF; + osf = TO_SOCKET(win32_fileno(pf));/* Get it now before it's gone! */ + if (osf != -1) { + int err; + win32_fflush(pf); + err = closesocket(osf); + if (err == 0) { +#if defined(USE_FIXED_OSFHANDLE) || defined(PERL_MSVCRT_READFIX) + _set_osfhnd(win32_fileno(pf), INVALID_HANDLE_VALUE); +#endif + (void)fclose(pf); /* handle already closed, ignore error */ + return 0; + } + else if (err == SOCKET_ERROR) { + err = WSAGetLastError(); + if (err != WSAENOTSOCK) { + (void)fclose(pf); + errno = err; + return EOF; + } + } } - return retval; + return fclose(pf); +} + +#undef fstat +int +my_fstat(int fd, struct stat *sbufptr) +{ + /* This fixes a bug in fstat() on Windows 9x. fstat() uses the + * GetFileType() win32 syscall, which will fail on Windows 9x. + * So if we recognize a socket on Windows 9x, we return the + * same results as on Windows NT/2000. + * XXX this should be extended further to set S_IFSOCK on + * sbufptr->st_mode. + */ + int osf; + if (!wsock_started || IsWinNT()) + return fstat(fd, sbufptr); + + osf = TO_SOCKET(fd); + if (osf != -1) { + char sockbuf[256]; + int optlen = sizeof(sockbuf); + int retval; + + retval = getsockopt((SOCKET)osf, SOL_SOCKET, SO_TYPE, sockbuf, &optlen); + if (retval != SOCKET_ERROR || WSAGetLastError() != WSAENOTSOCK) { +#if defined(__BORLANDC__)&&(__BORLANDC__<=0x520) + sbufptr->st_mode = S_IFIFO; +#else + sbufptr->st_mode = _S_IFIFO; +#endif + sbufptr->st_rdev = sbufptr->st_dev = (dev_t)fd; + sbufptr->st_nlink = 1; + sbufptr->st_uid = sbufptr->st_gid = sbufptr->st_ino = 0; + sbufptr->st_atime = sbufptr->st_mtime = sbufptr->st_ctime = 0; + sbufptr->st_size = (off_t)0; + return 0; + } + } + return fstat(fd, sbufptr); } struct hostent * @@ -495,12 +567,12 @@ win32_getprotobynumber(int num) struct servent * win32_getservbyname(const char *name, const char *proto) { - struct servent *r; dTHX; + struct servent *r; SOCKET_TEST(r = getservbyname(name, proto), NULL); if (r) { - r = win32_savecopyservent(&myservent, r, proto); + r = win32_savecopyservent(&w32_servent, r, proto); } return r; } @@ -508,12 +580,12 @@ win32_getservbyname(const char *name, const char *proto) struct servent * win32_getservbyport(int port, const char *proto) { - struct servent *r; dTHX; + struct servent *r; SOCKET_TEST(r = getservbyport(port, proto), NULL); if (r) { - r = win32_savecopyservent(&myservent, r, proto); + r = win32_savecopyservent(&w32_servent, r, proto); } return r; } @@ -521,6 +593,7 @@ win32_getservbyport(int port, const char *proto) int win32_ioctl(int i, unsigned int u, char *data) { + dTHX; u_long argp = (u_long)data; int retval; @@ -561,24 +634,28 @@ win32_inet_addr(const char FAR *cp) void win32_endhostent() { + dTHX; Perl_croak_nocontext("endhostent not implemented!\n"); } void win32_endnetent() { + dTHX; Perl_croak_nocontext("endnetent not implemented!\n"); } void win32_endprotoent() { + dTHX; Perl_croak_nocontext("endprotoent not implemented!\n"); } void win32_endservent() { + dTHX; Perl_croak_nocontext("endservent not implemented!\n"); } @@ -586,6 +663,7 @@ win32_endservent() struct netent * win32_getnetent(void) { + dTHX; Perl_croak_nocontext("getnetent not implemented!\n"); return (struct netent *) NULL; } @@ -593,6 +671,7 @@ win32_getnetent(void) struct netent * win32_getnetbyname(char *name) { + dTHX; Perl_croak_nocontext("getnetbyname not implemented!\n"); return (struct netent *)NULL; } @@ -600,6 +679,7 @@ win32_getnetbyname(char *name) struct netent * win32_getnetbyaddr(long net, int type) { + dTHX; Perl_croak_nocontext("getnetbyaddr not implemented!\n"); return (struct netent *)NULL; } @@ -607,6 +687,7 @@ win32_getnetbyaddr(long net, int type) struct protoent * win32_getprotoent(void) { + dTHX; Perl_croak_nocontext("getprotoent not implemented!\n"); return (struct protoent *) NULL; } @@ -614,6 +695,7 @@ win32_getprotoent(void) struct servent * win32_getservent(void) { + dTHX; Perl_croak_nocontext("getservent not implemented!\n"); return (struct servent *) NULL; } @@ -621,6 +703,7 @@ win32_getservent(void) void win32_sethostent(int stayopen) { + dTHX; Perl_croak_nocontext("sethostent not implemented!\n"); } @@ -628,6 +711,7 @@ win32_sethostent(int stayopen) void win32_setnetent(int stayopen) { + dTHX; Perl_croak_nocontext("setnetent not implemented!\n"); } @@ -635,6 +719,7 @@ win32_setnetent(int stayopen) void win32_setprotoent(int stayopen) { + dTHX; Perl_croak_nocontext("setprotoent not implemented!\n"); } @@ -642,6 +727,7 @@ win32_setprotoent(int stayopen) void win32_setservent(int stayopen) { + dTHX; Perl_croak_nocontext("setservent not implemented!\n"); }