diff options
author | Jan Kratochvil <jan.kratochvil@redhat.com> | 2011-05-11 23:38:44 +0000 |
---|---|---|
committer | Jan Kratochvil <jan.kratochvil@redhat.com> | 2011-05-11 23:38:44 +0000 |
commit | cc88a640ca1d0356c5feb40bb48869bab5a2bdce (patch) | |
tree | 2b845ec3c6b554e4fe702a48844fe13330c0f58c /readline/histexpand.c | |
parent | 4cab4add34b167b3902b1cb2873738914103f6ff (diff) | |
download | fsf-binutils-gdb-cc88a640ca1d0356c5feb40bb48869bab5a2bdce.zip fsf-binutils-gdb-cc88a640ca1d0356c5feb40bb48869bab5a2bdce.tar.gz fsf-binutils-gdb-cc88a640ca1d0356c5feb40bb48869bab5a2bdce.tar.bz2 |
Imported readline 6.2, and upstream patch 001.
[patch 0/3] readline-6.2 rebase
http://sourceware.org/ml/gdb-patches/2011-05/msg00003.html
[patch 1/3] readline-6.2: Merge of already posted patches
http://sourceware.org/ml/gdb-patches/2011-05/msg00004.html
=
[Bug-readline] [RFC/readline] bind.c, rl_function_dumper, Free allocated
http://lists.gnu.org/archive/html/bug-readline/2011-03/msg00000.html
[Bug-readline] [patch] Fix underquotation in readline/examples/rlfe/conf
http://lists.gnu.org/archive/html/bug-readline/2011-04/msg00001.html
[Bug-readline] [patch] Makefile.in htm<->html
http://lists.gnu.org/archive/html/bug-readline/2011-04/msg00002.html
Re: [Bug-readline] [patch] Makefile.in dependency: callback.o: xmalloc.h
http://lists.gnu.org/archive/html/bug-readline/2011-04/msg00004.html
[Bug-readline] [patch] Remove . from the VPATH directive
http://lists.gnu.org/archive/html/bug-readline/2011-04/msg00005.html
Eli Zaretskii's __MSDOS__ / __GO32__ / __MINGW32__ / __DJGPP__ stuff:
http://sourceware.org/ml/gdb/2011-04/msg00002.html
Jan Kratochvil's patch for FSF GDB tree local-specific changes:
http://sourceware.org/ml/gdb/2011-04/msg00006.html
Preservation of existing ChangeLog.gdb files, their updates.
[patch 2/3] readline-6.2: Workaround "ask" regression
http://sourceware.org/ml/gdb-patches/2011-05/msg00005.html
[patch 3/3] readline-6.2: Revert 5.x compat., apply 6.x compat.
http://sourceware.org/ml/gdb-patches/2011-05/msg00006.html
[patch 4/3] readline-6.2: Substitute inc-hist.texinfo
http://sourceware.org/ml/gdb-patches/2011-05/msg00010.html
readline/
Workaround gdb.base/completion.exp regression on readline-6.2.
* complete.c (get_y_or_n): Disable the return on RL_STATE_CALLBACK.
Imported readline 6.2, and upstream patch 001.
* configure: Regenerate.
readline/doc/
* hsuser.texi (Using History Interactively): Disable !BashFeatures
@defcodeindex. Make the `Programming with GNU History' reference
external.
* inc-hist.texinfo: Remove.
Imported readline 6.2, and upstream patch 001.
readline/examples/
Imported readline 6.2, and upstream patch 001.
readline/examples/rlfe/
Imported readline 6.2, and upstream patch 001.
gdb/
* config.in: Regenerate.
* configure: Regenerate.
* configure.ac <--with-system-readline> (for readline_echoing_p):
Remove the test.
* tui/tui-io.c (tui_old_readline_echoing_p): Rename to ...
(tui_old_rl_echoing_p): ... here.
(tui_setup_io): Rename extern declaration readline_echoing_p to
_rl_echoing_p. Adjust assignments for the both renames.
gdb/doc/
* Makefile.in (GDB_DOC_SOURCE_INCLUDES): Rename inc-hist.texinfo to
hsuser.texi.
* gdb.texinfo <!SYSTEM_READLINE>: Rename inc-hist.texinfo inclusion and
comment to hsuser.texi. Change rluser.texi name in the comment.
Diffstat (limited to 'readline/histexpand.c')
-rw-r--r-- | readline/histexpand.c | 223 |
1 files changed, 145 insertions, 78 deletions
diff --git a/readline/histexpand.c b/readline/histexpand.c index 6847014..8fb3798 100644 --- a/readline/histexpand.c +++ b/readline/histexpand.c @@ -1,24 +1,23 @@ /* histexpand.c -- history expansion. */ -/* Copyright (C) 1989-2004 Free Software Foundation, Inc. +/* Copyright (C) 1989-2010 Free Software Foundation, Inc. - This file contains the GNU History Library (the Library), a set of + This file contains the GNU History Library (History), a set of routines for managing the text of previously typed lines. - The Library is free software; you can redistribute it and/or modify + History 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 Free Software Foundation, either version 3 of the License, 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. + History 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. */ + You should have received a copy of the GNU General Public License + along with History. If not, see <http://www.gnu.org/licenses/>. +*/ #define READLINE_LIBRARY @@ -56,8 +55,6 @@ typedef int _hist_search_func_t PARAMS((const char *, int)); -extern int rl_byte_oriented; /* declared in mbutil.c */ - static char error_pointer; static char *subst_lhs; @@ -66,9 +63,11 @@ static int subst_lhs_len; static int subst_rhs_len; static char *get_history_word_specifier PARAMS((char *, char *, int *)); -static char *history_find_word PARAMS((char *, int)); static int history_tokenize_word PARAMS((const char *, int)); +static char **history_tokenize_internal PARAMS((const char *, int, int *)); static char *history_substring PARAMS((const char *, int, int)); +static void freewords PARAMS((char **, int)); +static char *history_find_word PARAMS((char *, int)); static char *quote_breaks PARAMS((char *)); @@ -246,7 +245,7 @@ get_history_event (string, caller_index, delimiting_quote) #define FAIL_SEARCH() \ do { \ - history_offset = history_length; free (temp) ; return (char *)NULL; \ + history_offset = history_length; xfree (temp) ; return (char *)NULL; \ } while (0) /* If there is no search string, try to use the previous search string, @@ -255,7 +254,7 @@ get_history_event (string, caller_index, delimiting_quote) { if (search_string) { - free (temp); + xfree (temp); temp = savestring (search_string); } else @@ -286,7 +285,7 @@ get_history_event (string, caller_index, delimiting_quote) search_match = history_find_word (entry->line, local_index); } else - free (temp); + xfree (temp); return (entry->line); } @@ -306,16 +305,20 @@ get_history_event (string, caller_index, delimiting_quote) /* Extract the contents of STRING as if it is enclosed in single quotes. SINDEX, when passed in, is the offset of the character immediately following the opening single quote; on exit, SINDEX is left pointing - to the closing single quote. */ + to the closing single quote. FLAGS currently used to allow backslash + to escape a single quote (e.g., for bash $'...'). */ static void -hist_string_extract_single_quoted (string, sindex) +hist_string_extract_single_quoted (string, sindex, flags) char *string; - int *sindex; + int *sindex, flags; { register int i; for (i = *sindex; string[i] && string[i] != '\''; i++) - ; + { + if ((flags & 1) && string[i] == '\\' && string[i+1]) + i++; + } *sindex = i; } @@ -505,7 +508,7 @@ postproc_subst_rhs () } } new[j] = '\0'; - free (subst_rhs); + xfree (subst_rhs); subst_rhs = new; subst_rhs_len = j; } @@ -564,12 +567,12 @@ history_expand_internal (string, start, end_index_ptr, ret_string, current_line) #if defined (HANDLE_MULTIBYTE) if (MB_CUR_MAX > 1 && rl_byte_oriented == 0) { - int c, l; + int ch, l; l = _rl_find_prev_mbchar (string, i, MB_FIND_ANY); - c = string[l]; + ch = string[l]; /* XXX - original patch had i - 1 ??? If i == 0 it would fail. */ - if (i && (c == '\'' || c == '"')) - quoted_search_delimiter = c; + if (i && (ch == '\'' || ch == '"')) + quoted_search_delimiter = ch; } else #endif /* HANDLE_MULTIBYTE */ @@ -582,7 +585,7 @@ history_expand_internal (string, start, end_index_ptr, ret_string, current_line) if (event == 0) { *ret_string = hist_error (string, start, i, EVENT_NOT_FOUND); - free (result); + xfree (result); return (-1); } @@ -596,7 +599,7 @@ history_expand_internal (string, start, end_index_ptr, ret_string, current_line) if (word_spec == (char *)&error_pointer) { *ret_string = hist_error (string, starting_index, i, BAD_WORD_SPEC); - free (result); + xfree (result); return (-1); } @@ -629,8 +632,8 @@ history_expand_internal (string, start, end_index_ptr, ret_string, current_line) { default: *ret_string = hist_error (string, i+1, i+2, BAD_MODIFIER); - free (result); - free (temp); + xfree (result); + xfree (temp); return -1; case 'q': @@ -655,7 +658,7 @@ history_expand_internal (string, start, end_index_ptr, ret_string, current_line) { tstr++; t = savestring (tstr); - free (temp); + xfree (temp); temp = t; } break; @@ -680,7 +683,7 @@ history_expand_internal (string, start, end_index_ptr, ret_string, current_line) if (tstr) { t = savestring (tstr); - free (temp); + xfree (temp); temp = t; } break; @@ -756,8 +759,8 @@ history_expand_internal (string, start, end_index_ptr, ret_string, current_line) if (subst_lhs_len == 0) { *ret_string = hist_error (string, starting_index, i, NO_PREV_SUBST); - free (result); - free (temp); + xfree (result); + xfree (temp); return -1; } @@ -766,8 +769,8 @@ history_expand_internal (string, start, end_index_ptr, ret_string, current_line) if (subst_lhs_len > l_temp) { *ret_string = hist_error (string, starting_index, i, SUBST_FAILED); - free (result); - free (temp); + xfree (result); + xfree (temp); return (-1); } @@ -808,7 +811,7 @@ history_expand_internal (string, start, end_index_ptr, ret_string, current_line) temp + si + subst_lhs_len, l_temp - (si + subst_lhs_len)); new_event[len] = '\0'; - free (temp); + xfree (temp); temp = new_event; failed = 0; @@ -844,8 +847,8 @@ history_expand_internal (string, start, end_index_ptr, ret_string, current_line) continue; /* don't want to increment i */ *ret_string = hist_error (string, starting_index, i, SUBST_FAILED); - free (result); - free (temp); + xfree (result); + xfree (temp); return (-1); } } @@ -866,7 +869,7 @@ history_expand_internal (string, start, end_index_ptr, ret_string, current_line) else x = savestring (temp); - free (temp); + xfree (temp); temp = x; } @@ -874,7 +877,7 @@ history_expand_internal (string, start, end_index_ptr, ret_string, current_line) if (n >= result_len) result = (char *)xrealloc (result, n + 2); strcpy (result, temp); - free (temp); + xfree (temp); *end_index_ptr = i; *ret_string = result; @@ -925,7 +928,7 @@ history_expand (hstring, output) char **output; { register int j; - int i, r, l, passc, cc, modified, eindex, only_printing, dquote; + int i, r, l, passc, cc, modified, eindex, only_printing, dquote, flag; char *string; /* The output string, and its length. */ @@ -1017,7 +1020,7 @@ history_expand (hstring, output) } else if (string[i] == history_expansion_char) { - if (!cc || member (cc, history_no_expand_chars)) + if (cc == 0 || member (cc, history_no_expand_chars)) continue; /* If the calling application has set history_inhibit_expansion_function to a function that checks @@ -1045,8 +1048,9 @@ history_expand (hstring, output) else if (dquote == 0 && history_quotes_inhibit_expansion && string[i] == '\'') { /* If this is bash, single quotes inhibit history expansion. */ + flag = (i > 0 && string[i - 1] == '$'); i++; - hist_string_extract_single_quoted (string, &i); + hist_string_extract_single_quoted (string, &i, flag); } else if (history_quotes_inhibit_expansion && string[i] == '\\') { @@ -1060,7 +1064,7 @@ history_expand (hstring, output) if (string[i] != history_expansion_char) { - free (result); + xfree (result); *output = savestring (string); return (0); } @@ -1097,7 +1101,7 @@ history_expand (hstring, output) if (strlen (mb) > 1) { ADD_STRING (mb); - break; + continue; } } #endif /* HANDLE_MULTIBYTE */ @@ -1131,15 +1135,16 @@ history_expand (hstring, output) { int quote, slen; + flag = (i > 0 && string[i - 1] == '$'); quote = i++; - hist_string_extract_single_quoted (string, &i); + hist_string_extract_single_quoted (string, &i, flag); slen = i - quote + 2; temp = (char *)xmalloc (slen); strncpy (temp, string + quote, slen); temp[slen - 1] = '\0'; ADD_STRING (temp); - free (temp); + xfree (temp); } else ADD_CHAR (string[i]); @@ -1152,7 +1157,7 @@ history_expand (hstring, output) temp = (char *)xmalloc (l - i + 1); strcpy (temp, string + i); ADD_STRING (temp); - free (temp); + xfree (temp); i = l; } else @@ -1165,7 +1170,8 @@ history_expand (hstring, output) /* If the history_expansion_char is followed by one of the characters in history_no_expand_chars, then it is not a candidate for expansion of any kind. */ - if (member (cc, history_no_expand_chars)) + if (cc == 0 || member (cc, history_no_expand_chars) || + (history_inhibit_expansion_function && (*history_inhibit_expansion_function) (string, i))) { ADD_CHAR (string[i]); break; @@ -1184,7 +1190,7 @@ history_expand (hstring, output) temp = (char *)xmalloc (1 + strlen (result)); strcpy (temp, result); ADD_STRING (temp); - free (temp); + xfree (temp); } i++; break; @@ -1195,9 +1201,9 @@ history_expand (hstring, output) if (r < 0) { *output = temp; - free (result); + xfree (result); if (string != hstring) - free (string); + xfree (string); return -1; } else @@ -1207,7 +1213,7 @@ history_expand (hstring, output) modified++; if (*temp) ADD_STRING (temp); - free (temp); + xfree (temp); } only_printing = r == 1; i = eindex; @@ -1218,7 +1224,7 @@ history_expand (hstring, output) *output = result; if (string != hstring) - free (string); + xfree (string); if (only_printing) { @@ -1399,8 +1405,8 @@ history_arg_extract (first, last, string) } for (i = 0; i < len; i++) - free (list[i]); - free (list); + xfree (list[i]); + xfree (list); return (result); } @@ -1411,10 +1417,10 @@ history_tokenize_word (string, ind) int ind; { register int i; - int delimiter; + int delimiter, nestdelim, delimopen; i = ind; - delimiter = 0; + delimiter = nestdelim = 0; if (member (string[i], "()\n")) { @@ -1430,20 +1436,34 @@ history_tokenize_word (string, ind) { if (peek == '<' && string[i + 2] == '-') i++; + else if (peek == '<' && string[i + 2] == '<') + i++; i += 2; return i; } - else + else if ((peek == '&' && (string[i] == '>' || string[i] == '<')) || + (peek == '>' && string[i] == '&')) { - if ((peek == '&' && (string[i] == '>' || string[i] == '<')) || - (peek == '>' && string[i] == '&') || - (peek == '(' && (string[i] == '>' || string[i] == '<')) || /* ) */ - (peek == '(' && string[i] == '$')) /* ) */ - { - i += 2; - return i; - } + i += 2; + return i; + } + /* XXX - separated out for later -- bash-4.2 */ + else if ((peek == '(' && (string[i] == '>' || string[i] == '<')) || /* ) */ + (peek == '(' && string[i] == '$')) /*)*/ + { + i += 2; + delimopen = '('; + delimiter = ')'; + nestdelim = 1; + goto get_word; } +#if 0 + else if (peek == '\'' && string[i] == '$') + { + i += 2; /* XXX */ + return i; + } +#endif if (string[i] != '$') { @@ -1452,9 +1472,25 @@ history_tokenize_word (string, ind) } } + /* same code also used for $(...)/<(...)/>(...) above */ + if (member (string[i], "!@?+*")) + { + int peek = string[i + 1]; + + if (peek == '(') /*)*/ + { + /* Shell extended globbing patterns */ + i += 2; + delimopen = '('; + delimiter = ')'; /* XXX - not perfect */ + nestdelim = 1; + } + } + +get_word: /* Get word from string + i; */ - if (member (string[i], HISTORY_QUOTE_CHARACTERS)) + if (delimiter == 0 && member (string[i], HISTORY_QUOTE_CHARACTERS)) delimiter = string[i++]; for (; string[i]; i++) @@ -1472,16 +1508,31 @@ history_tokenize_word (string, ind) continue; } + /* delimiter must be set and set to something other than a quote if + nestdelim is set, so these tests are safe. */ + if (nestdelim && string[i] == delimopen) + { + nestdelim++; + continue; + } + if (nestdelim && string[i] == delimiter) + { + nestdelim--; + if (nestdelim == 0) + delimiter = 0; + continue; + } + if (delimiter && string[i] == delimiter) { delimiter = 0; continue; } - if (!delimiter && (member (string[i], history_word_delimiters))) + if (delimiter == 0 && (member (string[i], history_word_delimiters))) break; - if (!delimiter && member (string[i], HISTORY_QUOTE_CHARACTERS)) + if (delimiter == 0 && member (string[i], HISTORY_QUOTE_CHARACTERS)) delimiter = string[i]; } @@ -1569,6 +1620,18 @@ history_tokenize (string) return (history_tokenize_internal (string, -1, (int *)NULL)); } +/* Free members of WORDS from START to an empty string */ +static void +freewords (words, start) + char **words; + int start; +{ + register int i; + + for (i = start; words[i]; i++) + xfree (words[i]); +} + /* Find and return the word which contains the character at index IND in the history line LINE. Used to save the word matched by the last history !?string? search. */ @@ -1582,12 +1645,16 @@ history_find_word (line, ind) words = history_tokenize_internal (line, ind, &wind); if (wind == -1 || words == 0) - return ((char *)NULL); + { + if (words) + freewords (words, 0); + FREE (words); + return ((char *)NULL); + } s = words[wind]; for (i = 0; i < wind; i++) - free (words[i]); - for (i = wind + 1; words[i]; i++) - free (words[i]); - free (words); + xfree (words[i]); + freewords (words, wind + 1); + xfree (words); return s; } |