psss / rpms / bash

Forked from rpms/bash 6 years ago
Clone
Ondrej Oprala 1b8a759
			     BASH PATCH REPORT
Ondrej Oprala 1b8a759
			     =================
Ondrej Oprala 1b8a759
Ondrej Oprala 1b8a759
Bash-Release:	4.3
Ondrej Oprala 1b8a759
Patch-ID:	bash43-015
Ondrej Oprala 1b8a759
Ondrej Oprala 1b8a759
Bug-Reported-by:	Clark Wang <dearvoid@gmail.com>
Ondrej Oprala 1b8a759
Bug-Reference-ID:	<CADv8-og2TOSoabXeNVXVGaXN3tEMHnYVq1rwOLe5meaRPSGRig@mail.gmail.com>
Ondrej Oprala 1b8a759
Bug-Reference-URL:	http://lists.gnu.org/archive/html/bug-bash/2014-04/msg00095.html
Ondrej Oprala 1b8a759
Ondrej Oprala 1b8a759
Bug-Description:
Ondrej Oprala 1b8a759
Ondrej Oprala 1b8a759
When completing directory names, the directory name is dequoted twice.
Ondrej Oprala 1b8a759
This causes problems for directories with single and double quotes in
Ondrej Oprala 1b8a759
their names.
Ondrej Oprala 1b8a759
Ondrej Oprala 1b8a759
Patch (apply with `patch -p0'):
Ondrej Oprala 1b8a759
*** ../bash-4.3-patched/bashline.c	2014-02-09 19:56:58.000000000 -0500
Ondrej Oprala 1b8a759
--- bashline.c	2014-04-25 14:57:52.000000000 -0400
Ondrej Oprala 1b8a759
***************
Ondrej Oprala 1b8a759
*** 4168,4174 ****
Ondrej Oprala 1b8a759
  
Ondrej Oprala 1b8a759
    qc = rl_dispatching ? rl_completion_quote_character : 0;  
Ondrej Oprala 1b8a759
!   dfn = bash_dequote_filename ((char *)text, qc);
Ondrej Oprala 1b8a759
    m1 = rl_completion_matches (dfn, rl_filename_completion_function);
Ondrej Oprala 1b8a759
!   free (dfn);
Ondrej Oprala 1b8a759
  
Ondrej Oprala 1b8a759
    if (m1 == 0 || m1[0] == 0)
Ondrej Oprala 1b8a759
--- 4209,4222 ----
Ondrej Oprala 1b8a759
  
Ondrej Oprala 1b8a759
    qc = rl_dispatching ? rl_completion_quote_character : 0;  
Ondrej Oprala 1b8a759
!   /* If rl_completion_found_quote != 0, rl_completion_matches will call the
Ondrej Oprala 1b8a759
!      filename dequoting function, causing the directory name to be dequoted
Ondrej Oprala 1b8a759
!      twice. */
Ondrej Oprala 1b8a759
!   if (rl_dispatching && rl_completion_found_quote == 0)
Ondrej Oprala 1b8a759
!     dfn = bash_dequote_filename ((char *)text, qc);
Ondrej Oprala 1b8a759
!   else
Ondrej Oprala 1b8a759
!     dfn = (char *)text;
Ondrej Oprala 1b8a759
    m1 = rl_completion_matches (dfn, rl_filename_completion_function);
Ondrej Oprala 1b8a759
!   if (dfn != text)
Ondrej Oprala 1b8a759
!     free (dfn);
Ondrej Oprala 1b8a759
  
Ondrej Oprala 1b8a759
    if (m1 == 0 || m1[0] == 0)
Ondrej Oprala 1b8a759
*** ../bash-4.3/patchlevel.h	2012-12-29 10:47:57.000000000 -0500
Ondrej Oprala 1b8a759
--- patchlevel.h	2014-03-20 20:01:28.000000000 -0400
Ondrej Oprala 1b8a759
***************
Ondrej Oprala 1b8a759
*** 26,30 ****
Ondrej Oprala 1b8a759
     looks for to find the patch level (for the sccs version string). */
Ondrej Oprala 1b8a759
  
Ondrej Oprala 1b8a759
! #define PATCHLEVEL 14
Ondrej Oprala 1b8a759
  
Ondrej Oprala 1b8a759
  #endif /* _PATCHLEVEL_H_ */
Ondrej Oprala 1b8a759
--- 26,30 ----
Ondrej Oprala 1b8a759
     looks for to find the patch level (for the sccs version string). */
Ondrej Oprala 1b8a759
  
Ondrej Oprala 1b8a759
! #define PATCHLEVEL 15
Ondrej Oprala 1b8a759
  
Ondrej Oprala 1b8a759
  #endif /* _PATCHLEVEL_H_ */