Changeset 315 in Main for trunk/Server/main.c

Timestamp:

Oct 14, 2024, 7:01:02 PM (5 weeks ago)

Author:

Nishi

Message:

wip

File:

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

trunk/Server/main.c

@@ -35 +35 @@
 #include "tw_version.h"
 
-#if defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__) || (defined(__WATCOMC__) && !defined(__OS2__))
+#if defined(__MINGW32__) || defined(_MSC_VER) || defined(__BORLANDC__) || (defined(__WATCOMC__) && !defined(__OS2__) && !defined(__NETWARE__))
 #include <windows.h>
+#elif defined(__NETWARE__)
+#include <nwconio.h>
+#include <nwthread.h>
 #endif
 
@@ -93 +96 @@
 int startup(int argc, char** argv);
 
-#if defined(__MINGW32__) || defined(_MSC_VER) || (defined(__WATCOMC__) && !defined(__OS2__)) || defined(__BORLANDC__)
+#if defined(__MINGW32__) || defined(_MSC_VER) || (defined(__WATCOMC__) && !defined(__OS2__) && !defined(__NETWARE__)) || defined(__BORLANDC__)
 char* get_registry(const char* main, const char* sub) {
         DWORD bufsize = 512;
@@ -533 +536 @@
 
 #if !defined(BUILD_GUI_VALID)
+void thread_stuff(void* pargs);
+
+struct arg_struct {
+        int argc;
+        char** argv;
+};
+
 int main(int argc, char** argv) {
         int st;
+#ifdef __NETWARE__
+        struct arg_struct* parg = malloc(sizeof(*parg));
+        parg->argc = argc;
+        parg->argv = argv;
+        DestroyScreen(GetCurrentScreen());
+        SetCurrentScreen(CreateScreen("Tewi Console", 0));
+        BeginThread(thread_stuff, NULL, 0, parg);
+        ThreadSwitch();
+        ExitThread(EXIT_THREAD, 0);
+        return 0;
+}
+
+void thread_stuff(void* pargs) {
+        int st;
+        int argc = ((struct arg_struct*)pargs)->argc;
+        char** argv = ((struct arg_struct*)pargs)->argv;
+#endif
 #ifdef SERVICE
         SERVICE_TABLE_ENTRY table[] = {{"Tewi HTTPd", servmain}, {NULL, NULL}};
@@ -707 +734 @@
                         ;
 #endif
+#ifdef __NETWARE__
+                return;
+#else
                 return st;
+#endif
 #endif
         }
@@ -715 +746 @@
         sceKernelExitGame();
 #endif
+#ifdef __NETWARE__
+        return;
+#else
         return 0;
+#endif
 }
 #endif
@@ -722 +757 @@
         int i;
         char* r;
-#if defined(__MINGW32__) || defined(_MSC_VER) || (defined(__WATCOMC__) && !defined(__OS2__)) || defined(__BORLANDC__)
+#if defined(__MINGW32__) || defined(_MSC_VER) || (defined(__WATCOMC__) && !defined(__OS2__) && !defined(__NETWARE__)) || defined(__BORLANDC__)
         char* confpath = cm_strdup(PREFIX "/etc/tewi.conf");
         char* regpath = get_registry("Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\Tewi HTTPd", "InstallDir");
@@ -806 +841 @@
         signal(SIGCHLD, SIG_IGN);
         signal(SIGPIPE, SIG_IGN);
-#elif !defined(BUILD_GUI) && !defined(__OS2__)
+#elif !defined(BUILD_GUI) && !defined(__OS2__) && !defined(__NETWARE__)
         SetConsoleTitle(tw_server);
 #endif