mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 12:32:27 +01:00
16115af97c
Fixed problem with LIKE with latin1_de Added parsing support of UNSIGNED LONG LONG Docs/manual.texi: Changelog client/client_priv.h: Changed to use my_global.h client/completion_hash.cc: Changed to use my_global.h client/errmsg.c: Changed to use my_global.h client/get_password.c: Changed to use my_global.h client/mysqldump.c: Changed to use my_global.h client/mysqlshow.c: Changed to use my_global.h client/mysqltest.c: Changed to use my_global.h client/password.c: Changed to use my_global.h client/readline.cc: Changed to use my_global.h client/sql_string.cc: Changed to use my_global.h client/thimble.cc: Changed to use my_global.h client/thread_test.c: Changed to use my_global.h dbug/dbug.c: Changed to use my_global.h dbug/dbug_analyze.c: Changed to use my_global.h dbug/example1.c: Changed to use my_global.h dbug/example2.c: Changed to use my_global.h dbug/example3.c: Changed to use my_global.h dbug/factorial.c: Changed to use my_global.h dbug/main.c: Changed to use my_global.h dbug/sanity.c: Changed to use my_global.h extra/comp_err.c: Changed to use my_global.h extra/my_print_defaults.c: Changed to use my_global.h extra/perror.c: Changed to use my_global.h extra/replace.c: Changed to use my_global.h extra/resolve_stack_dump.c: Changed to use my_global.h extra/resolveip.c: Changed to use my_global.h fs/libmysqlfs.h: Changed to use my_global.h fs/mysqlcorbafs.h: Changed to use my_global.h heap/hp_test1.c: Changed to use my_global.h include/Makefile.am: Changed to use my_global.h include/m_ctype.h: Changed to use my_global.h include/my_base.h: Changed to use my_global.h innobase/include/univ.i: Changed to use my_global.h libmysql/dll.c: Changed to use my_global.h libmysql/errmsg.c: Changed to use my_global.h libmysql/get_password.c: Changed to use my_global.h libmysql/libmysql.c: Changed to use my_global.h libmysql/net.c: Changed to use my_global.h libmysql/password.c: Changed to use my_global.h libmysqld/lib_sql.cc: Changed to use my_global.h libmysqld/lib_vio.c: Changed to use my_global.h libmysqld/libmysqld.c: Changed to use my_global.h mysql-test/mysql-test-run.sh: Changed to use latin1 as default character set mysql-test/r/ctype_latin1_de.result: Changed to use my_global.h mysql-test/r/func_like.result: New test mysql-test/t/ctype_latin1_de.test: Added test of part keys mysql-test/t/func_like.test: New test mysys/checksum.c: Changed to use my_global.h mysys/getopt.c: Changed to use my_global.h mysys/getopt1.c: Changed to use my_global.h mysys/make-conf.c: Changed to use my_global.h mysys/my_alloc.c: Changed to use my_global.h mysys/my_clock.c: Changed to use my_global.h mysys/my_compress.c: Changed to use my_global.h mysys/mysys_priv.h: Changed to use my_global.h mysys/test_charset.c: Changed to use my_global.h mysys/testhash.c: Changed to use my_global.h mysys/thr_alarm.c: Changed to use my_global.h mysys/thr_mutex.c: Changed to use my_global.h regex/debug.c: Changed to use my_global.h regex/main.c: Changed to use my_global.h regex/regcomp.c: Changed to use my_global.h regex/regerror.c: Changed to use my_global.h regex/regexec.c: Changed to use my_global.h regex/regexp.c: Changed to use my_global.h regex/regfree.c: Changed to use my_global.h regex/reginit.c: Changed to use my_global.h sql/cache_manager.cc: Changed to use my_global.h sql/gen_lex_hash.cc: Changed to use my_global.h sql/ha_berkeley.cc: Fixed problem with UNIQUE keys that could contain NULL sql/ha_gemini.h: Changed to use my_global.h sql/handler.cc: Fixed problem after merge sql/item.cc: Added Item_unit sql/item.h: Added Item_uint sql/matherr.c: Changed to use my_global.h sql/md5.c: Changed to use my_global.h sql/mini_client.cc: Changed to use my_global.h sql/my_lock.c: Changed to use my_global.h sql/mysql_priv.h: Changed to use my_global.h sql/net_serv.cc: Changed to use my_global.h sql/password.c: Changed to use my_global.h sql/sql_lex.cc: Added parsing support of UNSIGNED LONG LONG sql/sql_show.cc: Changed to use my_global.h sql/sql_string.cc: Changed to use my_global.h sql/sql_yacc.yy: Added usage of Int_uint sql/stacktrace.c: Changed to use my_global.h sql/udf_example.cc: Changed to use my_global.h strings/atof.c: Changed to use my_global.h strings/bchange.c: Changed to use my_global.h strings/bcmp.c: Changed to use my_global.h strings/bfill.c: Changed to use my_global.h strings/bmove.c: Changed to use my_global.h strings/bmove512.c: Changed to use my_global.h strings/bmove_upp.c: Changed to use my_global.h strings/ctype-big5.c: Changed to use my_global.h strings/ctype-czech.c: Changed to use my_global.h strings/ctype-euc_kr.c: Changed to use my_global.h strings/ctype-gb2312.c: Changed to use my_global.h strings/ctype-gbk.c: Changed to use my_global.h strings/ctype-latin1_de.c: Fixed problem with LIKE strings/ctype-sjis.c: Changed to use my_global.h strings/ctype-tis620.c: Changed to use my_global.h strings/ctype-ujis.c: Changed to use my_global.h strings/ctype.c: Changed to use my_global.h strings/do_ctype.c: Changed to use my_global.h strings/int2str.c: Changed to use my_global.h strings/is_prefix.c: Changed to use my_global.h strings/llstr.c: Changed to use my_global.h strings/longlong2str.c: Changed to use my_global.h strings/r_strinstr.c: Changed to use my_global.h strings/str2int.c: Changed to use my_global.h strings/str_test.c: Changed to use my_global.h strings/strappend.c: Changed to use my_global.h strings/strcend.c: Changed to use my_global.h strings/strcont.c: Changed to use my_global.h strings/strend.c: Changed to use my_global.h strings/strfill.c: Changed to use my_global.h strings/strings-not-used.h: Changed to use my_global.h strings/strinstr.c: Changed to use my_global.h strings/strmake.c: Changed to use my_global.h strings/strmov.c: Changed to use my_global.h strings/strnlen.c: Changed to use my_global.h strings/strnmov.c: Changed to use my_global.h strings/strstr.c: Changed to use my_global.h strings/strto.c: Changed to use my_global.h strings/strtol.c: Changed to use my_global.h strings/strtoll.c: Changed to use my_global.h strings/strtoul.c: Changed to use my_global.h strings/strtoull.c: Changed to use my_global.h strings/strxmov.c: Changed to use my_global.h strings/strxnmov.c: Changed to use my_global.h strings/udiv.c: Changed to use my_global.h tools/mysqlmanager.c: Changed to use my_global.h vio/test-ssl.c: Changed to use my_global.h vio/test-sslclient.c: Changed to use my_global.h vio/test-sslserver.c: Changed to use my_global.h vio/test-ssl: Changed to use my_global.h vio/vio.c: Changed to use my_global.h vio/viosocket.c: Changed to use my_global.h vio/viossl.c: Changed to use my_global.h vio/viosslfactories.c: Changed to use my_global.h vio/viotest-ssl.c: Changed to use my_global.h
214 lines
5 KiB
C
214 lines
5 KiB
C
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
|
|
|
This library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Library General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2 of the License, or (at your option) any later version.
|
|
|
|
This library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with this library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
|
|
MA 02111-1307, USA */
|
|
|
|
/*
|
|
** Ask for a password from tty
|
|
** This is an own file to avoid conflicts with curses
|
|
*/
|
|
#include <my_global.h>
|
|
#include <my_sys.h>
|
|
#include "mysql.h"
|
|
#include <m_string.h>
|
|
#include <m_ctype.h>
|
|
#include <dbug.h>
|
|
|
|
#if defined(HAVE_BROKEN_GETPASS) && !defined(HAVE_GETPASSPHRASE)
|
|
#undef HAVE_GETPASS
|
|
#endif
|
|
|
|
#ifdef HAVE_GETPASS
|
|
#ifdef HAVE_PWD_H
|
|
#include <pwd.h>
|
|
#endif /* HAVE_PWD_H */
|
|
#else /* ! HAVE_GETPASS */
|
|
#ifndef __WIN__
|
|
#include <sys/ioctl.h>
|
|
#ifdef HAVE_TERMIOS_H /* For tty-password */
|
|
#include <termios.h>
|
|
#define TERMIO struct termios
|
|
#else
|
|
#ifdef HAVE_TERMIO_H /* For tty-password */
|
|
#include <termio.h>
|
|
#define TERMIO struct termio
|
|
#else
|
|
#include <sgtty.h>
|
|
#define TERMIO struct sgttyb
|
|
#endif
|
|
#endif
|
|
#ifdef alpha_linux_port
|
|
#include <asm/ioctls.h> /* QQ; Fix this in configure */
|
|
#include <asm/termiobits.h>
|
|
#endif
|
|
#else
|
|
#include <conio.h>
|
|
#endif /* __WIN__ */
|
|
#endif /* HAVE_GETPASS */
|
|
|
|
#ifdef HAVE_GETPASSPHRASE /* For Solaris */
|
|
#define getpass(A) getpassphrase(A)
|
|
#endif
|
|
|
|
#ifdef __WIN__
|
|
/* were just going to fake it here and get input from
|
|
the keyboard */
|
|
|
|
char *get_tty_password(char *opt_message)
|
|
{
|
|
char to[80];
|
|
char *pos=to,*end=to+sizeof(to)-1;
|
|
int i=0;
|
|
DBUG_ENTER("get_tty_password");
|
|
fprintf(stdout,opt_message ? opt_message : "Enter password: ");
|
|
for (;;)
|
|
{
|
|
char tmp;
|
|
tmp=_getch();
|
|
if (tmp == '\b' || (int) tmp == 127)
|
|
{
|
|
if (pos != to)
|
|
{
|
|
_cputs("\b \b");
|
|
pos--;
|
|
continue;
|
|
}
|
|
}
|
|
if (tmp == '\n' || tmp == '\r' || tmp == 3)
|
|
break;
|
|
if (iscntrl(tmp) || pos == end)
|
|
continue;
|
|
_cputs("*");
|
|
*(pos++) = tmp;
|
|
}
|
|
while (pos != to && isspace(pos[-1]) == ' ')
|
|
pos--; /* Allow dummy space at end */
|
|
*pos=0;
|
|
_cputs("\n");
|
|
DBUG_RETURN(my_strdup(to,MYF(MY_FAE)));
|
|
}
|
|
|
|
#else
|
|
|
|
|
|
#ifndef HAVE_GETPASS
|
|
/*
|
|
** Can't use fgets, because readline will get confused
|
|
** length is max number of chars in to, not counting \0
|
|
* to will not include the eol characters.
|
|
*/
|
|
|
|
static void get_password(char *to,uint length,int fd,bool echo)
|
|
{
|
|
char *pos=to,*end=to+length;
|
|
|
|
for (;;)
|
|
{
|
|
char tmp;
|
|
if (my_read(fd,&tmp,1,MYF(0)) != 1)
|
|
break;
|
|
if (tmp == '\b' || (int) tmp == 127)
|
|
{
|
|
if (pos != to)
|
|
{
|
|
if (echo)
|
|
{
|
|
fputs("\b \b",stdout);
|
|
fflush(stdout);
|
|
}
|
|
pos--;
|
|
continue;
|
|
}
|
|
}
|
|
if (tmp == '\n' || tmp == '\r' || tmp == 3)
|
|
break;
|
|
if (iscntrl(tmp) || pos == end)
|
|
continue;
|
|
if (echo)
|
|
{
|
|
fputc('*',stdout);
|
|
fflush(stdout);
|
|
}
|
|
*(pos++) = tmp;
|
|
}
|
|
while (pos != to && isspace(pos[-1]) == ' ')
|
|
pos--; /* Allow dummy space at end */
|
|
*pos=0;
|
|
return;
|
|
}
|
|
|
|
#endif /* ! HAVE_GETPASS */
|
|
|
|
|
|
char *get_tty_password(char *opt_message)
|
|
{
|
|
#ifdef HAVE_GETPASS
|
|
char *passbuff;
|
|
#else /* ! HAVE_GETPASS */
|
|
TERMIO org,tmp;
|
|
#endif /* HAVE_GETPASS */
|
|
char buff[80];
|
|
|
|
DBUG_ENTER("get_tty_password");
|
|
|
|
#ifdef HAVE_GETPASS
|
|
passbuff = getpass(opt_message ? opt_message : "Enter password: ");
|
|
|
|
/* copy the password to buff and clear original (static) buffer */
|
|
strnmov(buff, passbuff, sizeof(buff) - 1);
|
|
#ifdef _PASSWORD_LEN
|
|
memset(passbuff, 0, _PASSWORD_LEN);
|
|
#endif
|
|
#else
|
|
if (isatty(fileno(stdout)))
|
|
{
|
|
fputs(opt_message ? opt_message : "Enter password: ",stdout);
|
|
fflush(stdout);
|
|
}
|
|
#if defined(HAVE_TERMIOS_H)
|
|
tcgetattr(fileno(stdin), &org);
|
|
tmp = org;
|
|
tmp.c_lflag &= ~(ECHO | ISIG | ICANON);
|
|
tmp.c_cc[VMIN] = 1;
|
|
tmp.c_cc[VTIME] = 0;
|
|
tcsetattr(fileno(stdin), TCSADRAIN, &tmp);
|
|
get_password(buff, sizeof(buff)-1, fileno(stdin), isatty(fileno(stdout)));
|
|
tcsetattr(fileno(stdin), TCSADRAIN, &org);
|
|
#elif defined(HAVE_TERMIO_H)
|
|
ioctl(fileno(stdin), (int) TCGETA, &org);
|
|
tmp=org;
|
|
tmp.c_lflag &= ~(ECHO | ISIG | ICANON);
|
|
tmp.c_cc[VMIN] = 1;
|
|
tmp.c_cc[VTIME]= 0;
|
|
ioctl(fileno(stdin),(int) TCSETA, &tmp);
|
|
get_password(buff,sizeof(buff)-1,fileno(stdin),isatty(fileno(stdout)));
|
|
ioctl(fileno(stdin),(int) TCSETA, &org);
|
|
#else
|
|
gtty(fileno(stdin), &org);
|
|
tmp=org;
|
|
tmp.sg_flags &= ~ECHO;
|
|
tmp.sg_flags |= RAW;
|
|
stty(fileno(stdin), &tmp);
|
|
get_password(buff,sizeof(buff)-1,fileno(stdin),isatty(fileno(stdout)));
|
|
stty(fileno(stdin), &org);
|
|
#endif
|
|
if (isatty(fileno(stdout)))
|
|
fputc('\n',stdout);
|
|
#endif /* HAVE_GETPASS */
|
|
|
|
DBUG_RETURN(my_strdup(buff,MYF(MY_FAE)));
|
|
}
|
|
|
|
#endif /*__WIN__*/
|