@@ -44,6 +44,7 @@ _prompt_for_password(char *username, char *password)
4444{
4545char buf [512 ];
4646int length ;
47+ int buflen ;
4748
4849#ifdef HAVE_TERMIOS_H
4950struct termios t_orig ,
@@ -57,15 +58,18 @@ _prompt_for_password(char *username, char *password)
5758{
5859fprintf (stderr ,"Username: " );
5960fflush (stderr );
60- fgets (username ,100 ,stdin );
61+ if (fgets (username ,100 ,stdin )== NULL )
62+ username [0 ]= '\0' ;
6163length = strlen (username );
62- /* skip rest of the line */
6364if (length > 0 && username [length - 1 ]!= '\n' )
6465{
66+ /* eat rest of the line */
6567do
6668{
67- fgets (buf ,512 ,stdin );
68- }while (buf [strlen (buf )- 1 ]!= '\n' );
69+ if (fgets (buf ,sizeof (buf ),stdin )== NULL )
70+ break ;
71+ buflen = strlen (buf );
72+ }while (buflen > 0 && buf [buflen - 1 ]!= '\n' );
6973}
7074if (length > 0 && username [length - 1 ]== '\n' )
7175username [length - 1 ]= '\0' ;
@@ -79,19 +83,22 @@ _prompt_for_password(char *username, char *password)
7983#endif
8084fprintf (stderr ,"Password: " );
8185fflush (stderr );
82- fgets (password ,100 ,stdin );
86+ if (fgets (password ,100 ,stdin )== NULL )
87+ password [0 ]= '\0' ;
8388#ifdef HAVE_TERMIOS_H
8489tcsetattr (0 ,TCSADRAIN ,& t_orig );
8590#endif
8691
8792length = strlen (password );
88- /* skip rest of the line */
8993if (length > 0 && password [length - 1 ]!= '\n' )
9094{
95+ /* eat rest of the line */
9196do
9297{
93- fgets (buf ,512 ,stdin );
94- }while (buf [strlen (buf )- 1 ]!= '\n' );
98+ if (fgets (buf ,sizeof (buf ),stdin )== NULL )
99+ break ;
100+ buflen = strlen (buf );
101+ }while (buflen > 0 && buf [buflen - 1 ]!= '\n' );
95102}
96103if (length > 0 && password [length - 1 ]== '\n' )
97104password [length - 1 ]= '\0' ;