Kernel/PTYs - Fixed server-end of user closing prematurely

[tpg/acess2.git] / KernelLand / Kernel / drv / pty.c

diff --git a/KernelLand/Kernel/drv/pty.c b/KernelLand/Kernel/drv/pty.c
index 3ffe82b..3b59c7e 100644 (file)
--- a/KernelLand/Kernel/drv/pty.c
+++ b/KernelLand/Kernel/drv/pty.c
@@ -5,7 +5,7 @@
  * drv/pty.c
  * - Pseudo Terminals
  */
-#define DEBUG  1
+#define DEBUG  0
 #include <acess.h>
 #include <vfs.h>
 #include <fs_devfs.h>
@@ -30,6 +30,7 @@ struct sPTY
        void    *OutputHandle;
        tPTY_OutputFcn  OutputFcn;
        tPTY_ReqResize  ReqResize;
+       tPTY_ModeSet    ModeSet;
 
        struct ptymode  Mode;
        struct ptydims  Dims;
@@ -103,7 +104,8 @@ tDevFS_Driver       gPTY_Driver = {
        .Name = "pts",
        .RootNode = {
                .Flags = VFS_FFLAG_DIRECTORY,
-               .Type = &gPTY_NodeType_Root
+               .Type = &gPTY_NodeType_Root,
+               .Size = -1
        }
 };
  int   giPTY_NumCount;
@@ -121,7 +123,7 @@ int PTY_Install(char **Arguments)
 }
 
 // --- Management ---
