Kernel - Changed PTY code to not expose userland server node as a file

diff --git a/KernelLand/Kernel/drv/pty.c b/KernelLand/Kernel/drv/pty.c
index 3b59c7e..8b63b11 100644 (file)
--- a/KernelLand/Kernel/drv/pty.c
+++ b/KernelLand/Kernel/drv/pty.c
@@ -49,8 +49,8 @@ struct sPTY
         int    OutputReadPos;
        char    OutputData[OUTPUT_RINGBUFFER_LEN];
        
+       tVFS_Node       *ServerNode;
        tVFS_Node       ClientNode;
-       tVFS_Node       ServerNode;
        tVFS_ACL        OwnerRW;
        
        // TODO: Maintain list of client PIDs
@@ -60,7 +60,6 @@ struct sPTY
  int   PTY_Install(char **Arguments);
  int   PTY_ReadDir(tVFS_Node *Node, int Pos, char Name[FILENAME_MAX]);
 tVFS_Node      *PTY_FindDir(tVFS_Node *Node, const char *Name, Uint Flags);
-tVFS_Node      *PTY_MkNod(tVFS_Node *Node, const char *Name, Uint Mode);
 
 size_t _rb_write(void *buf, size_t buflen, int *rd, int *wr, const void *data, size_t len);
 size_t _rb_read(void *buf, size_t buflen, int *rd, int *wr, void *data, size_t len);
@@ -69,13 +68,12 @@ size_t      PTY_int_SendInput(tPTY *PTY, const char *Input, size_t Length);
 // PTY_SendInput
 size_t PTY_ReadClient(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffer, Uint Flags);
 size_t PTY_WriteClient(tVFS_Node *Node, off_t Offset, size_t Length, const void *Buffer, Uint Flags);
- int   PTY_IOCtlClient(tVFS_Node *Node, int ID, void *Arg);
 void   PTY_ReferenceClient(tVFS_Node *Node);
 void   PTY_CloseClient(tVFS_Node *Node);
 size_t PTY_ReadServer(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffer, Uint Flags);
 size_t PTY_WriteServer(tVFS_Node *Node, off_t Offset, size_t Length, const void *Buffer, Uint Flags);
- int   PTY_IOCtlServer(tVFS_Node *Node, int ID, void *Arg);
 void   PTY_CloseServer(tVFS_Node *Node);
+ int   PTY_IOCtl(tVFS_Node *Node, int ID, void *Arg);
 
 // === GLOBALS ===
 MODULE_DEFINE(0, 0x100, PTY, PTY_Install, NULL, NULL);
@@ -83,13 +81,12 @@ tVFS_NodeType       gPTY_NodeType_Root = {
        .TypeName = "PTY-Root",
        .ReadDir = PTY_ReadDir,
        .FindDir = PTY_FindDir,
-       .MkNod = PTY_MkNod
 };
 tVFS_NodeType  gPTY_NodeType_Client = {
        .TypeName = "PTY-Client",
        .Read = PTY_ReadClient,
        .Write = PTY_WriteClient,
-       .IOCtl = PTY_IOCtlClient,
+       .IOCtl = PTY_IOCtl,
        .Reference = PTY_ReferenceClient,
        .Close = PTY_CloseClient
 };
@@ -97,7 +94,7 @@ tVFS_NodeType gPTY_NodeType_Server = {
        .TypeName = "PTY-Server",
        .Read = PTY_ReadServer,
        .Write = PTY_WriteServer,
-       .IOCtl = PTY_IOCtlServer,
+       .IOCtl = PTY_IOCtl,
        .Close = PTY_CloseServer
 };
 tDevFS_Driver  gPTY_Driver = {
@@ -167,7 +164,7 @@ tPTY *PTY_Create(const char *Name, void *Handle, tPTY_OutputFcn Output, tPTY_Req
                                break;
                        idx ++;
                }
-               namelen = 0;
+               namelen = snprintf(NULL,0, "%u", idx);
        }
        
        tPTY *ret = calloc(sizeof(tPTY) + namelen + 1, 1);
