mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 04:22:27 +01:00
aeaf3fcf12
Safer, a bit faster filesort. Code changes to avoid calls to current_thd() (faster code). Removed all compiler warnings from readline. BitKeeper/etc/ignore: Add my_global.h back. Docs/manual.texi: 4.0.1 Changelog include/my_sys.h: Added strmake_root libmysql/libmysql.c: Don't do signal() on windows (Causes instability problems) mysys/my_alloc.c: Added strmake_root readline/bind.c: Remove warnings readline/complete.c: Remove warnings readline/display.c: Remove warnings readline/funmap.c: Remove warnings readline/histexpand.c: Remove warnings readline/histfile.c: Remove warnings readline/history.h: Remove warnings readline/histsearch.c: Remove warnings readline/isearch.c: Remove warnings readline/kill.c: Remove warnings readline/macro.c: Remove warnings readline/readline.c: Remove warnings readline/readline.h: Remove warnings readline/rltty.c: Remove warnings readline/search.c: Remove warnings readline/shell.c: Remove warnings readline/terminal.c: Remove warnings readline/tilde.c: Remove warnings readline/tilde.h: Remove warnings readline/undo.c: Remove warnings readline/util.c: Remove warnings readline/vi_mode.c: Remove warnings sql-bench/server-cfg.sh: Added use of truncate table sql-bench/test-insert.sh: Added use of truncate table Changed some tests to use keys instead of 'range' sql-bench/test-wisconsin.sh: Cleanup sql/field.cc: Add 'thd' to send() (To avoid usage of 'current_thd') sql/field.h: Add 'thd' to send() (To avoid usage of 'current_thd') sql/filesort.cc: Safer memory allocation; Don't allocate pointer to buffers directly, but use an IO_CACHE instead. This will allow us to use more memory for keys and will also work better if the number of rows that is to be sorted is much larger than expected. sql/item.cc: Add 'thd' to send() (To avoid usage of 'current_thd') sql/item.h: Add 'thd' to send() (To avoid usage of 'current_thd') sql/item_func.h: Cleanup sql/opt_range.cc: Use mem_root instead of sql_alloc() to get more speed sql/sql_class.cc: Add 'thd' to send() (To avoid usage of 'current_thd') sql/sql_class.h: Added strmake() sql/sql_handler.cc: Add 'thd' to send() (To avoid usage of 'current_thd') sql/sql_lex.cc: Use mem_root instead of sql_alloc() to get more speed sql/sql_select.cc: Add 'thd' to send() (To avoid usage of 'current_thd') tests/fork2_test.pl: Fixed typos tests/fork_big.pl: Fixed typos tests/insert_and_repair.pl: Fixed typos tests/rename_test.pl: Fixed typos tests/test_delayed_insert.pl: Fixed typos
200 lines
4.9 KiB
C
200 lines
4.9 KiB
C
/* histsearch.c -- searching the history list. */
|
|
|
|
/* Copyright (C) 1989, 1992 Free Software Foundation, Inc.
|
|
|
|
This file contains the GNU History Library (the Library), a set of
|
|
routines for managing the text of previously typed lines.
|
|
|
|
The 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 1, or (at your option)
|
|
any later version.
|
|
|
|
The 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,
|
|
675 Mass Ave, Cambridge, MA 02139, USA. */
|
|
|
|
#define READLINE_LIBRARY
|
|
|
|
#if defined (HAVE_CONFIG_H)
|
|
# include <config.h>
|
|
#endif
|
|
|
|
#include <stdio.h>
|
|
#if defined (HAVE_STDLIB_H)
|
|
# include <stdlib.h>
|
|
#else
|
|
# include "ansi_stdlib.h"
|
|
#endif /* HAVE_STDLIB_H */
|
|
#if defined (HAVE_UNISTD_H)
|
|
# ifdef _MINIX
|
|
# include <sys/types.h>
|
|
# endif
|
|
# include <unistd.h>
|
|
#endif
|
|
#if defined (HAVE_STRING_H)
|
|
# include <string.h>
|
|
#else
|
|
# include <strings.h>
|
|
#endif /* !HAVE_STRING_H */
|
|
|
|
#include "history.h"
|
|
#include "histlib.h"
|
|
|
|
/* Variables imported from other history library files. */
|
|
extern int history_offset;
|
|
|
|
/* The list of alternate characters that can delimit a history search
|
|
string. */
|
|
const char *history_search_delimiter_chars = (char *)NULL;
|
|
|
|
/* Search the history for STRING, starting at history_offset.
|
|
If DIRECTION < 0, then the search is through previous entries, else
|
|
through subsequent. If ANCHORED is non-zero, the string must
|
|
appear at the beginning of a history line, otherwise, the string
|
|
may appear anywhere in the line. If the string is found, then
|
|
current_history () is the history entry, and the value of this
|
|
function is the offset in the line of that history entry that the
|
|
string was found in. Otherwise, nothing is changed, and a -1 is
|
|
returned. */
|
|
|
|
static int
|
|
history_search_internal (string, direction, anchored)
|
|
char *string;
|
|
int direction, anchored;
|
|
{
|
|
register int i, reverse;
|
|
register char *line;
|
|
register int line_index;
|
|
int string_len;
|
|
HIST_ENTRY **the_history; /* local */
|
|
|
|
i = history_offset;
|
|
reverse = (direction < 0);
|
|
|
|
/* Take care of trivial cases first. */
|
|
if (string == 0 || *string == '\0')
|
|
return (-1);
|
|
|
|
if (!history_length || ((i == history_length) && !reverse))
|
|
return (-1);
|
|
|
|
if (reverse && (i == history_length))
|
|
i--;
|
|
|
|
#define NEXT_LINE() do { if (reverse) i--; else i++; } while (0)
|
|
|
|
the_history = history_list ();
|
|
string_len = strlen (string);
|
|
while (1)
|
|
{
|
|
/* Search each line in the history list for STRING. */
|
|
|
|
/* At limit for direction? */
|
|
if ((reverse && i < 0) || (!reverse && i == history_length))
|
|
return (-1);
|
|
|
|
line = the_history[i]->line;
|
|
line_index = strlen (line);
|
|
|
|
/* If STRING is longer than line, no match. */
|
|
if (string_len > line_index)
|
|
{
|
|
NEXT_LINE ();
|
|
continue;
|
|
}
|
|
|
|
/* Handle anchored searches first. */
|
|
if (anchored == ANCHORED_SEARCH)
|
|
{
|
|
if (STREQN (string, line, string_len))
|
|
{
|
|
history_offset = i;
|
|
return (0);
|
|
}
|
|
|
|
NEXT_LINE ();
|
|
continue;
|
|
}
|
|
|
|
/* Do substring search. */
|
|
if (reverse)
|
|
{
|
|
line_index -= string_len;
|
|
|
|
while (line_index >= 0)
|
|
{
|
|
if (STREQN (string, line + line_index, string_len))
|
|
{
|
|
history_offset = i;
|
|
return (line_index);
|
|
}
|
|
line_index--;
|
|
}
|
|
}
|
|
else
|
|
{
|
|
register int limit;
|
|
|
|
limit = line_index - string_len + 1;
|
|
line_index = 0;
|
|
|
|
while (line_index < limit)
|
|
{
|
|
if (STREQN (string, line + line_index, string_len))
|
|
{
|
|
history_offset = i;
|
|
return (line_index);
|
|
}
|
|
line_index++;
|
|
}
|
|
}
|
|
NEXT_LINE ();
|
|
}
|
|
}
|
|
|
|
/* Do a non-anchored search for STRING through the history in DIRECTION. */
|
|
int
|
|
history_search (string, direction)
|
|
char *string;
|
|
int direction;
|
|
{
|
|
return (history_search_internal (string, direction, NON_ANCHORED_SEARCH));
|
|
}
|
|
|
|
/* Do an anchored search for string through the history in DIRECTION. */
|
|
int
|
|
history_search_prefix (string, direction)
|
|
char *string;
|
|
int direction;
|
|
{
|
|
return (history_search_internal (string, direction, ANCHORED_SEARCH));
|
|
}
|
|
|
|
/* Search for STRING in the history list. DIR is < 0 for searching
|
|
backwards. POS is an absolute index into the history list at
|
|
which point to begin searching. */
|
|
int
|
|
history_search_pos (string, dir, pos)
|
|
char *string;
|
|
int dir, pos;
|
|
{
|
|
int ret, old;
|
|
|
|
old = where_history ();
|
|
history_set_pos (pos);
|
|
if (history_search (string, dir) == -1)
|
|
{
|
|
history_set_pos (old);
|
|
return (-1);
|
|
}
|
|
ret = where_history ();
|
|
history_set_pos (old);
|
|
return ret;
|
|
}
|