lhnet: Use the generic linked list

[xonotic/darkplaces.git] / sys_unix.c

diff --git a/sys_unix.c b/sys_unix.c
index 031c55d8d9353dbb0f153928e5d100256efe6b4a..eccf986e3791149cbf604cb3f3506b7852430cd9 100644 (file)
--- a/sys_unix.c
+++ b/sys_unix.c
@@ -42,7 +42,7 @@ void Sys_Error (const char *error, ...)
 
        Con_Printf(CON_ERROR "Engine Error: %s\n", string);
 
-       Host_Shutdown ();
+       //Host_Shutdown ();
        exit (1);
 }
 
@@ -75,64 +75,61 @@ void Sys_PrintToTerminal(const char *text)
 
 char *Sys_ConsoleInput(void)
 {
-       //if (cls.state == ca_dedicated)
-       {
-               static char text[MAX_INPUTLINE];
-               static unsigned int len = 0;
+       static char text[MAX_INPUTLINE];
+       static unsigned int len = 0;
 #ifdef WIN32
-               int c;
+       int c;
 
-               // read a line out
-               while (_kbhit ())
+       // read a line out
+       while (_kbhit ())
+       {
+               c = _getch ();
+               if (c == '\r')
                {
-                       c = _getch ();
-                       if (c == '\r')
-                       {
-                               text[len] = '\0';
-                               _putch ('\n');
-                               len = 0;
-                               return text;
-                       }
-                       if (c == '\b')
-                       {
-                               if (len)
-                               {
-                                       _putch (c);
-                                       _putch (' ');
-                                       _putch (c);
-                                       len--;
-                               }
-                               continue;
-                       }
-                       if (len < sizeof (text) - 1)
+                       text[len] = '\0';
+                       _putch ('\n');
+                       len = 0;
+                       return text;
+               }
+               if (c == '\b')
+               {
+                       if (len)
                        {
                                _putch (c);
-                               text[len] = c;
-                               len++;
+                               _putch (' ');
+                               _putch (c);
+                               len--;
                        }
+                       continue;
                }
+               if (len < sizeof (text) - 1)
+               {
+                       _putch (c);
+                       text[len] = c;
+                       len++;
+               }
+       }
 #else
-               fd_set fdset;
-               struct timeval timeout;
-               FD_ZERO(&fdset);
-               FD_SET(0, &fdset); // stdin
-               timeout.tv_sec = 0;
-               timeout.tv_usec = 0;
-               if (select (1, &fdset, NULL, NULL, &timeout) != -1 && FD_ISSET(0, &fdset))
+       fd_set fdset;
+       struct timeval timeout;
+       FD_ZERO(&fdset);
+       FD_SET(0, &fdset); // stdin
+       timeout.tv_sec = 0;
+       timeout.tv_usec = 0;
+       if (select (1, &fdset, NULL, NULL, &timeout) != -1 && FD_ISSET(0, &fdset))
+       {
+               len = read (0, text, sizeof(text) - 1);
+               if (len >= 1)
                {
-                       len = read (0, text, sizeof(text) - 1);
-                       if (len >= 1)
-                       {
-                               // rip off the \n and terminate
-                               // div0: WHY? console code can deal with \n just fine
-                               // this caused problems with pasting stuff into a terminal window
-                               // so, not ripping off the \n, but STILL keeping a NUL terminator
-                               text[len] = 0;
-                               return text;
-                       }
+                       // rip off the \n and terminate
+                       // div0: WHY? console code can deal with \n just fine
+                       // this caused problems with pasting stuff into a terminal window
+                       // so, not ripping off the \n, but STILL keeping a NUL terminator
+                       text[len] = 0;
+                       return text;
                }
-#endif
        }
+#endif
        return NULL;
 }