mirror of
https://github.com/MariaDB/server.git
synced 2025-01-16 12:02:42 +01:00
034b44cb9f
BitKeeper/etc/logging_ok: auto-union scripts/make_win_src_distribution.old: Merge rename: scripts/make_win_src_distribution.sh -> scripts/make_win_src_distribution.old BUILD/compile-pentium-debug-max: Auto merged BitKeeper/deleted/.del-sel000001.result~383913ae4505ec86: Auto merged BitKeeper/deleted/.del-sel000001.test~9567c1646058cc: Auto merged Build-tools/Bootstrap: Auto merged Build-tools/Do-compile: Auto merged Docs/Makefile.am: Auto merged client/get_password.c: Auto merged client/mysql.cc: Auto merged client/mysqltest.c: Auto merged extra/perror.c: Auto merged include/config-win.h: Auto merged include/my_sys.h: Auto merged innobase/btr/btr0cur.c: Auto merged innobase/btr/btr0pcur.c: Auto merged innobase/buf/buf0buf.c: Auto merged innobase/buf/buf0flu.c: Auto merged innobase/dict/dict0dict.c: Auto merged innobase/dict/dict0load.c: Auto merged innobase/include/buf0buf.h: Auto merged innobase/include/log0recv.h: Auto merged innobase/include/row0sel.h: Auto merged innobase/include/srv0srv.h: Auto merged innobase/include/ut0mem.h: Auto merged innobase/lock/lock0lock.c: Auto merged innobase/log/log0log.c: Auto merged innobase/mem/mem0pool.c: Auto merged innobase/os/os0file.c: Auto merged innobase/row/row0mysql.c: Auto merged innobase/row/row0sel.c: Auto merged innobase/srv/srv0srv.c: Auto merged innobase/srv/srv0start.c: Auto merged innobase/trx/trx0sys.c: Auto merged innobase/trx/trx0trx.c: Auto merged innobase/ut/ut0mem.c: Auto merged innobase/ut/ut0ut.c: Auto merged myisam/ft_boolean_search.c: Auto merged myisam/mi_check.c: Auto merged myisam/mi_extra.c: Auto merged myisam/mi_key.c: Auto merged myisam/myisamdef.h: Auto merged myisammrg/myrg_queue.c: Auto merged mysql-test/mysql-test-run.sh: Auto merged mysql-test/r/ctype_latin1_de.result: Auto merged mysql-test/r/flush.result: Auto merged mysql-test/r/func_time.result: Auto merged mysql-test/r/grant_cache.result: Auto merged mysql-test/r/join.result: Auto merged mysql-test/r/join_outer.result: Auto merged mysql-test/r/range.result: Auto merged mysql-test/r/rpl000018.result: Auto merged mysql-test/r/rpl_insert_id.result: Auto merged mysql-test/r/rpl_master_pos_wait.result: Auto merged mysql-test/r/rpl_relayspace.result: Auto merged mysql-test/r/select_safe.result: Auto merged mysql-test/r/symlink.result: Auto merged mysql-test/r/type_date.result: Auto merged mysql-test/r/type_datetime.result: Auto merged mysql-test/t/alias.test: Auto merged mysql-test/t/ctype_latin1_de.test: Auto merged mysql-test/t/fulltext_left_join.test: Auto merged mysql-test/t/func_time.test: Auto merged mysql-test/t/handler.test: Auto merged mysql-test/t/heap.test: Auto merged mysql-test/t/join.test: Auto merged mysql-test/t/join_outer.test: Auto merged mysql-test/t/order_by.test: Auto merged mysql-test/t/range.test: Auto merged mysql-test/t/rpl000001.test: Auto merged mysql-test/t/rpl000018.test: Auto merged mysql-test/t/rpl_insert_id.test: Auto merged mysql-test/t/sel000100.test: Auto merged mysql-test/t/select_safe.test: Auto merged mysql-test/t/type_date.test: Auto merged mysql-test/t/type_datetime.test: Auto merged mysql-test/t/user_var.test: Auto merged mysys/default.c: Auto merged mysys/mf_format.c: Auto merged mysys/my_getopt.c: Auto merged mysys/thr_lock.c: Auto merged mysys/tree.c: Auto merged scripts/Makefile.am: Auto merged scripts/mysql_install_db.sh: Auto merged scripts/mysqld_safe.sh: Auto merged sql/Makefile.am: Auto merged sql/field_conv.cc: Auto merged sql/ha_innodb.h: Auto merged sql/ha_myisam.cc: Auto merged sql/ha_myisammrg.h: Auto merged sql/handler.cc: Auto merged sql/handler.h: Auto merged sql/item.h: Auto merged sql/item_func.cc: Auto merged sql/item_timefunc.cc: Auto merged sql/net_serv.cc: Auto merged sql/nt_servc.cc: Auto merged sql/opt_range.cc: Auto merged sql/sql_base.cc: Auto merged sql/sql_cache.h: Auto merged sql/sql_db.cc: Auto merged sql/sql_delete.cc: Auto merged sql/sql_insert.cc: Auto merged sql/sql_list.h: Auto merged sql/sql_load.cc: Auto merged sql/sql_rename.cc: Auto merged sql/sql_repl.h: Auto merged sql/sql_update.cc: Auto merged sql/table.cc: Auto merged sql/table.h: Auto merged sql/uniques.cc: Auto merged support-files/mysql.spec.sh: Auto merged vio/viosocket.c: Auto merged BitKeeper/deleted/.del-ctype-latin1_de.c~c5d8f9208bceb98e: merge BitKeeper/deleted/.del-mini_client.cc~8677895ec8169183: merge acinclude.m4: Merge with 4.0 (openssl patch) client/mysqlbinlog.cc: Merge with 4.0 in which we had added code from 4.1 (We are basicly only using the 4.1 code here) configure.in: Keep 4.1 file heap/hp_open.c: merge with 4.0 include/my_base.h: merge with 4.0 include/my_global.h: merge with 4.0 include/mysqld_error.h: merge with 4.0 innobase/ha/ha0ha.c: merge with 4.0 (Code should be same but we use indentaion from 4.0) innobase/log/log0recv.c: merge with 4.0 libmysql/libmysql.c: Remove with 4.0 code that was ported from 4.1 libmysqld/lib_sql.cc: merge with 4.0 myisam/mi_open.c: Remove 4.0 specific code myisam/myisamchk.c: merge with 4.0 myisammrg/myrg_rkey.c: merge with 4.0 mysql-test/r/alter_table.result: May need to be fixed after merge mysql-test/r/create.result: May need to be fixed after merge mysql-test/r/distinct.result: May need to be fixed after merge mysql-test/r/drop.result: May need to be fixed after merge mysql-test/r/fulltext.result: May need to be fixed after merge mysql-test/r/func_set.result: May need to be fixed after merge mysql-test/r/func_str.result: May need to be fixed after merge mysql-test/r/func_test.result: May need to be fixed after merge mysql-test/r/grant.result: May need to be fixed after merge mysql-test/r/group_by.result: May need to be fixed after merge mysql-test/r/handler.result: May need to be fixed after merge mysql-test/r/heap.result: May need to be fixed after merge mysql-test/r/innodb.result: May need to be fixed after merge mysql-test/r/insert.result: May need to be fixed after merge mysql-test/r/insert_select.result: May need to be fixed after merge mysql-test/r/key_diff.result: May need to be fixed after merge mysql-test/r/merge.result: May need to be fixed after merge mysql-test/r/myisam.result: May need to be fixed after merge mysql-test/r/order_by.result: May need to be fixed after merge mysql-test/r/query_cache.result: May need to be fixed after merge mysql-test/r/rpl_flush_log_loop.result: May need to be fixed after merge mysql-test/r/rpl_loaddata.result: May need to be fixed after merge mysql-test/r/rpl_log.result: May need to be fixed after merge mysql-test/r/rpl_log_pos.result: May need to be fixed after merge mysql-test/r/rpl_rotate_logs.result: May need to be fixed after merge mysql-test/r/select.result: May need to be fixed after merge mysql-test/r/union.result: May need to be fixed after merge mysql-test/r/user_var.result: May need to be fixed after merge mysql-test/t/alter_table.test: merge with 4.0 mysql-test/t/create.test: merge with 4.0 mysql-test/t/distinct.test: merge with 4.0 mysql-test/t/drop.test: merge with 4.0 mysql-test/t/flush.test: merge with 4.0 mysql-test/t/fulltext.test: merge with 4.0 mysql-test/t/func_set.test: merge with 4.0 mysql-test/t/func_str.test: merge with 4.0 mysql-test/t/func_test.test: merge with 4.0 mysql-test/t/grant.test: merge with 4.0 mysql-test/t/grant_cache.test: merge with 4.0 mysql-test/t/innodb.test: Add back EXPLAIN and SHOW KEYS statements, but make them independent of number of rows returned by InnoDB mysql-test/t/insert.test: merge with 4.0 mysql-test/t/insert_select.test: merge with 4.0 mysql-test/t/merge.test: merge with 4.0 mysql-test/t/query_cache.test: merge with 4.0 mysql-test/t/rpl_flush_log_loop.test: merge with 4.0 mysql-test/t/rpl_loaddata.test: merge with 4.0 mysql-test/t/rpl_rotate_logs.test: merge with 4.0 mysql-test/t/select.test: merge with 4.0 mysql-test/t/symlink.test: merge with 4.0 mysql-test/t/union.test: merge with 4.0 mysys/charset.c: merge with 4.0 scripts/mysql_fix_privilege_tables.sh: merge with 4.0 (Add quoting for some variables) sql/field.h: merge with 4.0 sql/ha_innodb.cc: merge with 4.0 sql/item_cmpfunc.cc: merge with 4.0 sql/item_cmpfunc.h: merge with 4.0 sql/item_func.h: merge with 4.0 sql/item_strfunc.cc: merge with 4.0 Fixed null handling with ELT() sql/item_timefunc.h: merge with 4.0 sql/lex.h: merge with 4.0 sql/log.cc: merge with 4.0 sql/log_event.cc: Merge with 4.0 Cleanups: - Indentation - #endif comments - Replace strmov() with *pos++= for two byte strings - Moved variable declarations to start of functions - Merged identical code (LOAD_EVENT) - Added casts when subtracting pointers Did a full diff between this and 4.0 to ensure that the file is correct after merge. sql/log_event.h: merge with 4.0 sql/mysql_priv.h: merge with 4.0 sql/mysqld.cc: merge with 4.0 sql/repl_failsafe.cc: merge with 4.0 sql/set_var.cc: merge with 4.0 sql/set_var.h: merge with 4.0 sql/share/czech/errmsg.txt: merge with 4.0 sql/share/danish/errmsg.txt: merge with 4.0 sql/share/dutch/errmsg.txt: merge with 4.0 sql/share/english/errmsg.txt: merge with 4.0 sql/share/estonian/errmsg.txt: merge with 4.0 sql/share/french/errmsg.txt: merge with 4.0 sql/share/german/errmsg.txt: merge with 4.0 sql/share/greek/errmsg.txt: merge with 4.0 sql/share/hungarian/errmsg.txt: merge with 4.0 sql/share/italian/errmsg.txt: merge with 4.0 sql/share/japanese/errmsg.txt: merge with 4.0 sql/share/korean/errmsg.txt: merge with 4.0 sql/share/norwegian-ny/errmsg.txt: merge with 4.0 sql/share/norwegian/errmsg.txt: merge with 4.0 sql/share/polish/errmsg.txt: merge with 4.0 sql/share/portuguese/errmsg.txt: merge with 4.0 sql/share/romanian/errmsg.txt: merge with 4.0 sql/share/russian/errmsg.txt: merge with 4.0 sql/share/slovak/errmsg.txt: merge with 4.0 sql/share/spanish/errmsg.txt: merge with 4.0 sql/share/swedish/errmsg.txt: merge with 4.0 sql/share/ukrainian/errmsg.txt: merge with 4.0 sql/slave.cc: Merge + some indentation fixes sql/slave.h: merge with 4.0 sql/sql_acl.cc: merge with 4.0 Some end space removal to make it easier to do future merges sql/sql_acl.h: merge with 4.0 sql/sql_cache.cc: merge with 4.0 sql/sql_class.h: merge with 4.0 sql/sql_handler.cc: merge with 4.0 sql/sql_lex.cc: merge with 4.0 sql/sql_lex.h: merge with 4.0 sql/sql_parse.cc: merge with 4.0 sql/sql_repl.cc: merge with 4.0 sql/sql_select.cc: merge with 4.0 sql/sql_table.cc: merge with 4.0 sql/sql_union.cc: Merge with 4.0 Note that I couldn't find out how to merge OPTION_FOUND_ROWS handling so this has to be fixed later sql/sql_yacc.yy: merge with 4.0 Removed end space to make merge easier vio/Makefile.am: merge with 4.0
212 lines
4.9 KiB
C
212 lines
4.9 KiB
C
/* Copyright (C) 2000 MySQL AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program 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 General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; 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>
|
|
|
|
#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");
|
|
_cputs(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",stderr);
|
|
fflush(stderr);
|
|
}
|
|
pos--;
|
|
continue;
|
|
}
|
|
}
|
|
if (tmp == '\n' || tmp == '\r' || tmp == 3)
|
|
break;
|
|
if (iscntrl(tmp) || pos == end)
|
|
continue;
|
|
if (echo)
|
|
{
|
|
fputc('*',stderr);
|
|
fflush(stderr);
|
|
}
|
|
*(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(stderr)))
|
|
{
|
|
fputs(opt_message ? opt_message : "Enter password: ",stderr);
|
|
fflush(stderr);
|
|
}
|
|
#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(stderr)));
|
|
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(stderr)));
|
|
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(stderr)));
|
|
stty(fileno(stdin), &org);
|
|
#endif
|
|
if (isatty(fileno(stderr)))
|
|
fputc('\n',stderr);
|
|
#endif /* HAVE_GETPASS */
|
|
|
|
DBUG_RETURN(my_strdup(buff,MYF(MY_FAE)));
|
|
}
|
|
|
|
#endif /*__WIN__*/
|