Usermode/init,login - Updated to new PTY code

diff --git a/Usermode/Applications/init_src/main.c b/Usermode/Applications/init_src/main.c
index 1cdf98b..b3740f3 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/VTerm/%i";
+       const char fmt[] = "/Devices/pts/vt%ic";
        char    path[sizeof(fmt)];
        
        snprintf(path, sizeof(path), fmt, Program->TypeInfo.KTerm.ID);

diff --git a/Usermode/Applications/login_src/main.c b/Usermode/Applications/login_src/main.c
index bc9013d..e151ff9 100644 (file)
--- a/Usermode/Applications/login_src/main.c
+++ b/Usermode/Applications/login_src/main.c
@@ -1,7 +1,9 @@
 /*
  * Acess 2 Login
+ * - By John Hodge (thePowersGang)
  */
 #include "header.h"
+#include <acess/devices/pty.h> // Enable/disable echo
 
 // === CONSTANTS ===
 #define BUFLEN 1024
@@ -70,6 +72,16 @@ char *_GetString(int bEcho)
         int    pos = 0;
        char    ch;
        
+       struct ptymode  mode;
+       const int       is_pty = (_SysIOCtl(0, DRV_IOCTL_TYPE, NULL) == DRV_TYPE_TERMINAL);
+
+       // Clear PTY echo
+       if( !bEcho && is_pty ) {
+               _SysIOCtl(0, PTY_IOCTL_GETMODE, &mode);
+               mode.InputMode &= ~PTYIMODE_ECHO;
+               _SysIOCtl(0, PTY_IOCTL_SETMODE, &mode);
+       }
+       
        // Read in text
        while( (ch = fgetc(stdin)) != -1 && ch != '\n' )
        {
@@ -91,18 +103,17 @@ char *_GetString(int bEcho)
                else
                        ret[pos++] = ch;
                
-               // Don't echo out to the screen
-               if( bEcho ) {
-                       fputc(ch, stdout);
-                       fflush(stdout);
-               }
-               
                if(pos == BUFLEN-1)     break;
        }
        
        ret[pos] = '\0';
+
+       // Re-set echo
+       if( !bEcho && is_pty ) {
+               mode.InputMode |= PTYIMODE_ECHO;
+               _SysIOCtl(0, PTY_IOCTL_SETMODE, &mode);
+       }
        
-       printf("\n");
        return strdup(ret);
 }