Add socket support for Win32.

diff --git a/v7/src/microcode/ntapi.h b/v7/src/microcode/ntapi.h
index 09b0b3118ceda50fa828721bd1b15ea455f04218..2b095e0f7f194d0cb78e272f45ac4a0273198e3e 100644 (file)
--- a/v7/src/microcode/ntapi.h
+++ b/v7/src/microcode/ntapi.h
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: ntapi.h,v 1.6 1997/10/25 00:15:13 cph Exp $
+$Id: ntapi.h,v 1.7 1997/10/26 08:04:41 cph Exp $
 
 Copyright (c) 1997 Massachusetts Institute of Technology
 
@@ -75,6 +75,17 @@ enum syscall_names
   apicall_WaitForSingleObject,
   apicall_WriteFile,
 
+  /* Winsock procedures: */
+  apicall_accept,
+  apicall_bind,
+  apicall_closesocket,
+  apicall_connect,
+  apicall_ioctlsocket,
+  apicall_listen,
+  apicall_recv,
+  apicall_send,
+  apicall_socket,
+
   /* C Library's unix-style procedures: */
   syscall_close,
   syscall_fstat,
@@ -756,6 +767,59 @@ enum syserr_names
   syserr_rec_non_existent,
   syserr_rpl_not_allowed,
 
+  /* Winsock error codes: */
+  syserr_wsaeintr,
+  syserr_wsaebadf,
+  syserr_wsaeacces,
+  syserr_wsaefault,
+  syserr_wsaeinval,
+  syserr_wsaemfile,
+  syserr_wsaewouldblock,
+  syserr_wsaeinprogress,
+  syserr_wsaealready,
+  syserr_wsaenotsock,
+  syserr_wsaedestaddrreq,
+  syserr_wsaemsgsize,
+  syserr_wsaeprototype,
+  syserr_wsaenoprotoopt,
+  syserr_wsaeprotonosupport,
+  syserr_wsaesocktnosupport,
+  syserr_wsaeopnotsupp,
+  syserr_wsaepfnosupport,
+  syserr_wsaeafnosupport,
+  syserr_wsaeaddrinuse,
+  syserr_wsaeaddrnotavail,
+  syserr_wsaenetdown,
+  syserr_wsaenetunreach,
+  syserr_wsaenetreset,
+  syserr_wsaeconnaborted,
+  syserr_wsaeconnreset,
+  syserr_wsaenobufs,
+  syserr_wsaeisconn,
+  syserr_wsaenotconn,
+  syserr_wsaeshutdown,
+  syserr_wsaetoomanyrefs,
+  syserr_wsaetimedout,
+  syserr_wsaeconnrefused,
+  syserr_wsaeloop,
+  syserr_wsaenametoolong,
+  syserr_wsaehostdown,
+  syserr_wsaehostunreach,
+  syserr_wsaenotempty,
+  syserr_wsaeproclim,
+  syserr_wsaeusers,
+  syserr_wsaedquot,
+  syserr_wsaestale,
+  syserr_wsaeremote,
+  syserr_wsaediscon,
+  syserr_wsasysnotready,
+  syserr_wsavernotsupported,
+  syserr_wsanotinitialised,
+  syserr_wsahost_not_found,
+  syserr_wsatry_again,
+  syserr_wsano_recovery,
+  syserr_wsano_data,
+
   /* Unix error codes: */
 #define FIRST_UNIX_ERROR_CODE syserr_arg_list_too_long
   syserr_arg_list_too_long,
@@ -773,6 +837,7 @@ enum syserr_names
   syserr_resource_temporarily_unavailable,
   syserr_result_too_large,
   syserr_unix_too_many_open_files,
+
   syserr_unknown
 };
 
@@ -854,6 +919,17 @@ static char * syscall_names_table [] =
   "WAIT-FOR-SINGLE-OBJECT",
   "WRITE-FILE",
 
+  /* Winsock procedures: */
+  "ACCEPT",
+  "BIND",
+  "CLOSE-SOCKET",
+  "CONNECT",
+  "IOCTL-SOCKET",
+  "LISTEN",
+  "RECV",
+  "SEND",
+  "SOCKET",
+
   /* C Library's unix-style procedures: */
   "CLOSE",
   "FSTAT",
