database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

5.3.4 merge

Browse Source
This commit is contained in:
Sergei Golubchik
2012-02-15 18:08:08 +01:00
parent 47a54a2e08 764eeeee74
commit 25609313ff
117 changed files with 4695 additions and 2204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libmysql/get_password.c
View File

@ -71,9 +71,9 @@ void get_tty_password_buff(const char *opt_message, char *to, size_t length)
_cputs(opt_message ? opt_message : "Enter password: ");
for (;;)
{
char tmp;
int tmp;
tmp=_getch();
if (tmp == '\b' || (int) tmp == 127)
if (tmp == '\b' || tmp == 127)
{
if (pos != to)
{
@ -82,15 +82,13 @@ void get_tty_password_buff(const char *opt_message, char *to, size_t length)
continue;
}
}
if (tmp == '\n' || tmp == '\r' || tmp == 3)
if (tmp == -1 || tmp == '\n' || tmp == '\r' || tmp == 3)
break;
if (iscntrl(tmp) || pos == end)
continue;
_cputs("*");
*(pos++) = tmp;
*(pos++) = (char)tmp;
}
while (pos != to && isspace(pos[-1]) == ' ')
pos--; /* Allow dummy space at end */
*pos=0;
_cputs("\n");
}
@ -137,8 +135,6 @@ static void get_password(char *to,uint length,int fd, my_bool echo)
}
*(pos++) = tmp;
}
while (pos != to && isspace(pos[-1]) == ' ')
pos--; /* Allow dummy space at end */
*pos=0;
return;
}