Merge branch 'master' of git://ted.mutabah.net/acess2

[tpg/acess2.git] / KernelLand / Kernel / system.c

diff --git a/KernelLand/Kernel/system.c b/KernelLand/Kernel/system.c
index 7938723..0c701c3 100644 (file)
--- a/KernelLand/Kernel/system.c
+++ b/KernelLand/Kernel/system.c
@@ -48,15 +48,16 @@ void System_Init(char *CommandLine)
        if(Proc_Clone(CLONE_VM|CLONE_NOUSER) == 0)
        {
                const char      *args[] = {gsInitBinary, 0};
-               VFS_Open("/Devices/VTerm/0", VFS_OPENFLAG_READ|VFS_OPENFLAG_USER);      // 0: stdin
-               VFS_Open("/Devices/VTerm/0", VFS_OPENFLAG_WRITE|VFS_OPENFLAG_USER);     // 1: stdout
+               VFS_Open("/Devices/pts/vt0", VFS_OPENFLAG_READ|VFS_OPENFLAG_USER);      // 0: stdin
+               VFS_Open("/Devices/pts/vt0", VFS_OPENFLAG_WRITE|VFS_OPENFLAG_USER);     // 1: stdout
+               VFS_DuplicateFD(1, 2);  // 2: stderr
                Proc_Execve(gsInitBinary, args, &args[1], 0);
                Log_KernelPanic("System", "Unable to spawn init '%s'", gsInitBinary);
        }
        
        // Set the debug to be echoed to the terminal
        Log_Log("Config", "Kernel now echoes to VT7 (Ctrl-Alt-F8)");
-       Debug_SetKTerminal("/Devices/VTerm/7");
+       Debug_SetKTerminal("/Devices/pts/vt7");
 }
 
 /**
@@ -77,7 +78,10 @@ void System_ParseCommandLine(char *ArgString)
                // Eat Whitespace
                while(*str == ' ')      str++;
                // Check for the end of the string
-               if(*str == '\0') {      argc--; break;} 
+               if(*str == '\0') {
+                       argc--;
+                       break;
+               }
                argv[argc] = str;
                if(*str == '"') {
                        while(*str && !(*str == '"' && str[-1] != '\\'))