@@ -1535,6 +1611,59 @@ static char * syserr_names_table [] =
   "REC-NON-EXISTENT",
   "RPL-NOT-ALLOWED",
 
+  /* Winsock error codes: */
+  "WSAEINTR",
+  "WSAEBADF",
+  "WSAEACCES",
+  "WSAEFAULT",
+  "WSAEINVAL",
+  "WSAEMFILE",
+  "WSAEWOULDBLOCK",
+  "WSAEINPROGRESS",
+  "WSAEALREADY",
+  "WSAENOTSOCK",
+  "WSAEDESTADDRREQ",
+  "WSAEMSGSIZE",
+  "WSAEPROTOTYPE",
+  "WSAENOPROTOOPT",
+  "WSAEPROTONOSUPPORT",
+  "WSAESOCKTNOSUPPORT",
+  "WSAEOPNOTSUPP",
+  "WSAEPFNOSUPPORT",
+  "WSAEAFNOSUPPORT",
+  "WSAEADDRINUSE",
+  "WSAEADDRNOTAVAIL",
+  "WSAENETDOWN",
+  "WSAENETUNREACH",
+  "WSAENETRESET",
+  "WSAECONNABORTED",
+  "WSAECONNRESET",
+  "WSAENOBUFS",
+  "WSAEISCONN",
+  "WSAENOTCONN",
+  "WSAESHUTDOWN",
+  "WSAETOOMANYREFS",
+  "WSAETIMEDOUT",
+  "WSAECONNREFUSED",
+  "WSAELOOP",
+  "WSAENAMETOOLONG",
+  "WSAEHOSTDOWN",
+  "WSAEHOSTUNREACH",
+  "WSAENOTEMPTY",
+  "WSAEPROCLIM",
+  "WSAEUSERS",
+  "WSAEDQUOT",
+  "WSAESTALE",
+  "WSAEREMOTE",
+  "WSAEDISCON",
+  "WSASYSNOTREADY",
+  "WSAVERNOTSUPPORTED",
+  "WSANOTINITIALISED",
+  "WSAHOST_NOT_FOUND",
+  "WSATRY_AGAIN",
+  "WSANO_RECOVERY",
+  "WSANO_DATA",
+
   /* Unix error codes: */
   "ARG-LIST-TOO-LONG",
   "BAD-FILE-DESCRIPTOR",

diff --git a/v7/src/microcode/nttop.c b/v7/src/microcode/nttop.c
index 71725ecdec719006dc49c74d8fe0a23e479e716c..27482042996d8b1cf5e77c408e7407811dcdd167 100644 (file)
--- a/v7/src/microcode/nttop.c
+++ b/v7/src/microcode/nttop.c
@@ -1,6 +1,6 @@
 /* -*-C-*-
 
-$Id: nttop.c,v 1.23 1997/10/22 05:28:45 cph Exp $
+$Id: nttop.c,v 1.24 1997/10/26 08:04:18 cph Exp $
 
 Copyright (c) 1993-97 Massachusetts Institute of Technology
 
@@ -42,21 +42,22 @@ MIT in each case. */
 #include "outf.h"
 #include "ntscmlib.h"
 
-extern void EXFUN (execute_reload_cleanups, (void));
+extern void execute_reload_cleanups (void);
 
-extern void EXFUN (NT_gui_init, (void));
-extern void EXFUN (NT_initialize_channels, (void));
-extern void EXFUN (NT_initialize_directory_reader, (void));
-extern void EXFUN (NT_initialize_processes, (void));
-extern void EXFUN (NT_initialize_signals, (void));
-extern void EXFUN (NT_initialize_traps, (void));
-extern void EXFUN (NT_initialize_tty, (void));
+extern void NT_gui_init (void);
+extern void NT_initialize_channels (void);
+extern void NT_initialize_directory_reader (void);
+extern void NT_initialize_processes (void);
+extern void NT_initialize_signals (void);
+extern void NT_initialize_sockets (void);
+extern void NT_initialize_traps (void);
+extern void NT_initialize_tty (void);
 
-extern void EXFUN (NT_reset_channels, (void));
+extern void NT_reset_channels (void);
 
-extern void EXFUN (NT_restore_channels, (void));
-extern void EXFUN (NT_restore_signals, (void));
-extern void EXFUN (NT_restore_traps, (void));
+extern void NT_restore_channels (void);
+extern void NT_restore_signals (void);
+extern void NT_restore_traps (void);
 
 /* reset_interruptable_extent */
 