@@ -184,21 +181,13 @@ tPTY *PTY_Create(const char *Name, void *Handle, tPTY_OutputFcn Output, tPTY_Req
        if(Name)
                strcpy(ret->Name, Name);
        else
-               ret->Name[0] = 0;
+               sprintf(ret->Name, "%u", idx);
        ret->NumericName = idx;
        // - Output function and handle (same again)
        ret->OutputHandle = Handle;
        ret->OutputFcn = Output;
        ret->ReqResize = ReqResize;
        ret->ModeSet = ModeSet;
-       // - Server node
-       ret->ServerNode.ImplPtr = ret;
-       ret->ServerNode.Type = &gPTY_NodeType_Server;
-       ret->ServerNode.UID = Threads_GetUID();
-       ret->ServerNode.GID = Threads_GetGID();
-       ret->ServerNode.NumACLs = 1;
-       ret->ServerNode.ACLs = &ret->OwnerRW;
-       ret->ServerNode.ReferenceCount = (Output ? 1 : 0);      // Prevent a userland close killing a kernel pty
        // - Client node
        ret->ClientNode.ImplPtr = ret;
        ret->ClientNode.Type = &gPTY_NodeType_Client;
@@ -331,7 +320,7 @@ size_t PTY_int_WriteInput(tPTY *PTY, const char *Input, size_t Length)
 
        VFS_MarkAvaliable(&PTY->ClientNode, 1);
        if(ret < Length)
-               VFS_MarkFull(&PTY->ServerNode, 1);      
+               VFS_MarkFull(PTY->ServerNode, 1);       
 
        return ret;
 }
@@ -436,40 +425,28 @@ int PTY_ReadDir(tVFS_Node *Node, int Pos, char Name[FILENAME_MAX])
 {
        tPTY    *pty = NULL;
         int    idx = Pos;
-       if( idx < giPTY_NumCount * 2 )
+       if( idx < giPTY_NumCount )
        {
                RWLock_AcquireRead(&glPTY_NumPTYs);
-               for( pty = gpPTY_FirstNumPTY; pty; pty = pty->Next )
-               {
-                       if( idx < 2 )
-                               break;
-                       idx -= 2;
-               }
+               for( pty = gpPTY_FirstNumPTY; pty && idx; pty = pty->Next )
+                       idx --;
                RWLock_Release(&glPTY_NumPTYs);
        }
-       else if( idx < (giPTY_NumCount + giPTY_NamedCount) * 2 )
+       else if( idx < (giPTY_NumCount + giPTY_NamedCount) )
        {
-               idx -= giPTY_NumCount*2;
+               idx -= giPTY_NumCount;
                RWLock_AcquireRead(&glPTY_NamedPTYs);
-               for( pty = gpPTY_FirstNamedPTY; pty; pty = pty->Next )
-               {
-                       if( idx < 2 )
-                               break;
-                       idx -= 2;
-               }
+               for( pty = gpPTY_FirstNamedPTY; pty && idx; pty = pty->Next )
+                       idx --;
                RWLock_Release(&glPTY_NamedPTYs);
        }
-       
 
        if( !pty ) {
                LOG("%i out of range", Pos);
                return -1;
        }
-       
-       if( pty->Name[0] )
-               snprintf(Name, FILENAME_MAX, "%s%c", pty->Name, (idx == 0 ? 'c' : 's'));
-       else
-               snprintf(Name, FILENAME_MAX, "%i%c", pty->NumericName, (idx == 0 ? 'c' : 's'));
+
+       strncpy(Name, pty->Name, FILENAME_MAX)  
        LOG("Return '%s'", Name);
        return 0;
 }
