Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-26 06:08:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

2009-11-23 Joel Sherrill <joel.sherrill@oarcorp.com>

Browse Source 
* libmisc/shell/login_prompt.c: Properly process EOF and do not depend
	on ungetc() to propagate the status back.
This commit is contained in:
Joel Sherrill
2009-11-23 21:55:36 +00:00
parent 6e701e2cbf
commit 8a68b60f57
2 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cpukit/ChangeLog
View File

@@ -1,3 +1,8 @@
2009-11-23 Joel Sherrill <joel.sherrill@oarcorp.com>
* libmisc/shell/login_prompt.c: Properly process EOF and do not depend
on ungetc() to propagate the status back.
2009-11-23 Joel Sherrill <joel.sherrill@OARcorp.com>
* score/inline/rtems/score/thread.inl: Eliminate unused variable and

25
cpukit/libmisc/shell/login_prompt.c
View File

@@ -78,7 +78,7 @@ static int rtems_shell_discard( int c, FILE *stream)
return c;
}
static void rtems_shell_get_text(
static bool rtems_shell_get_text(
FILE *in,
FILE *out,
char *line,
@@ -93,7 +93,7 @@ static void rtems_shell_get_text(
size_t i = 0;
if (size < 1) {
return;
return false;
}
tcdrain( fd_in);
@@ -106,23 +106,12 @@ static void rtems_shell_get_text(
switch (c) {
case EOF:
/* Here comes an ugly hack: The Termios driver's read() handler returns
* 0 to the C library's fgets() if it times out. fgets() interprets
* this (correctly) as EOF, a condition we want to undo since it's not
* really true since we really have a read error (Termios bug?).
*
* As a workaround we push something back and read it again. This
* should simply reset the EOF condition.
*/
if (ungetc( '?', in) == '?') {
fgetc( in);
}
break;
return false;
case '\n':
case '\r':
put( '\n', out);
line [i] = '\0';
return;
return true;
case 127:
case '\b':
if (i > 0) {
@@ -181,12 +170,14 @@ bool rtems_shell_login_prompt(
fprintf( out, "%s login: ", device);
fflush( out);
rtems_shell_get_text( in, out, user, sizeof( user));
if ( !rtems_shell_get_text( in, out, user, sizeof( user)) )
break;
fflush( in);
fprintf( out, "Password: ");
fflush( out);
rtems_shell_get_text( in, NULL, passphrase, sizeof( passphrase));
if ( !rtems_shell_get_text( in, NULL, passphrase, sizeof( passphrase)) )
break;
fputc( '\n', out);
result = check( user, passphrase);