mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
bash: update upstream patches
Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue
parent
3edbb46861
commit
2bc653ee32
524
packages/sysutils/bash/patches.upstream/bash42-029.patch
Normal file
524
packages/sysutils/bash/patches.upstream/bash42-029.patch
Normal file
@ -0,0 +1,524 @@
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.2
|
||||
Patch-ID: bash42-029
|
||||
|
||||
Bug-Reported-by: "Michael Kalisz" <michael@kalisz.homelinux.net>
|
||||
Bug-Reference-ID: <50241.78.69.11.112.1298585641.squirrel@kalisz.homelinux.net>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-02/msg00274.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
Bash-4.2 tries to leave completed directory names as the user typed them,
|
||||
without expanding them to a full pathname. One effect of this is that
|
||||
shell variables used in pathnames being completed (e.g., $HOME) are left
|
||||
unchanged, but the `$' is quoted by readline because it is a special
|
||||
character to the shell.
|
||||
|
||||
This patch introduces two things:
|
||||
|
||||
1. A new shell option, `direxpand', which, if set, attempts to emulate the
|
||||
bash-4.1 behavior of expanding words to full pathnames during
|
||||
completion;
|
||||
2. A set of heuristics that reduce the number of times special characters
|
||||
such as `$' are quoted when the directory name is not expanded.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
diff -NrC 2 ../bash-4.2-patched/bashline.c ./bashline.c
|
||||
*** ../bash-4.2-patched/bashline.c 2011-01-16 15:32:47.000000000 -0500
|
||||
--- ./bashline.c 2012-05-07 16:27:18.000000000 -0400
|
||||
***************
|
||||
*** 122,125 ****
|
||||
--- 122,128 ----
|
||||
static int bash_push_line __P((void));
|
||||
|
||||
+ static rl_icppfunc_t *save_directory_hook __P((void));
|
||||
+ static void reset_directory_hook __P((rl_icppfunc_t *));
|
||||
+
|
||||
static void cleanup_expansion_error __P((void));
|
||||
static void maybe_make_readline_line __P((char *));
|
||||
***************
|
||||
*** 244,251 ****
|
||||
--- 247,261 ----
|
||||
int dircomplete_spelling = 0;
|
||||
|
||||
+ /* Expand directory names during word/filename completion. */
|
||||
+ int dircomplete_expand = 0;
|
||||
+ int dircomplete_expand_relpath = 0;
|
||||
+
|
||||
static char *bash_completer_word_break_characters = " \t\n\"'@><=;|&(:";
|
||||
static char *bash_nohostname_word_break_characters = " \t\n\"'><=;|&(:";
|
||||
/* )) */
|
||||
|
||||
+ static const char *default_filename_quote_characters = " \t\n\\\"'@<>=;|&()#$`?*[!:{~"; /*}*/
|
||||
+ static char *custom_filename_quote_characters = 0;
|
||||
+
|
||||
static rl_hook_func_t *old_rl_startup_hook = (rl_hook_func_t *)NULL;
|
||||
|
||||
***************
|
||||
*** 502,506 ****
|
||||
/* Tell the completer that we might want to follow symbolic links or
|
||||
do other expansion on directory names. */
|
||||
! rl_directory_rewrite_hook = bash_directory_completion_hook;
|
||||
|
||||
rl_filename_rewrite_hook = bash_filename_rewrite_hook;
|
||||
--- 512,516 ----
|
||||
/* Tell the completer that we might want to follow symbolic links or
|
||||
do other expansion on directory names. */
|
||||
! set_directory_hook ();
|
||||
|
||||
rl_filename_rewrite_hook = bash_filename_rewrite_hook;
|
||||
***************
|
||||
*** 530,534 ****
|
||||
|
||||
/* characters that need to be quoted when appearing in filenames. */
|
||||
! rl_filename_quote_characters = " \t\n\\\"'@<>=;|&()#$`?*[!:{~"; /*}*/
|
||||
|
||||
rl_filename_quoting_function = bash_quote_filename;
|
||||
--- 540,544 ----
|
||||
|
||||
/* characters that need to be quoted when appearing in filenames. */
|
||||
! rl_filename_quote_characters = default_filename_quote_characters;
|
||||
|
||||
rl_filename_quoting_function = bash_quote_filename;
|
||||
***************
|
||||
*** 565,570 ****
|
||||
rl_attempted_completion_function = attempt_shell_completion;
|
||||
rl_completion_entry_function = NULL;
|
||||
- rl_directory_rewrite_hook = bash_directory_completion_hook;
|
||||
rl_ignore_some_completions_function = filename_completion_ignore;
|
||||
}
|
||||
|
||||
--- 575,582 ----
|
||||
rl_attempted_completion_function = attempt_shell_completion;
|
||||
rl_completion_entry_function = NULL;
|
||||
rl_ignore_some_completions_function = filename_completion_ignore;
|
||||
+ rl_filename_quote_characters = default_filename_quote_characters;
|
||||
+
|
||||
+ set_directory_hook ();
|
||||
}
|
||||
|
||||
***************
|
||||
*** 1280,1283 ****
|
||||
--- 1292,1298 ----
|
||||
rl_ignore_some_completions_function = filename_completion_ignore;
|
||||
|
||||
+ rl_filename_quote_characters = default_filename_quote_characters;
|
||||
+ set_directory_hook ();
|
||||
+
|
||||
/* Determine if this could be a command word. It is if it appears at
|
||||
the start of the line (ignoring preceding whitespace), or if it
|
||||
***************
|
||||
*** 1592,1595 ****
|
||||
--- 1607,1616 ----
|
||||
else
|
||||
{
|
||||
+ if (dircomplete_expand && dot_or_dotdot (filename_hint))
|
||||
+ {
|
||||
+ dircomplete_expand = 0;
|
||||
+ set_directory_hook ();
|
||||
+ dircomplete_expand = 1;
|
||||
+ }
|
||||
mapping_over = 4;
|
||||
goto inner;
|
||||
***************
|
||||
*** 1792,1795 ****
|
||||
--- 1813,1819 ----
|
||||
inner:
|
||||
val = rl_filename_completion_function (filename_hint, istate);
|
||||
+ if (mapping_over == 4 && dircomplete_expand)
|
||||
+ set_directory_hook ();
|
||||
+
|
||||
istate = 1;
|
||||
|
||||
***************
|
||||
*** 2694,2697 ****
|
||||
--- 2718,2767 ----
|
||||
}
|
||||
|
||||
+ /* Functions to save and restore the appropriate directory hook */
|
||||
+ /* This is not static so the shopt code can call it */
|
||||
+ void
|
||||
+ set_directory_hook ()
|
||||
+ {
|
||||
+ if (dircomplete_expand)
|
||||
+ {
|
||||
+ rl_directory_completion_hook = bash_directory_completion_hook;
|
||||
+ rl_directory_rewrite_hook = (rl_icppfunc_t *)0;
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ rl_directory_rewrite_hook = bash_directory_completion_hook;
|
||||
+ rl_directory_completion_hook = (rl_icppfunc_t *)0;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ static rl_icppfunc_t *
|
||||
+ save_directory_hook ()
|
||||
+ {
|
||||
+ rl_icppfunc_t *ret;
|
||||
+
|
||||
+ if (dircomplete_expand)
|
||||
+ {
|
||||
+ ret = rl_directory_completion_hook;
|
||||
+ rl_directory_completion_hook = (rl_icppfunc_t *)NULL;
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ ret = rl_directory_rewrite_hook;
|
||||
+ rl_directory_rewrite_hook = (rl_icppfunc_t *)NULL;
|
||||
+ }
|
||||
+
|
||||
+ return ret;
|
||||
+ }
|
||||
+
|
||||
+ static void
|
||||
+ restore_directory_hook (hookf)
|
||||
+ rl_icppfunc_t *hookf;
|
||||
+ {
|
||||
+ if (dircomplete_expand)
|
||||
+ rl_directory_completion_hook = hookf;
|
||||
+ else
|
||||
+ rl_directory_rewrite_hook = hookf;
|
||||
+ }
|
||||
+
|
||||
/* Handle symbolic link references and other directory name
|
||||
expansions while hacking completion. This should return 1 if it modifies
|
||||
***************
|
||||
*** 2703,2720 ****
|
||||
{
|
||||
char *local_dirname, *new_dirname, *t;
|
||||
! int return_value, should_expand_dirname;
|
||||
WORD_LIST *wl;
|
||||
struct stat sb;
|
||||
|
||||
! return_value = should_expand_dirname = 0;
|
||||
local_dirname = *dirname;
|
||||
|
||||
! if (mbschr (local_dirname, '$'))
|
||||
! should_expand_dirname = 1;
|
||||
else
|
||||
{
|
||||
t = mbschr (local_dirname, '`');
|
||||
if (t && unclosed_pair (local_dirname, strlen (local_dirname), "`") == 0)
|
||||
! should_expand_dirname = 1;
|
||||
}
|
||||
|
||||
--- 2773,2801 ----
|
||||
{
|
||||
char *local_dirname, *new_dirname, *t;
|
||||
! int return_value, should_expand_dirname, nextch, closer;
|
||||
WORD_LIST *wl;
|
||||
struct stat sb;
|
||||
|
||||
! return_value = should_expand_dirname = nextch = closer = 0;
|
||||
local_dirname = *dirname;
|
||||
|
||||
! if (t = mbschr (local_dirname, '$'))
|
||||
! {
|
||||
! should_expand_dirname = '$';
|
||||
! nextch = t[1];
|
||||
! /* Deliberately does not handle the deprecated $[...] arithmetic
|
||||
! expansion syntax */
|
||||
! if (nextch == '(')
|
||||
! closer = ')';
|
||||
! else if (nextch == '{')
|
||||
! closer = '}';
|
||||
! else
|
||||
! nextch = 0;
|
||||
! }
|
||||
else
|
||||
{
|
||||
t = mbschr (local_dirname, '`');
|
||||
if (t && unclosed_pair (local_dirname, strlen (local_dirname), "`") == 0)
|
||||
! should_expand_dirname = '`';
|
||||
}
|
||||
|
||||
***************
|
||||
*** 2740,2743 ****
|
||||
--- 2821,2841 ----
|
||||
dispose_words (wl);
|
||||
local_dirname = *dirname;
|
||||
+ /* XXX - change rl_filename_quote_characters here based on
|
||||
+ should_expand_dirname/nextch/closer. This is the only place
|
||||
+ custom_filename_quote_characters is modified. */
|
||||
+ if (rl_filename_quote_characters && *rl_filename_quote_characters)
|
||||
+ {
|
||||
+ int i, j, c;
|
||||
+ i = strlen (default_filename_quote_characters);
|
||||
+ custom_filename_quote_characters = xrealloc (custom_filename_quote_characters, i+1);
|
||||
+ for (i = j = 0; c = default_filename_quote_characters[i]; i++)
|
||||
+ {
|
||||
+ if (c == should_expand_dirname || c == nextch || c == closer)
|
||||
+ continue;
|
||||
+ custom_filename_quote_characters[j++] = c;
|
||||
+ }
|
||||
+ custom_filename_quote_characters[j] = '\0';
|
||||
+ rl_filename_quote_characters = custom_filename_quote_characters;
|
||||
+ }
|
||||
}
|
||||
else
|
||||
***************
|
||||
*** 2759,2762 ****
|
||||
--- 2857,2871 ----
|
||||
}
|
||||
|
||||
+ /* no_symbolic_links == 0 -> use (default) logical view of the file system.
|
||||
+ local_dirname[0] == '.' && local_dirname[1] == '/' means files in the
|
||||
+ current directory (./).
|
||||
+ local_dirname[0] == '.' && local_dirname[1] == 0 means relative pathnames
|
||||
+ in the current directory (e.g., lib/sh).
|
||||
+ XXX - should we do spelling correction on these? */
|
||||
+
|
||||
+ /* This is test as it was in bash-4.2: skip relative pathnames in current
|
||||
+ directory. Change test to
|
||||
+ (local_dirname[0] != '.' || (local_dirname[1] && local_dirname[1] != '/'))
|
||||
+ if we want to skip paths beginning with ./ also. */
|
||||
if (no_symbolic_links == 0 && (local_dirname[0] != '.' || local_dirname[1]))
|
||||
{
|
||||
***************
|
||||
*** 2764,2767 ****
|
||||
--- 2873,2885 ----
|
||||
int len1, len2;
|
||||
|
||||
+ /* If we have a relative path
|
||||
+ (local_dirname[0] != '/' && local_dirname[0] != '.')
|
||||
+ that is canonical after appending it to the current directory, then
|
||||
+ temp1 = temp2+'/'
|
||||
+ That is,
|
||||
+ strcmp (temp1, temp2) == 0
|
||||
+ after adding a slash to temp2 below. It should be safe to not
|
||||
+ change those.
|
||||
+ */
|
||||
t = get_working_directory ("symlink-hook");
|
||||
temp1 = make_absolute (local_dirname, t);
|
||||
***************
|
||||
*** 2798,2802 ****
|
||||
}
|
||||
}
|
||||
! return_value |= STREQ (local_dirname, temp2) == 0;
|
||||
free (local_dirname);
|
||||
*dirname = temp2;
|
||||
--- 2916,2928 ----
|
||||
}
|
||||
}
|
||||
!
|
||||
! /* dircomplete_expand_relpath == 0 means we want to leave relative
|
||||
! pathnames that are unchanged by canonicalization alone.
|
||||
! *local_dirname != '/' && *local_dirname != '.' == relative pathname
|
||||
! (consistent with general.c:absolute_pathname())
|
||||
! temp1 == temp2 (after appending a slash to temp2) means the pathname
|
||||
! is not changed by canonicalization as described above. */
|
||||
! if (dircomplete_expand_relpath || ((local_dirname[0] != '/' && local_dirname[0] != '.') && STREQ (temp1, temp2) == 0))
|
||||
! return_value |= STREQ (local_dirname, temp2) == 0;
|
||||
free (local_dirname);
|
||||
*dirname = temp2;
|
||||
***************
|
||||
*** 3003,3012 ****
|
||||
orig_func = rl_completion_entry_function;
|
||||
orig_attempt_func = rl_attempted_completion_function;
|
||||
- orig_dir_func = rl_directory_rewrite_hook;
|
||||
orig_ignore_func = rl_ignore_some_completions_function;
|
||||
orig_rl_completer_word_break_characters = rl_completer_word_break_characters;
|
||||
rl_completion_entry_function = rl_filename_completion_function;
|
||||
rl_attempted_completion_function = (rl_completion_func_t *)NULL;
|
||||
- rl_directory_rewrite_hook = (rl_icppfunc_t *)NULL;
|
||||
rl_ignore_some_completions_function = filename_completion_ignore;
|
||||
rl_completer_word_break_characters = " \t\n\"\'";
|
||||
--- 3129,3139 ----
|
||||
orig_func = rl_completion_entry_function;
|
||||
orig_attempt_func = rl_attempted_completion_function;
|
||||
orig_ignore_func = rl_ignore_some_completions_function;
|
||||
orig_rl_completer_word_break_characters = rl_completer_word_break_characters;
|
||||
+
|
||||
+ orig_dir_func = save_directory_hook ();
|
||||
+
|
||||
rl_completion_entry_function = rl_filename_completion_function;
|
||||
rl_attempted_completion_function = (rl_completion_func_t *)NULL;
|
||||
rl_ignore_some_completions_function = filename_completion_ignore;
|
||||
rl_completer_word_break_characters = " \t\n\"\'";
|
||||
***************
|
||||
*** 3016,3023 ****
|
||||
rl_completion_entry_function = orig_func;
|
||||
rl_attempted_completion_function = orig_attempt_func;
|
||||
- rl_directory_rewrite_hook = orig_dir_func;
|
||||
rl_ignore_some_completions_function = orig_ignore_func;
|
||||
rl_completer_word_break_characters = orig_rl_completer_word_break_characters;
|
||||
|
||||
return r;
|
||||
}
|
||||
--- 3143,3151 ----
|
||||
rl_completion_entry_function = orig_func;
|
||||
rl_attempted_completion_function = orig_attempt_func;
|
||||
rl_ignore_some_completions_function = orig_ignore_func;
|
||||
rl_completer_word_break_characters = orig_rl_completer_word_break_characters;
|
||||
|
||||
+ restore_directory_hook (orig_dir_func);
|
||||
+
|
||||
return r;
|
||||
}
|
||||
diff -NrC 2 ../bash-4.2-patched/bashline.h ./bashline.h
|
||||
*** ../bash-4.2-patched/bashline.h 2009-01-04 14:32:22.000000000 -0500
|
||||
--- ./bashline.h 2012-05-07 16:27:18.000000000 -0400
|
||||
***************
|
||||
*** 34,41 ****
|
||||
--- 34,46 ----
|
||||
extern int bash_re_edit __P((char *));
|
||||
|
||||
+ extern void bashline_set_event_hook __P((void));
|
||||
+ extern void bashline_reset_event_hook __P((void));
|
||||
+
|
||||
extern int bind_keyseq_to_unix_command __P((char *));
|
||||
|
||||
extern char **bash_default_completion __P((const char *, int, int, int, int));
|
||||
|
||||
+ void set_directory_hook __P((void));
|
||||
+
|
||||
/* Used by programmable completion code. */
|
||||
extern char *command_word_completion_function __P((const char *, int));
|
||||
diff -NrC 2 ../bash-4.2-patched/builtins/shopt.def ./builtins/shopt.def
|
||||
*** ../bash-4.2-patched/builtins/shopt.def 2010-07-02 22:42:44.000000000 -0400
|
||||
--- ./builtins/shopt.def 2012-05-07 16:27:18.000000000 -0400
|
||||
***************
|
||||
*** 62,65 ****
|
||||
--- 62,69 ----
|
||||
#include "bashgetopt.h"
|
||||
|
||||
+ #if defined (READLINE)
|
||||
+ # include "../bashline.h"
|
||||
+ #endif
|
||||
+
|
||||
#if defined (HISTORY)
|
||||
# include "../bashhist.h"
|
||||
***************
|
||||
*** 95,99 ****
|
||||
extern int no_empty_command_completion;
|
||||
extern int force_fignore;
|
||||
! extern int dircomplete_spelling;
|
||||
|
||||
extern int enable_hostname_completion __P((int));
|
||||
--- 99,103 ----
|
||||
extern int no_empty_command_completion;
|
||||
extern int force_fignore;
|
||||
! extern int dircomplete_spelling, dircomplete_expand;
|
||||
|
||||
extern int enable_hostname_completion __P((int));
|
||||
***************
|
||||
*** 122,125 ****
|
||||
--- 126,133 ----
|
||||
#endif
|
||||
|
||||
+ #if defined (READLINE)
|
||||
+ static int shopt_set_complete_direxpand __P((char *, int));
|
||||
+ #endif
|
||||
+
|
||||
static int shopt_login_shell;
|
||||
static int shopt_compat31;
|
||||
***************
|
||||
*** 151,154 ****
|
||||
--- 159,163 ----
|
||||
{ "compat41", &shopt_compat41, set_compatibility_level },
|
||||
#if defined (READLINE)
|
||||
+ { "direxpand", &dircomplete_expand, shopt_set_complete_direxpand },
|
||||
{ "dirspell", &dircomplete_spelling, (shopt_set_func_t *)NULL },
|
||||
#endif
|
||||
***************
|
||||
*** 536,539 ****
|
||||
--- 545,559 ----
|
||||
}
|
||||
|
||||
+ #if defined (READLINE)
|
||||
+ static int
|
||||
+ shopt_set_complete_direxpand (option_name, mode)
|
||||
+ char *option_name;
|
||||
+ int mode;
|
||||
+ {
|
||||
+ set_directory_hook ();
|
||||
+ return 0;
|
||||
+ }
|
||||
+ #endif
|
||||
+
|
||||
#if defined (RESTRICTED_SHELL)
|
||||
/* Don't allow the value of restricted_shell to be modified. */
|
||||
Binary files ../bash-4.2-patched/doc/._bashref.pdf and ./doc/._bashref.pdf differ
|
||||
diff -NrC 2 ../bash-4.2-patched/doc/bash.1 ./doc/bash.1
|
||||
*** ../bash-4.2-patched/doc/bash.1 2011-01-16 15:31:39.000000000 -0500
|
||||
--- ./doc/bash.1 2012-05-07 16:27:18.000000000 -0400
|
||||
***************
|
||||
*** 8949,8952 ****
|
||||
--- 8949,8962 ----
|
||||
The default bash behavior remains as in previous versions.
|
||||
.TP 8
|
||||
+ .B direxpand
|
||||
+ If set,
|
||||
+ .B bash
|
||||
+ replaces directory names with the results of word expansion when performing
|
||||
+ filename completion. This changes the contents of the readline editing
|
||||
+ buffer.
|
||||
+ If not set,
|
||||
+ .B bash
|
||||
+ attempts to preserve what the user typed.
|
||||
+ .TP 8
|
||||
.B dirspell
|
||||
If set,
|
||||
diff -NrC 2 ../bash-4.2-patched/doc/bashref.texi ./doc/bashref.texi
|
||||
*** ../bash-4.2-patched/doc/bashref.texi 2011-01-16 15:31:57.000000000 -0500
|
||||
--- ./doc/bashref.texi 2012-05-07 16:27:18.000000000 -0400
|
||||
***************
|
||||
*** 4536,4539 ****
|
||||
--- 4536,4546 ----
|
||||
The default Bash behavior remains as in previous versions.
|
||||
|
||||
+ @item direxpand
|
||||
+ If set, Bash
|
||||
+ replaces directory names with the results of word expansion when performing
|
||||
+ filename completion. This changes the contents of the readline editing
|
||||
+ buffer.
|
||||
+ If not set, Bash attempts to preserve what the user typed.
|
||||
+
|
||||
@item dirspell
|
||||
If set, Bash
|
||||
diff -NrC 2 ../bash-4.2-patched/tests/shopt.right ./tests/shopt.right
|
||||
*** ../bash-4.2-patched/tests/shopt.right 2010-07-02 23:36:30.000000000 -0400
|
||||
--- ./tests/shopt.right 2012-05-07 16:27:18.000000000 -0400
|
||||
***************
|
||||
*** 13,16 ****
|
||||
--- 13,17 ----
|
||||
shopt -u compat40
|
||||
shopt -u compat41
|
||||
+ shopt -u direxpand
|
||||
shopt -u dirspell
|
||||
shopt -u dotglob
|
||||
***************
|
||||
*** 69,72 ****
|
||||
--- 70,74 ----
|
||||
shopt -u compat40
|
||||
shopt -u compat41
|
||||
+ shopt -u direxpand
|
||||
shopt -u dirspell
|
||||
shopt -u dotglob
|
||||
***************
|
||||
*** 102,105 ****
|
||||
--- 104,108 ----
|
||||
compat40 off
|
||||
compat41 off
|
||||
+ direxpand off
|
||||
dirspell off
|
||||
dotglob off
|
||||
*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
|
||||
--- patchlevel.h Thu Feb 24 21:41:34 2011
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 28
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 29
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
178
packages/sysutils/bash/patches.upstream/bash42-030.patch
Normal file
178
packages/sysutils/bash/patches.upstream/bash42-030.patch
Normal file
@ -0,0 +1,178 @@
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.2
|
||||
Patch-ID: bash42-030
|
||||
|
||||
Bug-Reported-by: Roman Rakus <rrakus@redhat.com>
|
||||
Bug-Reference-ID: <4D7DD91E.7040808@redhat.com>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2011-03/msg00126.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
When attempting to glob strings in a multibyte locale, and those strings
|
||||
contain invalid multibyte characters that cause mbsnrtowcs to return 0,
|
||||
the globbing code loops infinitely.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** ../bash-4.2-patched/lib/glob/xmbsrtowcs.c 2010-05-30 18:36:27.000000000 -0400
|
||||
--- lib/glob/xmbsrtowcs.c 2011-03-22 16:06:47.000000000 -0400
|
||||
***************
|
||||
*** 36,39 ****
|
||||
--- 36,41 ----
|
||||
#if HANDLE_MULTIBYTE
|
||||
|
||||
+ #define WSBUF_INC 32
|
||||
+
|
||||
#ifndef FREE
|
||||
# define FREE(x) do { if (x) free (x); } while (0)
|
||||
***************
|
||||
*** 149,153 ****
|
||||
size_t wcnum; /* Number of wide characters in WSBUF */
|
||||
mbstate_t state; /* Conversion State */
|
||||
! size_t wcslength; /* Number of wide characters produced by the conversion. */
|
||||
const char *end_or_backslash;
|
||||
size_t nms; /* Number of multibyte characters to convert at one time. */
|
||||
--- 151,155 ----
|
||||
size_t wcnum; /* Number of wide characters in WSBUF */
|
||||
mbstate_t state; /* Conversion State */
|
||||
! size_t n, wcslength; /* Number of wide characters produced by the conversion. */
|
||||
const char *end_or_backslash;
|
||||
size_t nms; /* Number of multibyte characters to convert at one time. */
|
||||
***************
|
||||
*** 172,176 ****
|
||||
tmp_p = p;
|
||||
tmp_state = state;
|
||||
! wcslength = mbsnrtowcs(NULL, &tmp_p, nms, 0, &tmp_state);
|
||||
|
||||
/* Conversion failed. */
|
||||
--- 174,189 ----
|
||||
tmp_p = p;
|
||||
tmp_state = state;
|
||||
!
|
||||
! if (nms == 0 && *p == '\\') /* special initial case */
|
||||
! nms = wcslength = 1;
|
||||
! else
|
||||
! wcslength = mbsnrtowcs (NULL, &tmp_p, nms, 0, &tmp_state);
|
||||
!
|
||||
! if (wcslength == 0)
|
||||
! {
|
||||
! tmp_p = p; /* will need below */
|
||||
! tmp_state = state;
|
||||
! wcslength = 1; /* take a single byte */
|
||||
! }
|
||||
|
||||
/* Conversion failed. */
|
||||
***************
|
||||
*** 187,191 ****
|
||||
wchar_t *wstmp;
|
||||
|
||||
! wsbuf_size = wcnum+wcslength+1; /* 1 for the L'\0' or the potential L'\\' */
|
||||
|
||||
wstmp = (wchar_t *) realloc (wsbuf, wsbuf_size * sizeof (wchar_t));
|
||||
--- 200,205 ----
|
||||
wchar_t *wstmp;
|
||||
|
||||
! while (wsbuf_size < wcnum+wcslength+1) /* 1 for the L'\0' or the potential L'\\' */
|
||||
! wsbuf_size += WSBUF_INC;
|
||||
|
||||
wstmp = (wchar_t *) realloc (wsbuf, wsbuf_size * sizeof (wchar_t));
|
||||
***************
|
||||
*** 200,207 ****
|
||||
|
||||
/* Perform the conversion. This is assumed to return 'wcslength'.
|
||||
! * It may set 'p' to NULL. */
|
||||
! mbsnrtowcs(wsbuf+wcnum, &p, nms, wsbuf_size-wcnum, &state);
|
||||
|
||||
! wcnum += wcslength;
|
||||
|
||||
if (mbsinit (&state) && (p != NULL) && (*p == '\\'))
|
||||
--- 214,229 ----
|
||||
|
||||
/* Perform the conversion. This is assumed to return 'wcslength'.
|
||||
! It may set 'p' to NULL. */
|
||||
! n = mbsnrtowcs(wsbuf+wcnum, &p, nms, wsbuf_size-wcnum, &state);
|
||||
|
||||
! /* Compensate for taking single byte on wcs conversion failure above. */
|
||||
! if (wcslength == 1 && (n == 0 || n == (size_t)-1))
|
||||
! {
|
||||
! state = tmp_state;
|
||||
! p = tmp_p;
|
||||
! wsbuf[wcnum++] = *p++;
|
||||
! }
|
||||
! else
|
||||
! wcnum += wcslength;
|
||||
|
||||
if (mbsinit (&state) && (p != NULL) && (*p == '\\'))
|
||||
***************
|
||||
*** 231,236 ****
|
||||
of DESTP and INDICESP are NULL. */
|
||||
|
||||
- #define WSBUF_INC 32
|
||||
-
|
||||
size_t
|
||||
xdupmbstowcs (destp, indicesp, src)
|
||||
--- 253,256 ----
|
||||
*** ../bash-4.2-patched/lib/glob/glob.c 2009-11-14 18:39:30.000000000 -0500
|
||||
--- lib/glob/glob.c 2012-07-07 12:09:56.000000000 -0400
|
||||
***************
|
||||
*** 201,206 ****
|
||||
size_t pat_n, dn_n;
|
||||
|
||||
pat_n = xdupmbstowcs (&pat_wc, NULL, pat);
|
||||
! dn_n = xdupmbstowcs (&dn_wc, NULL, dname);
|
||||
|
||||
ret = 0;
|
||||
--- 201,209 ----
|
||||
size_t pat_n, dn_n;
|
||||
|
||||
+ pat_wc = dn_wc = (wchar_t *)NULL;
|
||||
+
|
||||
pat_n = xdupmbstowcs (&pat_wc, NULL, pat);
|
||||
! if (pat_n != (size_t)-1)
|
||||
! dn_n = xdupmbstowcs (&dn_wc, NULL, dname);
|
||||
|
||||
ret = 0;
|
||||
***************
|
||||
*** 222,225 ****
|
||||
--- 225,230 ----
|
||||
ret = 1;
|
||||
}
|
||||
+ else
|
||||
+ ret = skipname (pat, dname, flags);
|
||||
|
||||
FREE (pat_wc);
|
||||
***************
|
||||
*** 267,272 ****
|
||||
n = xdupmbstowcs (&wpathname, NULL, pathname);
|
||||
if (n == (size_t) -1)
|
||||
! /* Something wrong. */
|
||||
! return;
|
||||
orig_wpathname = wpathname;
|
||||
|
||||
--- 272,280 ----
|
||||
n = xdupmbstowcs (&wpathname, NULL, pathname);
|
||||
if (n == (size_t) -1)
|
||||
! {
|
||||
! /* Something wrong. Fall back to single-byte */
|
||||
! udequote_pathname (pathname);
|
||||
! return;
|
||||
! }
|
||||
orig_wpathname = wpathname;
|
||||
|
||||
*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
|
||||
--- patchlevel.h Thu Feb 24 21:41:34 2011
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 29
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 30
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
80
packages/sysutils/bash/patches.upstream/bash42-031.patch
Normal file
80
packages/sysutils/bash/patches.upstream/bash42-031.patch
Normal file
@ -0,0 +1,80 @@
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.2
|
||||
Patch-ID: bash42-031
|
||||
|
||||
Bug-Reported-by: Max Horn <max@quendi.de>
|
||||
Bug-Reference-ID: <20CC5C60-07C3-4E41-9817-741E48D407C5@quendi.de>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-readline/2012-06/msg00005.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
A change between bash-4.1 and bash-4.2 to prevent the readline input hook
|
||||
from being called too frequently had the side effect of causing delays
|
||||
when reading pasted input on systems such as Mac OS X. This patch fixes
|
||||
those delays while retaining the bash-4.2 behavior.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** ../bash-4.2-patched/lib/readline/input.c 2010-05-30 18:33:01.000000000 -0400
|
||||
--- lib/readline/input.c 2012-06-25 21:08:42.000000000 -0400
|
||||
***************
|
||||
*** 410,414 ****
|
||||
rl_read_key ()
|
||||
{
|
||||
! int c;
|
||||
|
||||
rl_key_sequence_length++;
|
||||
--- 412,416 ----
|
||||
rl_read_key ()
|
||||
{
|
||||
! int c, r;
|
||||
|
||||
rl_key_sequence_length++;
|
||||
***************
|
||||
*** 430,441 ****
|
||||
while (rl_event_hook)
|
||||
{
|
||||
! if (rl_gather_tyi () < 0) /* XXX - EIO */
|
||||
{
|
||||
rl_done = 1;
|
||||
return ('\n');
|
||||
}
|
||||
RL_CHECK_SIGNALS ();
|
||||
- if (rl_get_char (&c) != 0)
|
||||
- break;
|
||||
if (rl_done) /* XXX - experimental */
|
||||
return ('\n');
|
||||
--- 432,447 ----
|
||||
while (rl_event_hook)
|
||||
{
|
||||
! if (rl_get_char (&c) != 0)
|
||||
! break;
|
||||
!
|
||||
! if ((r = rl_gather_tyi ()) < 0) /* XXX - EIO */
|
||||
{
|
||||
rl_done = 1;
|
||||
return ('\n');
|
||||
}
|
||||
+ else if (r == 1) /* read something */
|
||||
+ continue;
|
||||
+
|
||||
RL_CHECK_SIGNALS ();
|
||||
if (rl_done) /* XXX - experimental */
|
||||
return ('\n');
|
||||
*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
|
||||
--- patchlevel.h Thu Feb 24 21:41:34 2011
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 30
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 31
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
75
packages/sysutils/bash/patches.upstream/bash42-032.patch
Normal file
75
packages/sysutils/bash/patches.upstream/bash42-032.patch
Normal file
@ -0,0 +1,75 @@
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.2
|
||||
Patch-ID: bash42-032
|
||||
|
||||
Bug-Reported-by: Ruediger Kuhlmann <RKuhlmann@orga-systems.com>
|
||||
Bug-Reference-ID: <OFDE975207.0C3622E5-ONC12579F3.00361A06-C12579F3.00365E39@orga-systems.com>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-05/msg00010.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
Bash-4.2 has problems with DEL characters in the expanded value of variables
|
||||
used in the same quoted string as variables that expand to nothing.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** ../bash-20120427/subst.c 2012-04-22 16:19:10.000000000 -0400
|
||||
--- subst.c 2012-05-07 16:06:35.000000000 -0400
|
||||
***************
|
||||
*** 8152,8155 ****
|
||||
--- 8152,8163 ----
|
||||
dispose_word_desc (tword);
|
||||
|
||||
+ /* Kill quoted nulls; we will add them back at the end of
|
||||
+ expand_word_internal if nothing else in the string */
|
||||
+ if (had_quoted_null && temp && QUOTED_NULL (temp))
|
||||
+ {
|
||||
+ FREE (temp);
|
||||
+ temp = (char *)NULL;
|
||||
+ }
|
||||
+
|
||||
goto add_string;
|
||||
break;
|
||||
***************
|
||||
*** 8556,8560 ****
|
||||
if (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES))
|
||||
tword->flags |= W_QUOTED;
|
||||
! if (had_quoted_null)
|
||||
tword->flags |= W_HASQUOTEDNULL;
|
||||
list = make_word_list (tword, (WORD_LIST *)NULL);
|
||||
--- 8564,8568 ----
|
||||
if (quoted & (Q_HERE_DOCUMENT|Q_DOUBLE_QUOTES))
|
||||
tword->flags |= W_QUOTED;
|
||||
! if (had_quoted_null && QUOTED_NULL (istring))
|
||||
tword->flags |= W_HASQUOTEDNULL;
|
||||
list = make_word_list (tword, (WORD_LIST *)NULL);
|
||||
***************
|
||||
*** 8587,8591 ****
|
||||
if (word->flags & W_NOEXPAND)
|
||||
tword->flags |= W_NOEXPAND;
|
||||
! if (had_quoted_null)
|
||||
tword->flags |= W_HASQUOTEDNULL; /* XXX */
|
||||
list = make_word_list (tword, (WORD_LIST *)NULL);
|
||||
--- 8595,8599 ----
|
||||
if (word->flags & W_NOEXPAND)
|
||||
tword->flags |= W_NOEXPAND;
|
||||
! if (had_quoted_null && QUOTED_NULL (istring))
|
||||
tword->flags |= W_HASQUOTEDNULL; /* XXX */
|
||||
list = make_word_list (tword, (WORD_LIST *)NULL);
|
||||
*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
|
||||
--- patchlevel.h Thu Feb 24 21:41:34 2011
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 31
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 32
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
57
packages/sysutils/bash/patches.upstream/bash42-033.patch
Normal file
57
packages/sysutils/bash/patches.upstream/bash42-033.patch
Normal file
@ -0,0 +1,57 @@
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.2
|
||||
Patch-ID: bash42-033
|
||||
|
||||
Bug-Reported-by: David Leverton <levertond@googlemail.com>
|
||||
Bug-Reference-ID: <4FCCE737.1060603@googlemail.com>
|
||||
Bug-Reference-URL:
|
||||
|
||||
Bug-Description:
|
||||
|
||||
Bash uses a static buffer when expanding the /dev/fd prefix for the test
|
||||
and conditional commands, among other uses, when it should use a dynamic
|
||||
buffer to avoid buffer overflow.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** ../bash-4.2-patched/lib/sh/eaccess.c 2011-01-08 20:50:10.000000000 -0500
|
||||
--- lib/sh/eaccess.c 2012-06-04 21:06:43.000000000 -0400
|
||||
***************
|
||||
*** 83,86 ****
|
||||
--- 83,88 ----
|
||||
struct stat *finfo;
|
||||
{
|
||||
+ static char *pbuf = 0;
|
||||
+
|
||||
if (*path == '\0')
|
||||
{
|
||||
***************
|
||||
*** 107,111 ****
|
||||
On most systems, with the notable exception of linux, this is
|
||||
effectively a no-op. */
|
||||
! char pbuf[32];
|
||||
strcpy (pbuf, DEV_FD_PREFIX);
|
||||
strcat (pbuf, path + 8);
|
||||
--- 109,113 ----
|
||||
On most systems, with the notable exception of linux, this is
|
||||
effectively a no-op. */
|
||||
! pbuf = xrealloc (pbuf, sizeof (DEV_FD_PREFIX) + strlen (path + 8));
|
||||
strcpy (pbuf, DEV_FD_PREFIX);
|
||||
strcat (pbuf, path + 8);
|
||||
*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
|
||||
--- patchlevel.h Thu Feb 24 21:41:34 2011
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 32
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 33
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
46
packages/sysutils/bash/patches.upstream/bash42-034.patch
Normal file
46
packages/sysutils/bash/patches.upstream/bash42-034.patch
Normal file
@ -0,0 +1,46 @@
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.2
|
||||
Patch-ID: bash42-034
|
||||
|
||||
Bug-Reported-by: "Davide Brini" <dave_br@gmx.com>
|
||||
Bug-Reference-ID: <20120604164154.69781EC04B@imaps.oficinas.atrapalo.com>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-06/msg00030.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
In bash-4.2, the history code would inappropriately add a semicolon to
|
||||
multi-line compound array assignments when adding them to the history.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** ../bash-4.2-patched/parse.y 2011-11-21 18:03:36.000000000 -0500
|
||||
--- parse.y 2012-06-07 12:48:47.000000000 -0400
|
||||
***************
|
||||
*** 4900,4905 ****
|
||||
--- 4916,4924 ----
|
||||
return (current_command_line_count == 2 ? "\n" : "");
|
||||
}
|
||||
|
||||
+ if (parser_state & PST_COMPASSIGN)
|
||||
+ return (" ");
|
||||
+
|
||||
/* First, handle some special cases. */
|
||||
/*(*/
|
||||
/* If we just read `()', assume it's a function definition, and don't
|
||||
*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
|
||||
--- patchlevel.h Thu Feb 24 21:41:34 2011
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 33
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 34
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
66
packages/sysutils/bash/patches.upstream/bash42-035.patch
Normal file
66
packages/sysutils/bash/patches.upstream/bash42-035.patch
Normal file
@ -0,0 +1,66 @@
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.2
|
||||
Patch-ID: bash42-035
|
||||
|
||||
Bug-Reported-by: Dan Douglas <ormaaj@gmail.com>
|
||||
Bug-Reference-ID: <2766482.Ksm3GrSoYi@smorgbox>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-06/msg00071.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
When given a number of lines to read, `mapfile -n lines' reads one too many.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** ../bash-4.2-patched/builtins/mapfile.def 2010-05-29 22:09:47.000000000 -0400
|
||||
--- builtins/mapfile.def 2012-06-20 09:48:33.000000000 -0400
|
||||
***************
|
||||
*** 196,206 ****
|
||||
interrupt_immediately++;
|
||||
for (array_index = origin, line_count = 1;
|
||||
! zgetline (fd, &line, &line_length, unbuffered_read) != -1;
|
||||
! array_index++, line_count++)
|
||||
{
|
||||
- /* Have we exceeded # of lines to store? */
|
||||
- if (line_count_goal != 0 && line_count > line_count_goal)
|
||||
- break;
|
||||
-
|
||||
/* Remove trailing newlines? */
|
||||
if (flags & MAPF_CHOP)
|
||||
--- 196,202 ----
|
||||
interrupt_immediately++;
|
||||
for (array_index = origin, line_count = 1;
|
||||
! zgetline (fd, &line, &line_length, unbuffered_read) != -1;
|
||||
! array_index++)
|
||||
{
|
||||
/* Remove trailing newlines? */
|
||||
if (flags & MAPF_CHOP)
|
||||
***************
|
||||
*** 218,221 ****
|
||||
--- 214,222 ----
|
||||
|
||||
bind_array_element (entry, array_index, line, 0);
|
||||
+
|
||||
+ /* Have we exceeded # of lines to store? */
|
||||
+ line_count++;
|
||||
+ if (line_count_goal != 0 && line_count > line_count_goal)
|
||||
+ break;
|
||||
}
|
||||
|
||||
*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
|
||||
--- patchlevel.h Thu Feb 24 21:41:34 2011
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 34
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 35
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
92
packages/sysutils/bash/patches.upstream/bash42-036.patch
Normal file
92
packages/sysutils/bash/patches.upstream/bash42-036.patch
Normal file
@ -0,0 +1,92 @@
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.2
|
||||
Patch-ID: bash42-036
|
||||
|
||||
Bug-Reported-by: gregrwm <backuppc-users@whitleymott.net>
|
||||
Bug-Reference-ID: <CAD+dB9B4JG+qUwZBQUwiQmVt0j6NDn=DDTxr9R+nkA8DL4KLJA@mail.gmail.com>
|
||||
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2012-05/msg00108.html
|
||||
|
||||
Bug-Description:
|
||||
|
||||
Bash-4.2 produces incorrect word splitting results when expanding
|
||||
double-quoted $@ in the same string as and adjacent to other variable
|
||||
expansions. The $@ should be split, the other expansions should not.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** ../bash-4.2-patched/subst.c 2012-05-02 12:02:33.000000000 -0400
|
||||
--- subst.c 2012-07-08 21:19:32.000000000 -0400
|
||||
***************
|
||||
*** 7923,7927 ****
|
||||
/* State flags */
|
||||
int had_quoted_null;
|
||||
! int has_dollar_at;
|
||||
int tflag;
|
||||
int pflags; /* flags passed to param_expand */
|
||||
--- 7923,7927 ----
|
||||
/* State flags */
|
||||
int had_quoted_null;
|
||||
! int has_dollar_at, temp_has_dollar_at;
|
||||
int tflag;
|
||||
int pflags; /* flags passed to param_expand */
|
||||
***************
|
||||
*** 8128,8138 ****
|
||||
*expanded_something = 1;
|
||||
|
||||
! has_dollar_at = 0;
|
||||
pflags = (word->flags & W_NOCOMSUB) ? PF_NOCOMSUB : 0;
|
||||
if (word->flags & W_NOSPLIT2)
|
||||
pflags |= PF_NOSPLIT2;
|
||||
tword = param_expand (string, &sindex, quoted, expanded_something,
|
||||
! &has_dollar_at, "ed_dollar_at,
|
||||
&had_quoted_null, pflags);
|
||||
|
||||
if (tword == &expand_wdesc_error || tword == &expand_wdesc_fatal)
|
||||
--- 8128,8139 ----
|
||||
*expanded_something = 1;
|
||||
|
||||
! temp_has_dollar_at = 0;
|
||||
pflags = (word->flags & W_NOCOMSUB) ? PF_NOCOMSUB : 0;
|
||||
if (word->flags & W_NOSPLIT2)
|
||||
pflags |= PF_NOSPLIT2;
|
||||
tword = param_expand (string, &sindex, quoted, expanded_something,
|
||||
! &temp_has_dollar_at, "ed_dollar_at,
|
||||
&had_quoted_null, pflags);
|
||||
+ has_dollar_at += temp_has_dollar_at;
|
||||
|
||||
if (tword == &expand_wdesc_error || tword == &expand_wdesc_fatal)
|
||||
***************
|
||||
*** 8275,8281 ****
|
||||
temp = (char *)NULL;
|
||||
|
||||
! has_dollar_at = 0;
|
||||
/* Need to get W_HASQUOTEDNULL flag through this function. */
|
||||
! list = expand_word_internal (tword, Q_DOUBLE_QUOTES, 0, &has_dollar_at, (int *)NULL);
|
||||
|
||||
if (list == &expand_word_error || list == &expand_word_fatal)
|
||||
--- 8276,8283 ----
|
||||
temp = (char *)NULL;
|
||||
|
||||
! temp_has_dollar_at = 0; /* XXX */
|
||||
/* Need to get W_HASQUOTEDNULL flag through this function. */
|
||||
! list = expand_word_internal (tword, Q_DOUBLE_QUOTES, 0, &temp_has_dollar_at, (int *)NULL);
|
||||
! has_dollar_at += temp_has_dollar_at;
|
||||
|
||||
if (list == &expand_word_error || list == &expand_word_fatal)
|
||||
*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
|
||||
--- patchlevel.h Thu Feb 24 21:41:34 2011
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 35
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 36
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
112
packages/sysutils/bash/patches.upstream/bash42-037.patch
Normal file
112
packages/sysutils/bash/patches.upstream/bash42-037.patch
Normal file
@ -0,0 +1,112 @@
|
||||
BASH PATCH REPORT
|
||||
=================
|
||||
|
||||
Bash-Release: 4.2
|
||||
Patch-ID: bash42-037
|
||||
|
||||
Bug-Reported-by: Jakub Filak
|
||||
Bug-Reference-ID:
|
||||
Bug-Reference-URL: https://bugzilla.redhat.com/show_bug.cgi?id=813289
|
||||
|
||||
Bug-Description:
|
||||
|
||||
Attempting to redo (using `.') the vi editing mode `cc', `dd', or `yy'
|
||||
commands leads to an infinite loop.
|
||||
|
||||
Patch (apply with `patch -p0'):
|
||||
|
||||
*** ../bash-4.2-patched/lib/readline/vi_mode.c 2011-02-25 11:17:02.000000000 -0500
|
||||
--- lib/readline/vi_mode.c 2012-06-02 12:24:47.000000000 -0400
|
||||
***************
|
||||
*** 1235,1243 ****
|
||||
r = rl_domove_motion_callback (_rl_vimvcxt);
|
||||
}
|
||||
! else if (vi_redoing)
|
||||
{
|
||||
_rl_vimvcxt->motion = _rl_vi_last_motion;
|
||||
r = rl_domove_motion_callback (_rl_vimvcxt);
|
||||
}
|
||||
#if defined (READLINE_CALLBACKS)
|
||||
else if (RL_ISSTATE (RL_STATE_CALLBACK))
|
||||
--- 1297,1313 ----
|
||||
r = rl_domove_motion_callback (_rl_vimvcxt);
|
||||
}
|
||||
! else if (vi_redoing && _rl_vi_last_motion != 'd') /* `dd' is special */
|
||||
{
|
||||
_rl_vimvcxt->motion = _rl_vi_last_motion;
|
||||
r = rl_domove_motion_callback (_rl_vimvcxt);
|
||||
}
|
||||
+ else if (vi_redoing) /* handle redoing `dd' here */
|
||||
+ {
|
||||
+ _rl_vimvcxt->motion = _rl_vi_last_motion;
|
||||
+ rl_mark = rl_end;
|
||||
+ rl_beg_of_line (1, key);
|
||||
+ RL_UNSETSTATE (RL_STATE_VIMOTION);
|
||||
+ r = vidomove_dispatch (_rl_vimvcxt);
|
||||
+ }
|
||||
#if defined (READLINE_CALLBACKS)
|
||||
else if (RL_ISSTATE (RL_STATE_CALLBACK))
|
||||
***************
|
||||
*** 1317,1325 ****
|
||||
r = rl_domove_motion_callback (_rl_vimvcxt);
|
||||
}
|
||||
! else if (vi_redoing)
|
||||
{
|
||||
_rl_vimvcxt->motion = _rl_vi_last_motion;
|
||||
r = rl_domove_motion_callback (_rl_vimvcxt);
|
||||
}
|
||||
#if defined (READLINE_CALLBACKS)
|
||||
else if (RL_ISSTATE (RL_STATE_CALLBACK))
|
||||
--- 1387,1403 ----
|
||||
r = rl_domove_motion_callback (_rl_vimvcxt);
|
||||
}
|
||||
! else if (vi_redoing && _rl_vi_last_motion != 'c') /* `cc' is special */
|
||||
{
|
||||
_rl_vimvcxt->motion = _rl_vi_last_motion;
|
||||
r = rl_domove_motion_callback (_rl_vimvcxt);
|
||||
}
|
||||
+ else if (vi_redoing) /* handle redoing `cc' here */
|
||||
+ {
|
||||
+ _rl_vimvcxt->motion = _rl_vi_last_motion;
|
||||
+ rl_mark = rl_end;
|
||||
+ rl_beg_of_line (1, key);
|
||||
+ RL_UNSETSTATE (RL_STATE_VIMOTION);
|
||||
+ r = vidomove_dispatch (_rl_vimvcxt);
|
||||
+ }
|
||||
#if defined (READLINE_CALLBACKS)
|
||||
else if (RL_ISSTATE (RL_STATE_CALLBACK))
|
||||
***************
|
||||
*** 1378,1381 ****
|
||||
--- 1456,1472 ----
|
||||
r = rl_domove_motion_callback (_rl_vimvcxt);
|
||||
}
|
||||
+ else if (vi_redoing && _rl_vi_last_motion != 'y') /* `yy' is special */
|
||||
+ {
|
||||
+ _rl_vimvcxt->motion = _rl_vi_last_motion;
|
||||
+ r = rl_domove_motion_callback (_rl_vimvcxt);
|
||||
+ }
|
||||
+ else if (vi_redoing) /* handle redoing `yy' here */
|
||||
+ {
|
||||
+ _rl_vimvcxt->motion = _rl_vi_last_motion;
|
||||
+ rl_mark = rl_end;
|
||||
+ rl_beg_of_line (1, key);
|
||||
+ RL_UNSETSTATE (RL_STATE_VIMOTION);
|
||||
+ r = vidomove_dispatch (_rl_vimvcxt);
|
||||
+ }
|
||||
#if defined (READLINE_CALLBACKS)
|
||||
else if (RL_ISSTATE (RL_STATE_CALLBACK))
|
||||
*** ../bash-4.2-patched/patchlevel.h Sat Jun 12 20:14:48 2010
|
||||
--- patchlevel.h Thu Feb 24 21:41:34 2011
|
||||
***************
|
||||
*** 26,30 ****
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 36
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
--- 26,30 ----
|
||||
looks for to find the patch level (for the sccs version string). */
|
||||
|
||||
! #define PATCHLEVEL 37
|
||||
|
||||
#endif /* _PATCHLEVEL_H_ */
|
||||
Loading…
x
Reference in New Issue
Block a user