Changeset 312 in Main for trunk/Server/server.c

Timestamp:

Oct 14, 2024, 3:17:37 AM (5 weeks ago)

Author:

Nishi

Message:

works on os2

File:

• trunk/Server/server.c (modified) (7 diffs)

trunk/Server/server.c

@@ -19 +19 @@
 #include <unistd.h>
 #endif
+#include <ctype.h>
 #include <string.h>
 #include <stdbool.h>
@@ -33 +34 @@
 #include <cm_dir.h>
 
+#ifdef __OS2__
+#include <types.h>
+#include <sys/time.h>
+#define INCL_DOSPROCESS
+#include <os2.h>
+#include <process.h>
+#define HANDLE void*
+
+#include "strptime.h"
+typedef int socklen_t;
+
+#include <tcpustd.h>
+#endif
+
 #if defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__) || (defined(__WATCOMC__) && !defined(__OS2__))
 #ifndef NO_GETNAMEINFO
@@ -109 +124 @@
                 } else if(*pw == '*') {
                         return *(pw + 1) == 0 || tw_wildcard_match(pw, pt + 1) || tw_wildcard_match(pw + 1, pt);
-                } else if(*pw == '?' || (*pw == *pt)) {
+                } else if(*pw == '?' || (tolower(*pw) == tolower(*pt))) {
                         pw++;
                         pt++;
@@ -120 +135 @@
 
 void close_socket(int sock) {
-#if defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__) || defined(__WATCOMC__)
+#ifdef __OS2__
+        soclose(sock);
+#elif defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__) || defined(__WATCOMC__)
         closesocket(sock);
 #else
@@ -129 +146 @@
 int tw_server_init(void) {
         int i;
-#if defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__) || defined(__WATCOMC__)
+#if defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__) || (defined(__WATCOMC__) && !defined(__OS2__))
         WSADATA wsa;
 #ifdef USE_WINSOCK1
@@ -136 +153 @@
         WSAStartup(MAKEWORD(2, 0), &wsa);
 #endif
+#endif
+#ifdef __OS2__
+        sock_init();
 #endif
         for(i = 0; config.ports[i] != -1; i++)
@@ -1020 +1040 @@
 #endif
 #if defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__) || defined(__WATCOMC__)
+#ifdef __OS2__
+                                        _beginthread(tw_server_pass, 0, 0, e);
+#else
                                         _beginthread(tw_server_pass, 0, e);
+#endif
 #elif defined(_PSP) || defined(__PPU__)
                                                 tw_server_pass(e);