mirror of
https://github.com/MariaDB/server.git
synced 2025-01-21 22:34:18 +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
258 lines
6.6 KiB
C
258 lines
6.6 KiB
C
/* macro.c -- keyboard macros for readline. */
|
|
|
|
/* Copyright (C) 1994 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"
|
|
|
|
/* **************************************************************** */
|
|
/* */
|
|
/* Hacking Keyboard Macros */
|
|
/* */
|
|
/* **************************************************************** */
|
|
|
|
/* The currently executing macro string. If this is non-zero,
|
|
then it is a malloc ()'ed string where input is coming from. */
|
|
char *rl_executing_macro = (char *)NULL;
|
|
|
|
/* The offset in the above string to the next character to be read. */
|
|
static int executing_macro_index;
|
|
|
|
/* The current macro string being built. Characters get stuffed
|
|
in here by add_macro_char (). */
|
|
static char *current_macro = (char *)NULL;
|
|
|
|
/* The size of the buffer allocated to current_macro. */
|
|
static int current_macro_size;
|
|
|
|
/* The index at which characters are being added to current_macro. */
|
|
static int current_macro_index;
|
|
|
|
/* A structure used to save nested macro strings.
|
|
It is a linked list of string/index for each saved macro. */
|
|
struct saved_macro {
|
|
struct saved_macro *next;
|
|
char *string;
|
|
int sindex;
|
|
};
|
|
|
|
/* The list of saved macros. */
|
|
static struct saved_macro *macro_list = (struct saved_macro *)NULL;
|
|
|
|
/* Set up to read subsequent input from STRING.
|
|
STRING is free ()'ed when we are done with it. */
|
|
void
|
|
_rl_with_macro_input (string)
|
|
char *string;
|
|
{
|
|
_rl_push_executing_macro ();
|
|
rl_executing_macro = string;
|
|
executing_macro_index = 0;
|
|
RL_SETSTATE(RL_STATE_MACROINPUT);
|
|
}
|
|
|
|
/* Return the next character available from a macro, or 0 if
|
|
there are no macro characters. */
|
|
int
|
|
_rl_next_macro_key ()
|
|
{
|
|
if (rl_executing_macro == 0)
|
|
return (0);
|
|
|
|
if (rl_executing_macro[executing_macro_index] == 0)
|
|
{
|
|
_rl_pop_executing_macro ();
|
|
return (_rl_next_macro_key ());
|
|
}
|
|
|
|
return (rl_executing_macro[executing_macro_index++]);
|
|
}
|
|
|
|
/* Save the currently executing macro on a stack of saved macros. */
|
|
void
|
|
_rl_push_executing_macro ()
|
|
{
|
|
struct saved_macro *saver;
|
|
|
|
saver = (struct saved_macro *)xmalloc (sizeof (struct saved_macro));
|
|
saver->next = macro_list;
|
|
saver->sindex = executing_macro_index;
|
|
saver->string = rl_executing_macro;
|
|
|
|
macro_list = saver;
|
|
}
|
|
|
|
/* Discard the current macro, replacing it with the one
|
|
on the top of the stack of saved macros. */
|
|
void
|
|
_rl_pop_executing_macro ()
|
|
{
|
|
struct saved_macro *macro;
|
|
|
|
FREE (rl_executing_macro);
|
|
rl_executing_macro = (char *)NULL;
|
|
executing_macro_index = 0;
|
|
|
|
if (macro_list)
|
|
{
|
|
macro = macro_list;
|
|
rl_executing_macro = macro_list->string;
|
|
executing_macro_index = macro_list->sindex;
|
|
macro_list = macro_list->next;
|
|
free (macro);
|
|
}
|
|
|
|
if (rl_executing_macro == 0)
|
|
RL_UNSETSTATE(RL_STATE_MACROINPUT);
|
|
}
|
|
|
|
/* Add a character to the macro being built. */
|
|
void
|
|
_rl_add_macro_char (c)
|
|
int c;
|
|
{
|
|
if (current_macro_index + 1 >= current_macro_size)
|
|
{
|
|
if (current_macro == 0)
|
|
current_macro = (char *)xmalloc (current_macro_size = 25);
|
|
else
|
|
current_macro = (char *)xrealloc (current_macro, current_macro_size += 25);
|
|
}
|
|
|
|
current_macro[current_macro_index++] = c;
|
|
current_macro[current_macro_index] = '\0';
|
|
}
|
|
|
|
void
|
|
_rl_kill_kbd_macro ()
|
|
{
|
|
if (current_macro)
|
|
{
|
|
free (current_macro);
|
|
current_macro = (char *) NULL;
|
|
}
|
|
current_macro_size = current_macro_index = 0;
|
|
|
|
FREE (rl_executing_macro);
|
|
rl_executing_macro = (char *) NULL;
|
|
executing_macro_index = 0;
|
|
|
|
RL_UNSETSTATE(RL_STATE_MACRODEF);
|
|
}
|
|
|
|
/* Begin defining a keyboard macro.
|
|
Keystrokes are recorded as they are executed.
|
|
End the definition with rl_end_kbd_macro ().
|
|
If a numeric argument was explicitly typed, then append this
|
|
definition to the end of the existing macro, and start by
|
|
re-executing the existing macro. */
|
|
int
|
|
rl_start_kbd_macro (int ignore1 __attribute__((unused)),
|
|
int ignore2 __attribute__((unused)))
|
|
{
|
|
if (RL_ISSTATE (RL_STATE_MACRODEF))
|
|
{
|
|
_rl_abort_internal ();
|
|
return -1;
|
|
}
|
|
|
|
if (rl_explicit_arg)
|
|
{
|
|
if (current_macro)
|
|
_rl_with_macro_input (savestring (current_macro));
|
|
}
|
|
else
|
|
current_macro_index = 0;
|
|
|
|
RL_SETSTATE(RL_STATE_MACRODEF);
|
|
return 0;
|
|
}
|
|
|
|
/* Stop defining a keyboard macro.
|
|
A numeric argument says to execute the macro right now,
|
|
that many times, counting the definition as the first time. */
|
|
int
|
|
rl_end_kbd_macro (int count, int ignore __attribute__((unused)))
|
|
{
|
|
if (RL_ISSTATE (RL_STATE_MACRODEF) == 0)
|
|
{
|
|
_rl_abort_internal ();
|
|
return -1;
|
|
}
|
|
|
|
current_macro_index -= rl_key_sequence_length - 1;
|
|
current_macro[current_macro_index] = '\0';
|
|
|
|
RL_UNSETSTATE(RL_STATE_MACRODEF);
|
|
|
|
return (rl_call_last_kbd_macro (--count, 0));
|
|
}
|
|
|
|
/* Execute the most recently defined keyboard macro.
|
|
COUNT says how many times to execute it. */
|
|
int
|
|
rl_call_last_kbd_macro (int count, int ignore __attribute__((unused)))
|
|
{
|
|
if (current_macro == 0)
|
|
_rl_abort_internal ();
|
|
|
|
if (RL_ISSTATE (RL_STATE_MACRODEF))
|
|
{
|
|
rl_ding (); /* no recursive macros */
|
|
current_macro[--current_macro_index] = '\0'; /* erase this char */
|
|
return 0;
|
|
}
|
|
|
|
while (count--)
|
|
_rl_with_macro_input (savestring (current_macro));
|
|
return 0;
|
|
}
|
|
|
|
void
|
|
rl_push_macro_input (macro)
|
|
char *macro;
|
|
{
|
|
_rl_with_macro_input (macro);
|
|
}
|