mirror of
https://github.com/MariaDB/server.git
synced 2025-01-18 04:53:01 +01:00
14decc4fbc
(Mostly in DBUG_PRINT() and unused arguments) Fixed bug in query cache when used with traceing (--with-debug) Fixed memory leak in mysqldump Removed warnings from mysqltest scripts (replaced -- with #) BitKeeper/etc/ignore: added mysql-test/r/*.warnings BUILD/SETUP.sh: Don't build with BDB as default client/client_priv.h: Added OPT_DEBUG_INFO client/mysqlbinlog.cc: Fixed compiler warning client/mysqldump.c: Removed compiler warnings Added option --debug-info to detect memory leaks Fixed memory leak Don't backup cluster replication tables (if used with 5.1) cmd-line-utils/readline/bind.c: Fixed compiler warning cmd-line-utils/readline/chardefs.h: Fixed compiler warning cmd-line-utils/readline/complete.c: Fixed compiler warning cmd-line-utils/readline/display.c: Fixed compiler warning cmd-line-utils/readline/histexpand.c: Fixed compiler warning cmd-line-utils/readline/input.c: Fixed compiler warning cmd-line-utils/readline/isearch.c: Fixed compiler warning cmd-line-utils/readline/kill.c: Fixed compiler warning cmd-line-utils/readline/macro.c: Fixed compiler warning cmd-line-utils/readline/misc.c: Fixed compiler warning cmd-line-utils/readline/nls.c: Fixed compiler warning cmd-line-utils/readline/readline.c: Fixed compiler warning cmd-line-utils/readline/rltty.c: Fixed compiler warning cmd-line-utils/readline/search.c: Fixed compiler warning cmd-line-utils/readline/terminal.c: Fixed compiler warning cmd-line-utils/readline/text.c: Fixed compiler warning cmd-line-utils/readline/tilde.c: Fixed compiler warning cmd-line-utils/readline/undo.c: Fixed compiler warning cmd-line-utils/readline/util.c: Fixed compiler warning cmd-line-utils/readline/vi_mode.c: Fixed compiler warning dbug/dbug_analyze.c: Fixed compiler warning extra/yassl/src/ssl.cpp: Fixed compiler warning extra/yassl/testsuite/testsuite.cpp: Fixed compiler warning heap/_check.c: Fixed compiler warning heap/hp_delete.c: Fixed compiler warning heap/hp_hash.c: Fixed compiler warning heap/hp_open.c: Fixed compiler warning heap/hp_rkey.c: Fixed compiler warning heap/hp_rrnd.c: Fixed compiler warning heap/hp_write.c: Fixed compiler warning libmysql/libmysql.c: Fixed compiler warning libmysqld/libmysqld.c: Fixed compiler warning myisam/mi_close.c: Fixed compiler warning myisam/mi_delete.c: Fixed compiler warning myisam/mi_dynrec.c: Fixed compiler warning myisam/mi_keycache.c: Fixed compiler warning myisam/mi_page.c: Fixed compiler warning myisam/mi_statrec.c: Fixed compiler warning myisam/mi_test2.c: Fixed compiler warning myisam/mi_write.c: Fixed compiler warning myisam/myisampack.c: Fixed compiler warning myisammrg/myrg_extra.c: Fixed compiler warning mysql-test/mysql-test-run.pl: Remove .reject, .progress, .log and .warnings flag at start cluster -> mysql database (for 5.1) mysql-test/include/federated.inc: Remove mysqltest warnings mysql-test/include/sp-vars.inc: Remove mysqltest warnings mysql-test/mysql-test-run.sh: Fix so that 'make test' works again Remove .reject, .progress .log and .warnings files at startup mysql-test/r/ctype_cp1250_ch.result: Drop used tables at startup mysql-test/t/create.test: Remove mysqltest warnings mysql-test/t/csv.test: Remove mysqltest warnings mysql-test/t/ctype_collate.test: Remove mysqltest warnings mysql-test/t/ctype_cp1250_ch.test: Drop used tables at startup mysql-test/t/ctype_ucs.test: Remove mysqltest warnings mysql-test/t/func_sapdb.test: Remove mysqltest warnings mysql-test/t/func_str.test: Remove mysqltest warnings mysql-test/t/grant.test: Remove mysqltest warnings mysql-test/t/greedy_optimizer.test: Remove mysqltest warnings mysql-test/t/group_min_max.test: Remove mysqltest warnings mysql-test/t/innodb.test: Remove mysqltest warnings mysql-test/t/join.test: Remove mysqltest warnings mysql-test/t/limit.test: Remove mysqltest warnings mysql-test/t/null.test: Remove mysqltest warnings mysql-test/t/select.test: Remove mysqltest warnings mysql-test/t/sp-prelocking.test: Remove mysqltest warnings mysql-test/t/strict.test: Remove mysqltest warnings mysql-test/t/subselect.test: Remove mysqltest warnings mysql-test/t/type_newdecimal.test: Remove mysqltest warnings mysql-test/t/view_grant.test: Remove mysqltest warnings mysys/default.c: Fixed compiler warning mysys/hash.c: Fixed compiler warning mysys/list.c: Fixed compiler warning mysys/mf_iocache.c: Fixed compiler warning mysys/mf_keycache.c: Fixed compiler warning mysys/mf_keycaches.c: Fixed compiler warning mysys/my_alloc.c: Fixed compiler warning mysys/my_dup.c: Fixed compiler warning mysys/my_fopen.c: Fixed compiler warning mysys/my_fstream.c: Fixed compiler warning mysys/my_getwd.c: Fixed compiler warning mysys/my_handler.c: Fixed compiler warning Added missing enums in switch mysys/my_lib.c: Fixed compiler warning mysys/my_lread.c: Fixed compiler warning mysys/my_lwrite.c: Fixed compiler warning mysys/my_malloc.c: Fixed compiler warning mysys/my_pread.c: Fixed compiler warning mysys/my_read.c: Fixed compiler warning mysys/my_realloc.c: Fixed compiler warning mysys/my_seek.c: Fixed compiler warning mysys/my_write.c: Fixed compiler warning mysys/safemalloc.c: Fixed compiler warning mysys/thr_lock.c: Fixed compiler warning mysys/tree.c: Fixed compiler warning mysys/typelib.c: Fixed compiler warning ndb/include/logger/LogHandler.hpp: Changed SetErrorStr() to take const char* to remove compiler warnings (as many arguments to this are const strings) ndb/include/ndb_global.h.in: Added LINT_SET_PTR macro to be able to remove some compiler warnings ndb/include/util/InputStream.hpp: Fixed compiler warning ndb/include/util/OutputStream.hpp: Fixed compiler warning ndb/include/util/SimpleProperties.hpp: Fixed compiler warning ndb/src/common/debugger/EventLogger.cpp: remove if on 'signal' as this is a function pointer and is always true ndb/src/common/debugger/signaldata/BackupSignalData.cpp: Add missing enums ndb/src/common/logger/LogHandler.cpp: Changed SetErrorStr() to take const char* to remove compiler warnings (as many arguments to this are const strings) ndb/src/common/portlib/NdbMutex.c: Fixed compiler warning ndb/src/common/portlib/NdbThread.c: Fixed compiler warning ndb/src/common/transporter/Transporter.cpp: Swapped arguments to remove compiler warnings ndb/src/cw/cpcd/CPCD.hpp: Fixed compiler warning ndb/src/kernel/blocks/backup/Backup.cpp: Fixed compiler warning ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp: Fixed compiler warning ndb/src/kernel/blocks/dbdict/Dbdict.cpp: Fixed compiler warning ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp: Fixed compiler warning ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Added missing enums ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: Fixed compiler warning ndb/src/kernel/error/ErrorReporter.cpp: Fixed compiler warning ndb/src/kernel/error/ErrorReporter.hpp: Fixed compiler warning ndb/src/kernel/error/ndbd_exit_codes.c: Fixed compiler warning ndb/src/kernel/vm/TransporterCallback.cpp: Fixed compiler warning ndb/src/mgmapi/mgmapi.cpp: Fixed compiler warning ndb/src/mgmclient/CommandInterpreter.cpp: Fixed compiler warning ndb/src/mgmsrv/MgmtSrvr.cpp: Fixed compiler warning ndb/src/mgmsrv/Services.cpp: Fixed compiler warning ndb/src/ndbapi/ClusterMgr.cpp: Fixed compiler warning ndb/src/ndbapi/DictCache.cpp: Fixed compiler warning ndb/src/ndbapi/Ndb.cpp: Fixed compiler warning ndb/src/ndbapi/NdbOperationDefine.cpp: Fixed compiler warning ndb/src/ndbapi/NdbOperationExec.cpp: Fixed compiler warning ndb/src/ndbapi/NdbOperationInt.cpp: Fixed compiler warning ndb/src/ndbapi/NdbOperationSearch.cpp: Fixed compiler warning ndb/src/ndbapi/NdbTransaction.cpp: Fixed compiler warning ndb/src/ndbapi/Ndbif.cpp: Fixed compiler warning ndb/src/ndbapi/Ndbinit.cpp: Fixed compiler warning ndb/src/ndbapi/ndb_cluster_connection.cpp: Fixed compiler warning ndb/tools/drop_index.cpp: Fixed compiler warning ndb/tools/drop_tab.cpp: Fixed compiler warning ndb/tools/ndb_config.cpp: Fixed compiler warning regex/regexec.c: Fixed compiler warning server-tools/instance-manager/mysql_connection.cc: Fixed compiler warning sql/Makefile.am: Fix for bison 1.875, which adds an attribute statement that gcc 4.1.0 can't parse sql/filesort.cc: Fixed compiler warning sql/ha_archive.cc: Fixed compiler warning sql/ha_federated.cc: Fixed compiler warning sql/ha_federated.h: Fixed compiler warning sql/ha_innodb.cc: Fixed compiler warning sql/ha_myisam.cc: Fixed compiler warning sql/ha_myisammrg.cc: Fixed compiler warning sql/ha_ndbcluster.cc: Fixed compiler warning sql/handler.cc: Fixed compiler warning sql/item_cmpfunc.cc: Fixed compiler warning sql/item_subselect.cc: Fixed compiler warning sql/item_timefunc.cc: Fixed compiler warning sql/log_event.cc: Fixed compiler warning sql/mysqld.cc: Fixed compiler warning sql/net_serv.cc: Fixed compiler warning sql/opt_range.cc: Fixed compiler warning Formated DBUG statements to be as rest of code sql/slave.cc: Fixed compiler warning sql/sql_acl.cc: Fixed compiler warning sql/sql_cache.cc: Fixed compiler warning Fixed bug in query cache when used with DBUG traceing sql/sql_class.cc: Fixed compiler warning sql/sql_class.h: Fixed compiler warning sql/sql_delete.cc: Fixed compiler warning sql/sql_parse.cc: Fixed compiler warning Hack to fix my_sprintf() strings with %b sql/sql_prepare.cc: Fixed compiler warning Hack to fix my_sprintf() strings with %b sql/sql_repl.cc: Fixed compiler warning sql/sql_select.cc: Fixed compiler warning sql/sql_update.cc: Fixed compiler warning sql/sql_view.cc: Fixed compiler warning sql/strfunc.cc: Fixed compiler warning sql-common/client.c: Fixed compiler warning sql-common/my_time.c: Fixed compiler warning sql/table.cc: Fixed compiler warning sql/tztime.cc: Fixed compiler warning sql/unireg.cc: Fixed compiler warning strings/decimal.c: Fixed compiler warning tests/mysql_client_test.c: Fixed compiler warning vio/viosocket.c: Fixed compiler warning vio/viossl.c: Fixed compiler warning vio/viosslfactories.c: Fixed compiler warning
259 lines
5.8 KiB
C
259 lines
5.8 KiB
C
/* readline.c -- a general facility for reading lines of input
|
|
with emacs style editing and completion. */
|
|
|
|
/* Copyright (C) 1987, 1989, 1992 Free Software Foundation, Inc.
|
|
|
|
This file is part of the GNU Readline Library, a library for
|
|
reading lines of text with interactive input and history editing.
|
|
|
|
The GNU Readline Library 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, or
|
|
(at your option) any later version.
|
|
|
|
The GNU Readline 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 General Public License for more details.
|
|
|
|
The GNU General Public License is often shipped with GNU software, and
|
|
is generally kept in a file called COPYING or LICENSE. If you do not
|
|
have a copy of the license, write to the Free Software Foundation,
|
|
59 Temple Place, Suite 330, Boston, MA 02111 USA. */
|
|
#define READLINE_LIBRARY
|
|
|
|
#include "config_readline.h"
|
|
|
|
#include <sys/types.h>
|
|
|
|
#if defined (HAVE_UNISTD_H)
|
|
# include <unistd.h> /* for _POSIX_VERSION */
|
|
#endif /* HAVE_UNISTD_H */
|
|
|
|
#if defined (HAVE_STDLIB_H)
|
|
# include <stdlib.h>
|
|
#else
|
|
# include "ansi_stdlib.h"
|
|
#endif /* HAVE_STDLIB_H */
|
|
|
|
#include <stdio.h>
|
|
|
|
/* System-specific feature definitions and include files. */
|
|
#include "rldefs.h"
|
|
|
|
/* Some standard library routines. */
|
|
#include "readline.h"
|
|
#include "history.h"
|
|
|
|
#include "rlprivate.h"
|
|
#include "xmalloc.h"
|
|
|
|
/* Non-zero tells rl_delete_text and rl_insert_text to not add to
|
|
the undo list. */
|
|
int _rl_doing_an_undo = 0;
|
|
|
|
/* How many unclosed undo groups we currently have. */
|
|
int _rl_undo_group_level = 0;
|
|
|
|
/* The current undo list for THE_LINE. */
|
|
UNDO_LIST *rl_undo_list = (UNDO_LIST *)NULL;
|
|
|
|
/* **************************************************************** */
|
|
/* */
|
|
/* Undo, and Undoing */
|
|
/* */
|
|
/* **************************************************************** */
|
|
|
|
/* Remember how to undo something. Concatenate some undos if that
|
|
seems right. */
|
|
void
|
|
rl_add_undo (what, start, end, text)
|
|
enum undo_code what;
|
|
int start, end;
|
|
char *text;
|
|
{
|
|
UNDO_LIST *temp = (UNDO_LIST *)xmalloc (sizeof (UNDO_LIST));
|
|
temp->what = what;
|
|
temp->start = start;
|
|
temp->end = end;
|
|
temp->text = text;
|
|
temp->next = rl_undo_list;
|
|
rl_undo_list = temp;
|
|
}
|
|
|
|
/* Free the existing undo list. */
|
|
void
|
|
rl_free_undo_list ()
|
|
{
|
|
while (rl_undo_list)
|
|
{
|
|
UNDO_LIST *release = rl_undo_list;
|
|
rl_undo_list = rl_undo_list->next;
|
|
|
|
if (release->what == UNDO_DELETE)
|
|
free (release->text);
|
|
|
|
free (release);
|
|
}
|
|
rl_undo_list = (UNDO_LIST *)NULL;
|
|
}
|
|
|
|
/* Undo the next thing in the list. Return 0 if there
|
|
is nothing to undo, or non-zero if there was. */
|
|
int
|
|
rl_do_undo ()
|
|
{
|
|
UNDO_LIST *release;
|
|
int waiting_for_begin, start, end;
|
|
|
|
#define TRANS(i) ((i) == -1 ? rl_point : ((i) == -2 ? rl_end : (i)))
|
|
|
|
start = end = waiting_for_begin = 0;
|
|
do
|
|
{
|
|
if (!rl_undo_list)
|
|
return (0);
|
|
|
|
_rl_doing_an_undo = 1;
|
|
RL_SETSTATE(RL_STATE_UNDOING);
|
|
|
|
/* To better support vi-mode, a start or end value of -1 means
|
|
rl_point, and a value of -2 means rl_end. */
|
|
if (rl_undo_list->what == UNDO_DELETE || rl_undo_list->what == UNDO_INSERT)
|
|
{
|
|
start = TRANS (rl_undo_list->start);
|
|
end = TRANS (rl_undo_list->end);
|
|
}
|
|
|
|
switch (rl_undo_list->what)
|
|
{
|
|
/* Undoing deletes means inserting some text. */
|
|
case UNDO_DELETE:
|
|
rl_point = start;
|
|
rl_insert_text (rl_undo_list->text);
|
|
free (rl_undo_list->text);
|
|
break;
|
|
|
|
/* Undoing inserts means deleting some text. */
|
|
case UNDO_INSERT:
|
|
rl_delete_text (start, end);
|
|
rl_point = start;
|
|
break;
|
|
|
|
/* Undoing an END means undoing everything 'til we get to a BEGIN. */
|
|
case UNDO_END:
|
|
waiting_for_begin++;
|
|
break;
|
|
|
|
/* Undoing a BEGIN means that we are done with this group. */
|
|
case UNDO_BEGIN:
|
|
if (waiting_for_begin)
|
|
waiting_for_begin--;
|
|
else
|
|
rl_ding ();
|
|
break;
|
|
}
|
|
|
|
_rl_doing_an_undo = 0;
|
|
RL_UNSETSTATE(RL_STATE_UNDOING);
|
|
|
|
release = rl_undo_list;
|
|
rl_undo_list = rl_undo_list->next;
|
|
free (release);
|
|
}
|
|
while (waiting_for_begin);
|
|
|
|
return (1);
|
|
}
|
|
#undef TRANS
|
|
|
|
int
|
|
_rl_fix_last_undo_of_type (type, start, end)
|
|
int type, start, end;
|
|
{
|
|
UNDO_LIST *rl;
|
|
|
|
for (rl = rl_undo_list; rl; rl = rl->next)
|
|
{
|
|
if (rl->what == (uint) type)
|
|
{
|
|
rl->start = start;
|
|
rl->end = end;
|
|
return 0;
|
|
}
|
|
}
|
|
return 1;
|
|
}
|
|
|
|
/* Begin a group. Subsequent undos are undone as an atomic operation. */
|
|
int
|
|
rl_begin_undo_group ()
|
|
{
|
|
rl_add_undo (UNDO_BEGIN, 0, 0, 0);
|
|
_rl_undo_group_level++;
|
|
return 0;
|
|
}
|
|
|
|
/* End an undo group started with rl_begin_undo_group (). */
|
|
int
|
|
rl_end_undo_group ()
|
|
{
|
|
rl_add_undo (UNDO_END, 0, 0, 0);
|
|
_rl_undo_group_level--;
|
|
return 0;
|
|
}
|
|
|
|
/* Save an undo entry for the text from START to END. */
|
|
int
|
|
rl_modifying (start, end)
|
|
int start, end;
|
|
{
|
|
if (start > end)
|
|
{
|
|
SWAP (start, end);
|
|
}
|
|
|
|
if (start != end)
|
|
{
|
|
char *temp = rl_copy_text (start, end);
|
|
rl_begin_undo_group ();
|
|
rl_add_undo (UNDO_DELETE, start, end, temp);
|
|
rl_add_undo (UNDO_INSERT, start, end, (char *)NULL);
|
|
rl_end_undo_group ();
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/* Revert the current line to its previous state. */
|
|
int
|
|
rl_revert_line (int count __attribute__((unused)), int key __attribute__((unused)))
|
|
{
|
|
if (!rl_undo_list)
|
|
rl_ding ();
|
|
else
|
|
{
|
|
while (rl_undo_list)
|
|
rl_do_undo ();
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/* Do some undoing of things that were done. */
|
|
int
|
|
rl_undo_command (int count, int key __attribute__((unused)))
|
|
{
|
|
if (count < 0)
|
|
return 0; /* Nothing to do. */
|
|
|
|
while (count)
|
|
{
|
|
if (rl_do_undo ())
|
|
count--;
|
|
else
|
|
{
|
|
rl_ding ();
|
|
break;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|