From 72ec8e997beac9551685b7939dda34b024a41d29 Mon Sep 17 00:00:00 2001 From: June McEnroe Date: Fri, 21 Jan 2022 21:48:05 -0500 Subject: dash: Bind libedit's secret filename completion function Check if the FreeBSD (and by extension macOS) _el_fn_sh_complete version of the function exists, which does shell escaping of completed filenames before _el_fn_complete learned to. Tab is bound after calling el_set() and el_source() since the default bindings set tab to something else, and it should always be filename completion in the shell. --- CMakeLists.txt | 4 ++++ config.h.in | 1 + src/histedit.c | 8 ++++++++ 3 files changed, 13 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5385049..9fc4bc8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -140,6 +140,10 @@ if(WITH_LIBEDIT) else() message(SEND_ERROR "Can't find libedit.") endif() + set(CMAKE_REQUIRED_LIBRARIES edit) + check_symbol_exists( + _el_fn_sh_complete "histedit.h" HAVE__EL_FN_SH_COMPLETE + ) else() add_compile_definitions(SMALL) endif() diff --git a/config.h.in b/config.h.in index 382ad35..67341e0 100644 --- a/config.h.in +++ b/config.h.in @@ -21,4 +21,5 @@ #cmakedefine HAVE_FNMATCH #cmakedefine HAVE_GLOB #cmakedefine HAVE_ST_MTIM +#cmakedefine HAVE__EL_FN_SH_COMPLETE #cmakedefine WITH_LINENO diff --git a/src/histedit.c b/src/histedit.c index f5c90ab..3525e02 100644 --- a/src/histedit.c +++ b/src/histedit.c @@ -116,6 +116,13 @@ histedit(void) if (hist) el_set(el, EL_HIST, history, hist); el_set(el, EL_PROMPT, getprompt); +#ifdef HAVE__EL_FN_SH_COMPLETE + el_set(el, EL_ADDFN, "sh-complete", "Filename completion", + _el_fn_sh_complete); +#else + el_set(el, EL_ADDFN, "sh-complete", "Filename completion", + _el_fn_complete); +#endif } else { bad: out2str("sh: can't initialize editing\n"); @@ -133,6 +140,7 @@ bad: else if (Eflag) el_set(el, EL_EDITOR, "emacs"); el_source(el, NULL); + el_set(el, EL_BIND, "^I", "sh-complete", NULL); } } else { INTOFF; -- cgit 1.4.1