Changeset 402 in Main for trunk

Timestamp:

Nov 3, 2024, 7:39:59 PM (12 days ago)

Author:

Nishi

Message:

amiga

Location:

trunk

Files:

• Platform/amiga.mk (added)
• README.tmpl (modified) (1 diff)
• Server/config.c (modified) (1 diff)
• Server/module.c (modified) (1 diff)
• Server/server.c (modified) (8 diffs)
• Server/strptime.c (modified) (4 diffs)
• Server/strptime.h (modified) (1 diff)
• Server/version.c (modified) (1 diff)
• config_platform.h (modified) (1 diff)

trunk/README.tmpl

@@ -63 +63 @@
 PlayStation 2            Does not boot
 Windows NT (MIPS)        Cannot read file properly
+Amiga                    Cannot connect

trunk/Server/config.c

@@ -134 +134 @@
 #elif defined(__NETWARE__)
         strcpy(config.hostname, "netware");
+#elif defined(__amiga__)
+        strcpy(config.hostname, "amiga");
 #else
         gethostname(config.hostname, 1024);

trunk/Server/module.c

@@ -18 +18 @@
 extern struct tw_config config;
 
-#if defined(_PSP) || defined(__PPU__) || defined(__ps2sdk__) || defined(__NeXT__) || defined(__DOS__)
+#if defined(_PSP) || defined(__PPU__) || defined(__ps2sdk__) || defined(__NeXT__) || defined(__DOS__) || defined(__amiga__)
 void* tw_module_load(const char* path) { return NULL; }
 

trunk/Server/server.c

@@ -15 +15 @@
 #include "tw_module.h"
 #include "tw_version.h"
+
+#ifdef __amiga__
+#include <pthread.h>
+#endif
 
 #if !defined(_MSC_VER) && !defined(__BORLANDC__)
@@ -108 +112 @@
 #endif
 
-#if defined(_PSP) || defined(__ps2sdk__) || defined(__bsdi__)
+#if defined(_PSP) || defined(__ps2sdk__) || defined(__bsdi__) || defined(__amiga__)
 #include "strptime.h"
 #endif