@@ -118,7 +119,7 @@ NT_initialize_win32_system_utilities ()
 static int interactive;
 
 int
-DEFUN_VOID (OS_under_emacs_p)
+OS_under_emacs_p (void)
 {
   return (option_emacs_subprocess);
 }
@@ -126,7 +127,7 @@ DEFUN_VOID (OS_under_emacs_p)
 enum windows_type NT_windows_type;
 
 void
-DEFUN_VOID (OS_initialize)
+OS_initialize (void)
 {
   interactive = 1;
 
@@ -138,6 +139,7 @@ DEFUN_VOID (OS_initialize)
   NT_initialize_traps ();
   NT_initialize_directory_reader ();
   NT_initialize_processes ();
+  NT_initialize_sockets ();
 
   OS_Name = SYSTEM_NAME;
   {
@@ -174,7 +176,7 @@ DEFUN_VOID (OS_initialize)
 }
 
 void
-DEFUN_VOID (OS_announcement)
+OS_announcement (void)
 {
 #if 0
   /* To make our compiler vendors happy. */
@@ -185,7 +187,7 @@ DEFUN_VOID (OS_announcement)
 }
 
 void
-DEFUN_VOID (OS_reset)
+OS_reset (void)
 {
   /*
     There should really be a reset for each initialize above,
@@ -198,7 +200,7 @@ DEFUN_VOID (OS_reset)
 }
 
 void
-DEFUN (OS_quit, (code, abnormal_p), int code AND int abnormal_p)
+OS_quit (int code, int abnormal_p)
 {
   outf_console ("\nScheme has terminated abnormally!\n");
   OS_restore_external_state ();
@@ -210,7 +212,7 @@ DEFUN (OS_quit, (code, abnormal_p), int code AND int abnormal_p)
 #endif
 
 enum syserr_names
-DEFUN (OS_error_code_to_syserr, (code), int code)
+OS_error_code_to_syserr (int code)
 {
   switch (code)
   {
@@ -319,7 +321,7 @@ w32_error_message (DWORD rc)
 }
 
 static int
-DEFUN (syserr_to_unix_error_code, (syserr), enum syserr_names syserr)
+syserr_to_unix_error_code (enum syserr_names syserr)
 {
   switch (syserr)
     {
@@ -343,7 +345,7 @@ DEFUN (syserr_to_unix_error_code, (syserr), enum syserr_names syserr)
 }
 
 void
-DEFUN (NT_prim_check_errno, (name), enum syscall_names name)
+NT_prim_check_errno (enum syscall_names name)
 {
   if (errno != EINTR)
     NT_error_unix_call (errno, name);
@@ -1089,6 +1091,60 @@ syserr_to_win32_error_code (enum syserr_names syserr)
     case syserr_full_backup: return (ERROR_FULL_BACKUP);
     case syserr_rec_non_existent: return (ERROR_REC_NON_EXISTENT);
     case syserr_rpl_not_allowed: return (ERROR_RPL_NOT_ALLOWED);
+
+      /* Winsock error codes: */
+    case syserr_wsaeintr: return (WSAEINTR);
+    case syserr_wsaebadf: return (WSAEBADF);
+    case syserr_wsaeacces: return (WSAEACCES);
+    case syserr_wsaefault: return (WSAEFAULT);
+    case syserr_wsaeinval: return (WSAEINVAL);
+    case syserr_wsaemfile: return (WSAEMFILE);
+    case syserr_wsaewouldblock: return (WSAEWOULDBLOCK);
+    case syserr_wsaeinprogress: return (WSAEINPROGRESS);
+    case syserr_wsaealready: return (WSAEALREADY);
+    case syserr_wsaenotsock: return (WSAENOTSOCK);
+    case syserr_wsaedestaddrreq: return (WSAEDESTADDRREQ);
+    case syserr_wsaemsgsize: return (WSAEMSGSIZE);
+    case syserr_wsaeprototype: return (WSAEPROTOTYPE);
+    case syserr_wsaenoprotoopt: return (WSAENOPROTOOPT);
+    case syserr_wsaeprotonosupport: return (WSAEPROTONOSUPPORT);
+    case syserr_wsaesocktnosupport: return (WSAESOCKTNOSUPPORT);
+    case syserr_wsaeopnotsupp: return (WSAEOPNOTSUPP);
+    case syserr_wsaepfnosupport: return (WSAEPFNOSUPPORT);
+    case syserr_wsaeafnosupport: return (WSAEAFNOSUPPORT);
+    case syserr_wsaeaddrinuse: return (WSAEADDRINUSE);
+    case syserr_wsaeaddrnotavail: return (WSAEADDRNOTAVAIL);
+    case syserr_wsaenetdown: return (WSAENETDOWN);
+    case syserr_wsaenetunreach: return (WSAENETUNREACH);
+    case syserr_wsaenetreset: return (WSAENETRESET);
+    case syserr_wsaeconnaborted: return (WSAECONNABORTED);
+    case syserr_wsaeconnreset: return (WSAECONNRESET);
+    case syserr_wsaenobufs: return (WSAENOBUFS);
+    case syserr_wsaeisconn: return (WSAEISCONN);
+    case syserr_wsaenotconn: return (WSAENOTCONN);
+    case syserr_wsaeshutdown: return (WSAESHUTDOWN);
+    case syserr_wsaetoomanyrefs: return (WSAETOOMANYREFS);
+    case syserr_wsaetimedout: return (WSAETIMEDOUT);
+    case syserr_wsaeconnrefused: return (WSAECONNREFUSED);
+    case syserr_wsaeloop: return (WSAELOOP);
+    case syserr_wsaenametoolong: return (WSAENAMETOOLONG);
+    case syserr_wsaehostdown: return (WSAEHOSTDOWN);
+    case syserr_wsaehostunreach: return (WSAEHOSTUNREACH);
+    case syserr_wsaenotempty: return (WSAENOTEMPTY);
+    case syserr_wsaeproclim: return (WSAEPROCLIM);
+    case syserr_wsaeusers: return (WSAEUSERS);
+    case syserr_wsaedquot: return (WSAEDQUOT);
+    case syserr_wsaestale: return (WSAESTALE);
+    case syserr_wsaeremote: return (WSAEREMOTE);
+    case syserr_wsaediscon: return (WSAEDISCON);
+    case syserr_wsasysnotready: return (WSASYSNOTREADY);
+    case syserr_wsavernotsupported: return (WSAVERNOTSUPPORTED);
+    case syserr_wsanotinitialised: return (WSANOTINITIALISED);
+    case syserr_wsahost_not_found: return (WSAHOST_NOT_FOUND);
+    case syserr_wsatry_again: return (WSATRY_AGAIN);
+    case syserr_wsano_recovery: return (WSANO_RECOVERY);
+    case syserr_wsano_data: return (WSANO_DATA);
+
     default: return (ERROR_SUCCESS);
     }
 }