@@ -478,17 +455,19 @@ tVFS_Node *PTY_FindDir(tVFS_Node *Node, const char *Name, Uint Flags)
 {
        char    *end;
         int    num = strtol(Name, &end, 10);
+
+       if( strcmp(Name, "ptmx") == 0 ) {
+               tVFS_Node       *ret = calloc(sizeof(tVFS_Node), 1);
+               ret->Size = -1;
+               ret->Type = &gPTY_NodeType_Server;
+               return ret;
+       } 
        
-       if( Name[0] == '\0' || Name[1] == '\0' )
-               return NULL;
-       
-       size_t  len = strlen(Name);
-       if( Name[len-1] != 'c' && Name[len-1] != 's' )
+       if( Name[0] == '\0' )
                return NULL;
-        int    isServer = (Name[len-1] != 'c');
        
        tPTY    *ret = NULL;
-       if( num && (end[0] == 'c' || end[0] == 's') && end[1] == '\0' )
+       if( num && end[0] == '\0' )
        {
                // Numeric name
                RWLock_AcquireRead(&glPTY_NumPTYs);
@@ -509,10 +488,10 @@ tVFS_Node *PTY_FindDir(tVFS_Node *Node, const char *Name, Uint Flags)
                RWLock_AcquireRead(&glPTY_NamedPTYs);
                for( tPTY *pty = gpPTY_FirstNamedPTY; pty; pty = pty->Next )
                {
-                       int cmp = strncmp(pty->Name, Name, len-1);
+                       int cmp = strcmp(pty->Name, Name);
                        if(cmp > 0)
                                break;
-                       if(cmp == 0 && pty->Name[len-1] == '\0' ) {
+                       if(cmp == 0 ) {
                                ret = pty;
                                break;
                        }
@@ -520,7 +499,7 @@ tVFS_Node *PTY_FindDir(tVFS_Node *Node, const char *Name, Uint Flags)
                RWLock_Release(&glPTY_NamedPTYs);
        }
        if( ret ) {
-               tVFS_Node       *retnode = (isServer ? &ret->ServerNode : &ret->ClientNode);
+               tVFS_Node       *retnode = &ret->ClientNode;
                retnode->ReferenceCount ++;
                return retnode;
        }
@@ -528,26 +507,6 @@ tVFS_Node *PTY_FindDir(tVFS_Node *Node, const char *Name, Uint Flags)
                return NULL;
 }
 
-tVFS_Node *PTY_MkNod(tVFS_Node *Node, const char *Name, Uint Mode)
-{
-       // zero-length name means a numbered pty has been requested
-       if( Name[0] == '\0' || (Name[0] == '#' && Name[1] == '\0') )
-       {
-               tPTY    *ret = PTY_Create(NULL, NULL, NULL, NULL, NULL);
-               if( !ret )
-                       return NULL;
-               return &ret->ServerNode;
-       }
-       
-       // Otherwise return a named PTY
-       // TODO: Should the request be for '<name>s' or just '<name>'   
-
-       tPTY    *ret = PTY_Create(Name, NULL, NULL, NULL, NULL);
-       if(!ret)
-               return NULL;
-       return &ret->ServerNode;
-}
-
 //\! Read from the client's input
 size_t PTY_ReadClient(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffer, Uint Flags)
 {
@@ -558,7 +517,7 @@ size_t PTY_ReadClient(tVFS_Node *Node, off_t Offset, size_t Length, void *Buffer
         int    rv;
 _select:
        // If server has disconnected, return EIO
-       if( pty->ServerNode.ReferenceCount == 0 ) {
+       if( pty->ServerNode && pty->ServerNode->ReferenceCount == 0 ) {
                //Threads_PostSignal(SIGPIPE);
                errno = EIO;
                return -1;
@@ -592,7 +551,7 @@ size_t PTY_WriteClient(tVFS_Node *Node, off_t Offset, size_t Length, const void
        tPTY *pty = Node->ImplPtr;
 
        // If the server has terminated, send SIGPIPE
-       if( pty->ServerNode.ReferenceCount == 0 )
+       if( pty->ServerNode && pty->ServerNode->ReferenceCount == 0 )
        {
                //Threads_PostSignal(SIGPIPE);
                errno = EIO;
@@ -610,43 +569,12 @@ size_t PTY_WriteClient(tVFS_Node *Node, off_t Offset, size_t Length, const void
                Length = _rb_write(pty->OutputData, OUTPUT_RINGBUFFER_LEN,
                        &pty->OutputReadPos, &pty->OutputWritePos,
                        Buffer, Length);
-               VFS_MarkAvaliable(&pty->ServerNode, 1);
+               VFS_MarkAvaliable(pty->ServerNode, 1);
        }
        
        return Length;
 }
 
-int PTY_IOCtlClient(tVFS_Node *Node, int ID, void *Data)
-{
-       tPTY    *pty = Node->ImplPtr;
-       struct ptymode  *mode = Data;
-       struct ptydims  *dims = Data;
-       switch(ID)
-       {
-       case DRV_IOCTL_TYPE:    return DRV_TYPE_TERMINAL;
-       case DRV_IOCTL_IDENT:   memcpy(Data, "PTY\0", 4);       return 0;
-       case DRV_IOCTL_VERSION: return 0x100;
-       case DRV_IOCTL_LOOKUP:  return 0;
-       
-       case PTY_IOCTL_GETMODE:
-               if( !CheckMem(Data, sizeof(*mode)) ) { errno = EINVAL; return -1; }
-               *mode = pty->Mode;
-               return 0;
-       case PTY_IOCTL_SETMODE:
-               if( !CheckMem(Data, sizeof(*mode)) ) { errno = EINVAL; return -1; }
-               return PTY_SetAttrib(pty, NULL, mode, 1);
-       case PTY_IOCTL_GETDIMS:
-               if( !CheckMem(Data, sizeof(*dims)) ) { errno = EINVAL; return -1; }
-               *dims = pty->Dims;
-               return 0;
-       case PTY_IOCTL_SETDIMS:
-               if( !CheckMem(Data, sizeof(*dims)) ) { errno = EINVAL; return -1; }
-               return PTY_SetAttrib(pty, dims, NULL, 1);
-       }
-       errno = ENOSYS;
-       return -1;
-}
-
 void PTY_ReferenceClient(tVFS_Node *Node)
 {
        Node->ReferenceCount ++;
@@ -663,9 +591,12 @@ void PTY_CloseClient(tVFS_Node *Node)
        // TODO: Maintain list of client processes
 
        // Free structure if this was the last open handle
-       if( Node->ReferenceCount == 0 && pty->ServerNode.ReferenceCount == 0 )
+       if( Node->ReferenceCount > 0 )
+               return ;
+       if( pty->ServerNode && pty->ServerNode->ReferenceCount == 0 )
        {
                // Free the structure! (Should be off the PTY list now)
+               free(pty->ServerNode);
                free(pty);
        }
 }
@@ -706,42 +637,6 @@ size_t PTY_WriteServer(tVFS_Node *Node, off_t Offset, size_t Length, const void
        return PTY_SendInput(Node->ImplPtr, Buffer, Length);
 }
 
-int PTY_IOCtlServer(tVFS_Node *Node, int ID, void *Data)
-{
-       tPTY    *pty = Node->ImplPtr;
-       struct ptymode  *mode = Data;
-       struct ptydims  *dims = Data;
-       switch(ID)
-       {
-       case DRV_IOCTL_TYPE:    return DRV_TYPE_TERMINAL;
-       case DRV_IOCTL_IDENT:   memcpy(Data, "PTY\0", 4);       return 0;
-       case DRV_IOCTL_VERSION: return 0x100;
-       case DRV_IOCTL_LOOKUP:  return 0;
-       
-       case PTY_IOCTL_GETMODE:
-               if( !CheckMem(Data, sizeof(*mode)) ) { errno = EINVAL; return -1; }
-               *mode = pty->Mode;
-               // ACK client's SETMODE
-               return 0;
-       case PTY_IOCTL_SETMODE:
-               if( !CheckMem(Data, sizeof(*mode)) ) { errno = EINVAL; return -1; }
-               PTY_SetAttrib(pty, NULL, mode, 0);
-               return 0;
-       case PTY_IOCTL_GETDIMS:
-               if( !CheckMem(Data, sizeof(*dims)) ) { errno = EINVAL; return -1; }
-               *dims = pty->Dims;
-               return 0;
-       case PTY_IOCTL_SETDIMS:
-               if( !CheckMem(Data, sizeof(*dims)) ) { errno = EINVAL; return -1; }
-               PTY_SetAttrib(pty, dims, NULL, 0);
-               break;
-       case PTY_IOCTL_GETID:
-               return pty->NumericName;
-       }
-       errno = ENOSYS;
-       return -1;
-}
-
 void PTY_CloseServer(tVFS_Node *Node)
 {
        tPTY    *pty = Node->ImplPtr;
@@ -753,7 +648,7 @@ void PTY_CloseServer(tVFS_Node *Node)
        
        // Locate on list and remove
        tPTY    **prev_np;
-       if( pty->Name[0] ) {
+       if( pty->NumericName == 0 ) {
                RWLock_AcquireWrite(&glPTY_NamedPTYs);
                prev_np = &gpPTY_FirstNamedPTY;
        }
@@ -775,7 +670,7 @@ void PTY_CloseServer(tVFS_Node *Node)
        }
        
        // Clean up lock
-       if( pty->Name[0] ) {
+       if( pty->NumericName == 0 ) {
                RWLock_Release(&glPTY_NamedPTYs);
                giPTY_NamedCount --;
        }
@@ -785,7 +680,71 @@ void PTY_CloseServer(tVFS_Node *Node)
        }
 
        // If there are no open children, we can safely free this PTY
-       if( pty->ClientNode.ReferenceCount == 0 )
+       if( pty->ClientNode.ReferenceCount == 0 ) {
+               free(Node);
                free(pty);
+       }
+}
+
+int PTY_IOCtl(tVFS_Node *Node, int ID, void *Data)
+{
+       tPTY    *pty = Node->ImplPtr;
+       struct ptymode  *mode = Data;
+       struct ptydims  *dims = Data;
+       
+       int     is_server = !pty || Node == pty->ServerNode;
+
+       switch(ID)
+       {
+       case DRV_IOCTL_TYPE:    return DRV_TYPE_TERMINAL;
+       case DRV_IOCTL_IDENT:   memcpy(Data, "PTY\0", 4);       return 0;
+       case DRV_IOCTL_VERSION: return 0x100;
+       case DRV_IOCTL_LOOKUP:  return 0;
+       
+       case PTY_IOCTL_GETMODE:
+               if( !pty )      return 0;
+               if( !CheckMem(Data, sizeof(*mode)) ) { errno = EINVAL; return -1; }
+               *mode = pty->Mode;
+               // TODO: ACK client's SETMODE
+               return 0;
+       case PTY_IOCTL_SETMODE:
+               if( !pty )      return 0;
+               if( !CheckMem(Data, sizeof(*mode)) ) { errno = EINVAL; return -1; }
+               PTY_SetAttrib(pty, NULL, mode, !is_server);
+               return 0;
+       case PTY_IOCTL_GETDIMS:
+               if( !pty )      return 0;
+               if( !CheckMem(Data, sizeof(*dims)) ) { errno = EINVAL; return -1; }
+               *dims = pty->Dims;
+               return 0;
+       case PTY_IOCTL_SETDIMS:
+               if( !pty )      return 0;
+               if( !CheckMem(Data, sizeof(*dims)) ) { errno = EINVAL; return -1; }
+               PTY_SetAttrib(pty, dims, NULL, !is_server);
+               return 0;
+       case PTY_IOCTL_GETID:
+               if( pty )
+               {
+                       size_t  len = strlen(pty->Name)+1;
+                       if( Data )
+                       {
+                               if( !CheckMem(Data, len) ) { errno = EINVAL; return -1; }
+                               strcpy(Data, pty->Name);
+                       }
+                       return len;
+               }
+               return 0;
+       case PTY_IOCTL_SETID:
+               if( Data && !CheckString(Data) ) { errno = EINVAL; return -1; }
+               if( pty )       return EALREADY;
+               pty = PTY_Create(Data, NULL, NULL,NULL, NULL);
+               if(pty == NULL)
+                       return 1;
+               Node->ImplPtr = pty;
+               pty->ServerNode = Node;
+               return 0;
+       }
+       errno = ENOSYS;
+       return -1;
 }
 

diff --git a/KernelLand/Kernel/drv/vterm.c b/KernelLand/Kernel/drv/vterm.c
index dcd798b..cb7c312 100644 (file)
--- a/KernelLand/Kernel/drv/vterm.c
+++ b/KernelLand/Kernel/drv/vterm.c
@@ -196,7 +196,7 @@ int VT_Install(char **Arguments)
        
        // Set kernel output to VT0
        Log_Debug("VTerm", "Setting kernel output to VT#0");
-       Debug_SetKTerminal("/Devices/pts/vt0c");
+       Debug_SetKTerminal("/Devices/pts/vt0");
        
        return MODULE_ERR_OK;
 }

diff --git a/KernelLand/Kernel/system.c b/KernelLand/Kernel/system.c
index 0506f3a..e09d469 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/pts/vt0c", VFS_OPENFLAG_READ|VFS_OPENFLAG_USER);     // 0: stdin
-               VFS_Open("/Devices/pts/vt0c", 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/pts/vt7c");
+       Debug_SetKTerminal("/Devices/pts/vt7");
 }
 
 /**

diff --git a/KernelLand/Kernel/vfs/select.c b/KernelLand/Kernel/vfs/select.c
index 8bd0deb..b52414f 100644 (file)
--- a/KernelLand/Kernel/vfs/select.c
+++ b/KernelLand/Kernel/vfs/select.c
@@ -113,6 +113,7 @@ int VFS_SelectNode(tVFS_Node *Node, int TypeFlags, tTime *Timeout, const char *N
                if( !(TypeFlags & (1 << type)) )        continue;
                VFS_int_Select_GetType(type, Node, &list, &flag, &wanted, &maxAllowed);
                LOG("VFS_int_Select_RemThread()");
+               ASSERT(*list);
                VFS_int_Select_RemThread(*list, thisthread);
                ret = ret || *flag == wanted;
        }
@@ -446,7 +447,6 @@ int VFS_int_Select_AddThread(tVFS_SelectList *List, tThread *Thread, int MaxAllo
 
 void VFS_int_Select_RemThread(tVFS_SelectList *List, tThread *Thread)
 {
-        int    i;
        tVFS_SelectListEnt      *block, *prev = NULL;
        
        ENTER("pList pThread", List, Thread);
@@ -459,7 +459,7 @@ void VFS_int_Select_RemThread(tVFS_SelectList *List, tThread *Thread)
        // Look for the thread
        do
        {
-               for( i = 0; i < NUM_THREADS_PER_ALLOC; i ++ )
+               for( int i = 0; i < NUM_THREADS_PER_ALLOC; i ++ )
                {
                        if( block->Threads[i] == Thread )
                        {

diff --git a/Usermode/Applications/gui_shell_src/main.c b/Usermode/Applications/gui_shell_src/main.c
index cfc7e2a..3f9a656 100644 (file)
--- a/Usermode/Applications/gui_shell_src/main.c
+++ b/Usermode/Applications/gui_shell_src/main.c
@@ -62,7 +62,7 @@ int main(int argc, char *argv[], const char **envp)
        AxWin3_FocusWindow(gMainWindow);
 
        // Create PTY
-       giPTYHandle = _SysOpen("/Devices/pts/gui0", OPENFLAG_READ|OPENFLAG_WRITE|OPENFLAG_CREATE);
+       giPTYHandle = _SysOpen("/Devices/pts/ptmx", OPENFLAG_READ|OPENFLAG_WRITE);
        if( giPTYHandle < 0 ) {
                perror("Unable to create/open PTY");
                _SysDebug("Unable to create/open PTY: %s", strerror(errno));
@@ -70,6 +70,7 @@ int main(int argc, char *argv[], const char **envp)
        }
        // - Initialise
        {
+               _SysIOCtl(giPTYHandle, PTY_IOCTL_SETID, "gui0");
                struct ptymode  mode = {.InputMode = PTYIMODE_CANON|PTYIMODE_ECHO, .OutputMode=0};
                struct ptydims  dims = {.W = 80, .H = 25};
                _SysIOCtl(giPTYHandle, PTY_IOCTL_SETMODE, &mode);
@@ -78,7 +79,7 @@ int main(int argc, char *argv[], const char **envp)
 
        // Spawn shell
        {
-                int    fd = _SysOpen("/Devices/pts/gui0c", OPENFLAG_READ|OPENFLAG_WRITE);
+                int    fd = _SysOpen("/Devices/pts/gui0", OPENFLAG_READ|OPENFLAG_WRITE);
                 int    fds[] = {fd, fd, fd};
                const char      *argv[] = {"CLIShell", NULL};
                int pid = _SysSpawn("/Acess/Bin/CLIShell", argv, envp, 3, fds, NULL);

diff --git a/Usermode/Applications/init_src/main.c b/Usermode/Applications/init_src/main.c
index ff34796..1a609ac 100644 (file)
--- a/Usermode/Applications/init_src/main.c
+++ b/Usermode/Applications/init_src/main.c
@@ -426,7 +426,7 @@ int SpawnCommand(int c_stdin, int c_stdout, int c_stderr, char **ArgV)
 
 int SpawnKTerm(tInitProgram *Program)
 {
-       const char fmt[] = "/Devices/pts/vt%ic";
+       const char fmt[] = "/Devices/pts/vt%i";
        char    path[sizeof(fmt)];
        
        snprintf(path, sizeof(path), fmt, Program->TypeInfo.KTerm.ID);

diff --git a/Usermode/Applications/telnetd_src/main.c b/Usermode/Applications/telnetd_src/main.c
index 7811518..0526801 100644 (file)
--- a/Usermode/Applications/telnetd_src/main.c
+++ b/Usermode/Applications/telnetd_src/main.c
@@ -133,6 +133,7 @@ void Server_NewClient(int FD)
        giNumClients ++;
        
        // Create stdin/stdout
+       // TODO: Use PTYs
        clt->stdin = _SysOpen("/Devices/fifo/anon", OPENFLAG_READ|OPENFLAG_WRITE);
        clt->stdout = _SysOpen("/Devices/fifo/anon", OPENFLAG_READ|OPENFLAG_WRITE);
        

diff --git a/Usermode/Libraries/ld-acess.so_src/include_exp/acess/devices/pty.h b/Usermode/Libraries/ld-acess.so_src/include_exp/acess/devices/pty.h
index 005703d..9c243ce 100644 (file)
--- a/Usermode/Libraries/ld-acess.so_src/include_exp/acess/devices/pty.h
+++ b/Usermode/Libraries/ld-acess.so_src/include_exp/acess/devices/pty.h
@@ -45,6 +45,7 @@ enum
        PTY_IOCTL_GETDIMS,
        PTY_IOCTL_SETDIMS,
        PTY_IOCTL_GETID,
+       PTY_IOCTL_SETID,
 };
 
 #endif