@@ -516 +520 @@
 #define NO_RETURN_THREAD
 void tw_server_pass(void* ptr) {
+#elif defined(__amiga__)
+void* tw_server_pass(void* ptr) {
 #elif defined(__HAIKU__)
 int32_t tw_server_pass(void* ptr) {
@@ -521 +527 @@
 int tw_server_pass(void* ptr) {
 #endif
-#if defined(__HAIKU__) || defined(__MINGW32__) || defined(_PSP) || defined(__PPU__) || defined(_MSC_VER) || defined(__BORLANDC__) || defined(__WATCOMC__)
+#if defined(__HAIKU__) || defined(__MINGW32__) || defined(_PSP) || defined(__PPU__) || defined(_MSC_VER) || defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__amiga__)
 #define FREE_PTR
         int sock = ((struct pass_entry*)ptr)->sock;
@@ -622 +628 @@
                                         struct tm* btm;
                                         strptime(req.headers[i + 1], "%a, %d %b %Y %H:%M:%S GMT", &tm);
-#if defined(__MINGW32__) || defined(_PSP) || defined(__PPU__) || defined(__ps2sdk__) || defined(_MSC_VER) || defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__USLC__) || defined(__NeXT__) || defined(__bsdi__)
+#if defined(__MINGW32__) || defined(_PSP) || defined(__PPU__) || defined(__ps2sdk__) || defined(_MSC_VER) || defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__USLC__) || defined(__NeXT__) || defined(__bsdi__) || defined(__amiga__)
                                         t = 0;
                                         btm = localtime(&t);
@@ -1056 +1062 @@
 #if !defined(__MINGW32__) && !defined(_MSC_VER) && !defined(__BORLANDC__) && !defined(__WATCOMC__)
                         if(errno == EINTR) continue;
-                        cm_log("Server", "Select failure: %s", strerror(errno));
+                        cm_log("Server", "Select/poll failure: %s", strerror(errno));
 #endif
                         break;
@@ -1079 +1085 @@
                                         socklen_t clen = sizeof(claddr);
                                         int sock = accept(sockets[i], (struct sockaddr*)&claddr, &clen);
-#if defined(__MINGW32__) || defined(__HAIKU__) || defined(_PSP) || defined(__PPU__) || defined(_MSC_VER) || defined(__BORLANDC__) || defined(__WATCOMC__)
+#if defined(__MINGW32__) || defined(__HAIKU__) || defined(_PSP) || defined(__PPU__) || defined(_MSC_VER) || defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__amiga__)
+#ifdef __amiga__
+                                        pthread_t thrt;
+#endif
                                         int j;
                                         struct pass_entry* e = malloc(sizeof(*e));
@@ -1104 +1113 @@
 #elif defined(_PSP) || defined(__PPU__)
                                                 tw_server_pass(e);
+#elif defined(__amiga__)
+                                        pthread_create(&thrt, NULL, tw_server_pass, e);
 #elif defined(__HAIKU__)
                                         for(j = 0; j < sizeof(threads) / sizeof(threads[0]); j++) {

trunk/Server/strptime.c

@@ -36 +36 @@
 //__RCSID("$NetBSD: strptime.c,v 1.62 2017/08/24 01:01:09 ginsbach Exp $");
 
-#if defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__NeXT__) || defined(__bsdi__)
+#if defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__NeXT__) || defined(__bsdi__) || defined(__amiga__)
 
 #include <stdlib.h>
@@ -116 +116 @@
 #endif
 
-#ifdef __WATCOMC__
+#if defined(__WATCOMC__)
 #define _tzset tzset
 #endif
@@ -470 +470 @@
                     continue;
                 }
-#if defined(_WIN32) || defined(__OS2__) || defined(__NeXT__) || defined(__DOS__)
-#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__NeXT__)
+#if defined(_WIN32) || defined(__OS2__) || defined(__NeXT__) || defined(__DOS__) || defined(__amiga__)
+#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__NeXT__) || defined(__amiga__)
                 if (1)
 #else
@@ -561 +561 @@
 #ifdef _WIN32
             _tzset();
+#elif defined(__amiga__)
 #else
             tzset();

trunk/Server/strptime.h

@@ -8 +8 @@
 #include <time.h>
 
-#if defined(_WIN32) || defined(_PSP) || defined(__ps2sdk__) || defined(__OS2__) || defined(__NETWARE__) || defined(__NeXT__) || defined(__DOS__) || defined(__bsdi__)
+#if defined(_WIN32) || defined(_PSP) || defined(__ps2sdk__) || defined(__OS2__) || defined(__NETWARE__) || defined(__NeXT__) || defined(__DOS__) || defined(__bsdi__) || defined(__amiga__)
 char* strptime(const char *buf, const char *fmt, struct tm *tm);
 #endif

trunk/Server/version.c

@@ -26 +26 @@
 #elif defined(__DOS__)
     "DOS"
+#elif defined(__amiga__)
+    "Amiga"
 #elif defined(__MINGW32__)
     "Windows-MinGW32"

trunk/config_platform.h

@@ -33 +33 @@
 
 #if (defined(_MSC_VER) || defined(__BORLANDC__) || defined(__WATCOMC__)) && !defined(NO_GETNAMEINFO)
+#define NO_GETNAMEINFO
+/* Do not use getnameinfo */
+#endif
+
+#if (defined(__amiga__)) && !defined(NO_IPV6)
+#define NO_IPV6
+/* Amiga does not have IPv6 */
+#endif
+
+#if (defined(__amiga__)) && defined(HAS_CHROOT)
+#undef HAS_CHROOT
+/* Amiga does not have chroot */
+#endif
+
+#if (defined(__amiga__)) && !defined(NO_GETNAMEINFO)
 #define NO_GETNAMEINFO
 /* Do not use getnameinfo */