@@ -1757,6 +1813,60 @@ win32_error_code_to_syserr (DWORD code)
     case ERROR_FULL_BACKUP: return (syserr_full_backup);
     case ERROR_REC_NON_EXISTENT: return (syserr_rec_non_existent);
     case ERROR_RPL_NOT_ALLOWED: return (syserr_rpl_not_allowed);
+
+      /* Winsock error codes: */
+    case WSAEINTR: return (syserr_wsaeintr);
+    case WSAEBADF: return (syserr_wsaebadf);
+    case WSAEACCES: return (syserr_wsaeacces);
+    case WSAEFAULT: return (syserr_wsaefault);
+    case WSAEINVAL: return (syserr_wsaeinval);
+    case WSAEMFILE: return (syserr_wsaemfile);
+    case WSAEWOULDBLOCK: return (syserr_wsaewouldblock);
+    case WSAEINPROGRESS: return (syserr_wsaeinprogress);
+    case WSAEALREADY: return (syserr_wsaealready);
+    case WSAENOTSOCK: return (syserr_wsaenotsock);
+    case WSAEDESTADDRREQ: return (syserr_wsaedestaddrreq);
+    case WSAEMSGSIZE: return (syserr_wsaemsgsize);
+    case WSAEPROTOTYPE: return (syserr_wsaeprototype);
+    case WSAENOPROTOOPT: return (syserr_wsaenoprotoopt);
+    case WSAEPROTONOSUPPORT: return (syserr_wsaeprotonosupport);
+    case WSAESOCKTNOSUPPORT: return (syserr_wsaesocktnosupport);
+    case WSAEOPNOTSUPP: return (syserr_wsaeopnotsupp);
+    case WSAEPFNOSUPPORT: return (syserr_wsaepfnosupport);
+    case WSAEAFNOSUPPORT: return (syserr_wsaeafnosupport);
+    case WSAEADDRINUSE: return (syserr_wsaeaddrinuse);
+    case WSAEADDRNOTAVAIL: return (syserr_wsaeaddrnotavail);
+    case WSAENETDOWN: return (syserr_wsaenetdown);
+    case WSAENETUNREACH: return (syserr_wsaenetunreach);
+    case WSAENETRESET: return (syserr_wsaenetreset);
+    case WSAECONNABORTED: return (syserr_wsaeconnaborted);
+    case WSAECONNRESET: return (syserr_wsaeconnreset);
+    case WSAENOBUFS: return (syserr_wsaenobufs);
+    case WSAEISCONN: return (syserr_wsaeisconn);
+    case WSAENOTCONN: return (syserr_wsaenotconn);
+    case WSAESHUTDOWN: return (syserr_wsaeshutdown);
+    case WSAETOOMANYREFS: return (syserr_wsaetoomanyrefs);
+    case WSAETIMEDOUT: return (syserr_wsaetimedout);
+    case WSAECONNREFUSED: return (syserr_wsaeconnrefused);
+    case WSAELOOP: return (syserr_wsaeloop);
+    case WSAENAMETOOLONG: return (syserr_wsaenametoolong);
+    case WSAEHOSTDOWN: return (syserr_wsaehostdown);
+    case WSAEHOSTUNREACH: return (syserr_wsaehostunreach);
+    case WSAENOTEMPTY: return (syserr_wsaenotempty);
+    case WSAEPROCLIM: return (syserr_wsaeproclim);
+    case WSAEUSERS: return (syserr_wsaeusers);
+    case WSAEDQUOT: return (syserr_wsaedquot);
+    case WSAESTALE: return (syserr_wsaestale);
+    case WSAEREMOTE: return (syserr_wsaeremote);
+    case WSAEDISCON: return (syserr_wsaediscon);
+    case WSASYSNOTREADY: return (syserr_wsasysnotready);
+    case WSAVERNOTSUPPORTED: return (syserr_wsavernotsupported);
+    case WSANOTINITIALISED: return (syserr_wsanotinitialised);
+    case WSAHOST_NOT_FOUND: return (syserr_wsahost_not_found);
+    case WSATRY_AGAIN: return (syserr_wsatry_again);
+    case WSANO_RECOVERY: return (syserr_wsano_recovery);
+    case WSANO_DATA: return (syserr_wsano_data);
+
     default: return (syserr_unknown);
     }
 }

