Usermode/login - Slight cleanup

[tpg/acess2.git] / Usermode / Applications / login_src / main.c

diff --git a/Usermode/Applications/login_src/main.c b/Usermode/Applications/login_src/main.c
index bc9013d..86b1884 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
@@ -27,9 +29,12 @@ int main(int argc, char *argv[])
                for(;;)
                {
                        sUsername = GetUsername();
-                       if(!sUsername)  continue;
+                       if(!sUsername || !sUsername[0]) continue;
                        sPassword = GetPassword();
-                       if(!sPassword)  continue;
+                       if(!sPassword) {
+                               free(sUsername);
+                               continue;
+                       }
                        if( (uid = ValidateUser(sUsername, sPassword)) == -1 )
                        {
                                printf("\nInvalid username or password\n");
@@ -59,6 +64,11 @@ int main(int argc, char *argv[])
                
                // Wait for child to terminate
                _SysWaitTID(pid, &status);
+       
+               // Clear graphics mode  
+               struct ptymode  mode = {.InputMode = PTYIMODE_ECHO|PTYIMODE_CANON,.OutputMode=0};
+               _SysIOCtl(0, PTY_IOCTL_SETMODE, &mode);
+               fprintf(stderr, "\x1b[R");
        }
        
        return 0;
@@ -70,6 +80,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 +111,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';
-       
-       printf("\n");
+
+       // Re-set echo
+       if( !bEcho && is_pty ) {
+               mode.InputMode |= PTYIMODE_ECHO;
+               _SysIOCtl(0, PTY_IOCTL_SETMODE, &mode);
+       }
+
        return strdup(ret);
 }