diff options
author | Patrick J Volkerding <volkerdi@slackware.com> | 2024-01-15 21:08:12 +0000 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2024-01-15 22:41:39 +0100 |
commit | 715f1e2e38983e25a4108fdf7ef0f12449617670 (patch) | |
tree | c21821733c328c0027ee22573be952162a6c5a57 /source/l/readline/readline-8.2-patches/readline82-010 | |
parent | b12c0fed430cc064cc7ee88878c9f0c5ad8de86a (diff) | |
download | current-715f1e2e38983e25a4108fdf7ef0f12449617670.tar.gz current-715f1e2e38983e25a4108fdf7ef0f12449617670.tar.xz |
Mon Jan 15 21:08:12 UTC 202420240115210812
a/kernel-firmware-20240115_9b6d0b0-noarch-1.txz: Upgraded.
a/kernel-generic-6.6.12-x86_64-1.txz: Upgraded.
a/kernel-huge-6.6.12-x86_64-1.txz: Upgraded.
a/kernel-modules-6.6.12-x86_64-1.txz: Upgraded.
d/kernel-headers-6.6.12-x86-1.txz: Upgraded.
k/kernel-source-6.6.12-noarch-1.txz: Upgraded.
l/libxml2-2.12.4-x86_64-1.txz: Upgraded.
l/pulseaudio-17.0-x86_64-2.txz: Rebuilt.
Patch regressions:
[PATCH] alsa-ucm: Check UCM verb before working with device status.
[PATCH] alsa-ucm: Replace port device UCM context assertion with an error.
l/readline-8.2.010-x86_64-1.txz: Upgraded.
x/libinput-1.25.0-x86_64-1.txz: Upgraded.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to '')
-rw-r--r-- | source/l/readline/readline-8.2-patches/readline82-010 | 67 |
1 files changed, 67 insertions, 0 deletions
diff --git a/source/l/readline/readline-8.2-patches/readline82-010 b/source/l/readline/readline-8.2-patches/readline82-010 new file mode 100644 index 000000000..d2ca5eae2 --- /dev/null +++ b/source/l/readline/readline-8.2-patches/readline82-010 @@ -0,0 +1,67 @@ + READLINE PATCH REPORT + ===================== + +Readline-Release: 8.2 +Patch-ID: readline82-010 + +Bug-Reported-by: Martin Castillo <castilma@uni-bremen.de> +Bug-Reference-ID: <2d42153b-cf65-caba-dff1-cd3bc6268c7e@uni-bremen.de> +Bug-Reference-URL: https://lists.gnu.org/archive/html/bug-readline/2023-01/msg00000.html + +Bug-Description: + +Fix the case where text to be completed from the line buffer (quoted) is +compared to the common prefix of the possible matches (unquoted) and the +quoting makes the former appear to be longer than the latter. Readline +assumes the match doesn't add any characters to the word and doesn't display +multiple matches. + +Patch (apply with `patch -p0'): + +*** ../readline-8.2-patched/complete.c Tue Apr 5 10:47:06 2022 +--- complete.c Sat Jan 7 14:19:45 2023 +*************** +*** 2032,2038 **** + text = rl_copy_text (start, end); + matches = gen_completion_matches (text, start, end, our_func, found_quote, quote_char); + /* nontrivial_lcd is set if the common prefix adds something to the word + being completed. */ +! nontrivial_lcd = matches && compare_match (text, matches[0]) != 0; + if (what_to_do == '!' || what_to_do == '@') + tlen = strlen (text); +--- 2038,2060 ---- + text = rl_copy_text (start, end); + matches = gen_completion_matches (text, start, end, our_func, found_quote, quote_char); ++ /* If TEXT contains quote characters, it will be dequoted as part of ++ generating the matches, and the matches will not contain any quote ++ characters. We need to dequote TEXT before performing the comparison. ++ Since compare_match performs the dequoting, and we only want to do it ++ once, we don't call compare_matches after dequoting TEXT; we call ++ strcmp directly. */ + /* nontrivial_lcd is set if the common prefix adds something to the word + being completed. */ +! if (rl_filename_completion_desired && rl_filename_quoting_desired && +! rl_completion_found_quote && rl_filename_dequoting_function) +! { +! char *t; +! t = (*rl_filename_dequoting_function) (text, rl_completion_quote_character); +! xfree (text); +! text = t; +! nontrivial_lcd = matches && strcmp (text, matches[0]) != 0; +! } +! else +! nontrivial_lcd = matches && strcmp (text, matches[0]) != 0; + if (what_to_do == '!' || what_to_do == '@') + tlen = strlen (text); + +*** ../readline-8.2/patchlevel 2013-11-15 08:11:11.000000000 -0500 +--- patchlevel 2014-03-21 08:28:40.000000000 -0400 +*************** +*** 1,3 **** + # Do not edit -- exists only for use by patch + +! 9 +--- 1,3 ---- + # Do not edit -- exists only for use by patch + +! 10 |