-tPTY *PTY_Create(const char *Name, void *Handle, tPTY_OutputFcn Output, tPTY_ReqResize ReqResize)
+tPTY *PTY_Create(const char *Name, void *Handle, tPTY_OutputFcn Output, tPTY_ReqResize ReqResize, tPTY_ModeSet ModeSet)
 {
        tPTY    **prev_np = NULL;
        size_t  namelen;
@@ -188,6 +190,7 @@ tPTY *PTY_Create(const char *Name, void *Handle, tPTY_OutputFcn Output, tPTY_Req
        ret->OutputHandle = Handle;
        ret->OutputFcn = Output;
        ret->ReqResize = ReqResize;
+       ret->ModeSet = ModeSet;
        // - Server node
        ret->ServerNode.ImplPtr = ret;
        ret->ServerNode.Type = &gPTY_NodeType_Server;
@@ -228,17 +231,31 @@ int PTY_SetAttrib(tPTY *PTY, const struct ptydims *Dims, const struct ptymode *M
                        errno = EINVAL;
                        return -1;
                }
-               PTY->Mode = *Mode;
-               if( !WasClient && !PTY->OutputFcn )
+               if( WasClient )
                {
-                       Log_Warning("PTY", "TODO: Need to stop client output until modeset has been ACKed");
-                       // Block write until acked
-                       // ACK by server doing GETMODE
+                       if( PTY->ModeSet && PTY->ModeSet(PTY->OutputHandle, Mode) )
+                       {
+                               errno = EINVAL;
+                               return -1;
+                       }
+                       else if( !PTY->OutputFcn )
+                       {
+                               Log_Warning("PTY", "TODO: Need to stop client output until modeset has been ACKed");
+                               // Block write until acked
+                               // ACK by server doing GETMODE
+                       }
                }
+               else
+               {
+                       // Should the client be informed that the server just twiddled the modes?
+               }
+               LOG("PTY %p mode set to {0%o, 0%o}", PTY, Mode->InputMode, Mode->OutputMode);
+               PTY->Mode = *Mode;
        }
        if( Dims )
        {
-               if( WasClient ) {
+               if( WasClient )
+               {
                        // Poke the server?
                        if( PTY->ReqResize && PTY->ReqResize(PTY->OutputHandle, Dims) )
                        {
@@ -250,9 +267,11 @@ int PTY_SetAttrib(tPTY *PTY, const struct ptydims *Dims, const struct ptymode *M
                                // Inform server process... somehow
                        }
                }
-               else {
+               else
+               {
                        // SIGWINSZ to client
                }
+               LOG("PTY %p dims set to %ix%i", PTY, Dims->W, Dims->H);
                PTY->Dims = *Dims;
        }
        return 0;
@@ -416,37 +435,42 @@ size_t PTY_SendInput(tPTY *PTY, const char *Input, size_t Length)
 int PTY_ReadDir(tVFS_Node *Node, int Pos, char Name[FILENAME_MAX])
 {
        tPTY    *pty = NULL;
-       if( Pos < giPTY_NumCount * 2 )
+        int    idx = Pos;
+       if( idx < giPTY_NumCount * 2 )
        {
                RWLock_AcquireRead(&glPTY_NumPTYs);
                for( pty = gpPTY_FirstNumPTY; pty; pty = pty->Next )
                {
-                       if( Pos < 2 )
+                       if( idx < 2 )
                                break;
-                       Pos -= 2;
+                       idx -= 2;
                }
                RWLock_Release(&glPTY_NumPTYs);
        }
-       else if( Pos < (giPTY_NumCount + giPTY_NamedCount) * 2 )
+       else if( idx < (giPTY_NumCount + giPTY_NamedCount) * 2 )
        {
+               idx -= giPTY_NumCount*2;
                RWLock_AcquireRead(&glPTY_NamedPTYs);
                for( pty = gpPTY_FirstNamedPTY; pty; pty = pty->Next )
                {
-                       if( Pos < 2 )
+                       if( idx < 2 )
                                break;
-                       Pos -= 2;
+                       idx -= 2;
                }
                RWLock_Release(&glPTY_NamedPTYs);
        }
        
 
-       if( !pty )
+       if( !pty ) {
+               LOG("%i out of range", Pos);
                return -1;
+       }
        
        if( pty->Name[0] )
-               snprintf(Name, FILENAME_MAX, "%s%c", pty->Name, (Pos == 0 ? 'c' : 's'));
+               snprintf(Name, FILENAME_MAX, "%s%c", pty->Name, (idx == 0 ? 'c' : 's'));
        else
-               snprintf(Name, FILENAME_MAX, "%i%c", pty->NumericName, (Pos == 0 ? 'c' : 's'));
+               snprintf(Name, FILENAME_MAX, "%i%c", pty->NumericName, (idx == 0 ? 'c' : 's'));
+       LOG("Return '%s'", Name);
        return 0;
 }
 
@@ -495,8 +519,11 @@ tVFS_Node *PTY_FindDir(tVFS_Node *Node, const char *Name, Uint Flags)
                }
                RWLock_Release(&glPTY_NamedPTYs);
        }
-       if( ret )
-               return (isServer ? &ret->ServerNode : &ret->ClientNode);
+       if( ret ) {
+               tVFS_Node       *retnode = (isServer ? &ret->ServerNode : &ret->ClientNode);
+               retnode->ReferenceCount ++;
+               return retnode;
+       }
        else
                return NULL;
 }
@@ -504,9 +531,9 @@ tVFS_Node *PTY_FindDir(tVFS_Node *Node, const char *Name, Uint Flags)
 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' )
+       if( Name[0] == '\0' || (Name[0] == '#' && Name[1] == '\0') )
        {
-               tPTY    *ret = PTY_Create(NULL, NULL, NULL, NULL);
+               tPTY    *ret = PTY_Create(NULL, NULL, NULL, NULL, NULL);
                if( !ret )
                        return NULL;
                return &ret->ServerNode;
@@ -515,7 +542,7 @@ tVFS_Node *PTY_MkNod(tVFS_Node *Node, const char *Name, Uint Mode)
        // Otherwise return a named PTY
        // TODO: Should the request be for '<name>s' or just '<name>'   
 
-       tPTY    *ret = PTY_Create(Name, NULL, NULL, NULL);
+       tPTY    *ret = PTY_Create(Name, NULL, NULL, NULL, NULL);
        if(!ret)
                return NULL;
        return &ret->ServerNode;
@@ -575,7 +602,7 @@ size_t PTY_WriteClient(tVFS_Node *Node, off_t Offset, size_t Length, const void
        // Write to either FIFO or directly to output function
        if( pty->OutputFcn )
        {
-               pty->OutputFcn(pty->OutputHandle, Buffer, Length, pty->Mode.OutputMode);
+               pty->OutputFcn(pty->OutputHandle, Length, Buffer);
        }
        else
        {
@@ -598,7 +625,7 @@ int PTY_IOCtlClient(tVFS_Node *Node, int ID, void *Data)
        {
        case DRV_IOCTL_TYPE:    return DRV_TYPE_TERMINAL;
        case DRV_IOCTL_IDENT:   memcpy(Data, "PTY\0", 4);       return 0;
-       case DRV_IOCTL_VER:     return 0x100;
+       case DRV_IOCTL_VERSION: return 0x100;
        case DRV_IOCTL_LOOKUP:  return 0;
        
        case PTY_IOCTL_GETMODE:
@@ -624,7 +651,7 @@ void PTY_ReferenceClient(tVFS_Node *Node)
 {
        Node->ReferenceCount ++;
        // TODO: Add PID to list of client PIDs
-       Log_Notice("PTY", "TODO: List of client PIDs");
+//     Log_Notice("PTY", "ReferenceClient: TODO - List of client PIDs");
 }
 
 void PTY_CloseClient(tVFS_Node *Node)
@@ -633,6 +660,7 @@ void PTY_CloseClient(tVFS_Node *Node)
        Node->ReferenceCount --;
 
        // Remove PID from list
+       // TODO: Maintain list of client processes
 
        // Free structure if this was the last open handle
        if( Node->ReferenceCount == 0 && pty->ServerNode.ReferenceCount == 0 )
@@ -687,7 +715,7 @@ int PTY_IOCtlServer(tVFS_Node *Node, int ID, void *Data)
        {
        case DRV_IOCTL_TYPE:    return DRV_TYPE_TERMINAL;
        case DRV_IOCTL_IDENT:   memcpy(Data, "PTY\0", 4);       return 0;
-       case DRV_IOCTL_VER:     return 0x100;
+       case DRV_IOCTL_VERSION: return 0x100;
        case DRV_IOCTL_LOOKUP:  return 0;
        
        case PTY_IOCTL_GETMODE: