projects / ipfire-2.x.git / blame
| Commit | Line | Data |
|---|---|---|
| d19c8267 AF |
1 | BASH PATCH REPORT |
| 2 | ================= | |
| 3 | ||
| 4 | Bash-Release: 4.3 | |
| 5 | Patch-ID: bash43-015 | |
| 6 | ||
| 7 | Bug-Reported-by: Clark Wang <dearvoid@gmail.com> | |
| 8 | Bug-Reference-ID: <CADv8-og2TOSoabXeNVXVGaXN3tEMHnYVq1rwOLe5meaRPSGRig@mail.gmail.com> | |
| 9 | Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2014-04/msg00095.html | |
| 10 | ||
| 11 | Bug-Description: | |
| 12 | ||
| 13 | When completing directory names, the directory name is dequoted twice. | |
| 14 | This causes problems for directories with single and double quotes in | |
| 15 | their names. | |
| 16 | ||
| 17 | Patch (apply with `patch -p0'): | |
| 18 | *** ../bash-4.3-patched/bashline.c 2014-02-09 19:56:58.000000000 -0500 | |
| 19 | --- bashline.c 2014-04-25 14:57:52.000000000 -0400 | |
| 20 | *************** | |
| 21 | *** 4168,4174 **** | |
| 22 | ||
| 23 | qc = rl_dispatching ? rl_completion_quote_character : 0; | |
| 24 | ! dfn = bash_dequote_filename ((char *)text, qc); | |
| 25 | m1 = rl_completion_matches (dfn, rl_filename_completion_function); | |
| 26 | ! free (dfn); | |
| 27 | ||
| 28 | if (m1 == 0 || m1[0] == 0) | |
| 29 | --- 4209,4222 ---- | |
| 30 | ||
| 31 | qc = rl_dispatching ? rl_completion_quote_character : 0; | |
| 32 | ! /* If rl_completion_found_quote != 0, rl_completion_matches will call the | |
| 33 | ! filename dequoting function, causing the directory name to be dequoted | |
| 34 | ! twice. */ | |
| 35 | ! if (rl_dispatching && rl_completion_found_quote == 0) | |
| 36 | ! dfn = bash_dequote_filename ((char *)text, qc); | |
| 37 | ! else | |
| 38 | ! dfn = (char *)text; | |
| 39 | m1 = rl_completion_matches (dfn, rl_filename_completion_function); | |
| 40 | ! if (dfn != text) | |
| 41 | ! free (dfn); | |
| 42 | ||
| 43 | if (m1 == 0 || m1[0] == 0) | |
| 44 | *** ../bash-4.3/patchlevel.h 2012-12-29 10:47:57.000000000 -0500 | |
| 45 | --- patchlevel.h 2014-03-20 20:01:28.000000000 -0400 | |
| 46 | *************** | |
| 47 | *** 26,30 **** | |
| 48 | looks for to find the patch level (for the sccs version string). */ | |
| 49 | ||
| 50 | ! #define PATCHLEVEL 14 | |
| 51 | ||
| 52 | #endif /* _PATCHLEVEL_H_ */ | |
| 53 | --- 26,30 ---- | |
| 54 | looks for to find the patch level (for the sccs version string). */ | |
| 55 | ||
| 56 | ! #define PATCHLEVEL 15 | |
| 57 | ||
| 58 | #endif /* _PATCHLEVEL_H_ */ |