diff --git a/v7/src/microcode/pruxsock.c b/v7/src/microcode/pruxsock.c
index 370fa94d493fa39c84156d6b9eb169bdc3d157dd..c9ae5b491657c3a0bdcf826607e60f56759881be 100644 (file)
--- a/v7/src/microcode/pruxsock.c
+++ b/v7/src/microcode/pruxsock.c
@@ -1,8 +1,8 @@
 /* -*-C-*-
 
-$Id: pruxsock.c,v 1.10 1996/05/18 06:08:02 cph Exp $
+$Id: pruxsock.c,v 1.11 1997/10/26 08:05:01 cph Exp $
 
-Copyright (c) 1990-96 Massachusetts Institute of Technology
+Copyright (c) 1990-97 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -50,6 +50,14 @@ MIT in each case. */
 #endif
 #endif
 
+#ifdef __NT__
+/* Under NT, socket support is the default but can be disabled.  */
+#ifndef DISABLE_SOCKET_SUPPORT
+#define HAVE_SOCKETS 1
+#undef HAVE_UNIX_SOCKETS
+#endif
+#endif
+
 #ifdef HAVE_SOCKETS
 
 #include "uxsock.h"
@@ -238,6 +246,7 @@ DEFINE_PRIMITIVE ("OPEN-UNIX-STREAM-SOCKET", Prim_open_unix_stream_socket, 1, 1,
     (long_to_integer (OS_open_unix_stream_socket (STRING_ARG (1))));
 #else
   signal_error_from_primitive (ERR_UNIMPLEMENTED_PRIMITIVE);
+  PRIMITIVE_RETURN (UNSPECIFIC);
 #endif
 }