d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libedit: Reduce surprising behaviour with filename completion some more:

Browse Source 
* Quote '*', '?' and '['. While it may be more useful to expand them to
  matching pathnames, this at least matches with the completion we do.
* '@' is a regular character for filenames. Some other shells do
  @<hostname> completion but we do not.
* Prefix names starting with '-' and '+' with './' so they are not seen as
  options.
This commit is contained in:
Jilles Tjoelker 2010-06-15 22:23:21 +00:00
parent 8b1f99cdd4
commit 196ff96e78
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=209224
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/libedit/filecomplete.c
View File

@ -50,10 +50,10 @@ __FBSDID("$FreeBSD$");
#include "histedit.h"
#include "filecomplete.h"
static char break_chars[] = { ' ', '\t', '\n', '"', '\\', '\'', '`', '@',
'$', '>', '<', '=', ';', '|', '&', '{', '(', '\0' };
static char break_chars[] = { ' ', '\t', '\n', '"', '\\', '\'', '`',
'>', '<', '=', ';', '|', '&', '{', '(', '\0' };
/* Tilde is deliberately omitted here, we treat it specially. */
static char extra_quote_chars[] = { ')', '}', '\0' };
static char extra_quote_chars[] = { ')', '}', '*', '?', '[', '$', '\0' };
/********************************/
@ -595,6 +595,8 @@ sh_quote(const char *str)
int extra_len = 0;
char *quoted_str, *dst;
if (*str == '-' || *str == '+')
extra_len += 2;
for (src = str; *src != '\0'; src++)
if (strchr(break_chars, *src) ||
strchr(extra_quote_chars, *src))
@ -606,6 +608,8 @@ sh_quote(const char *str)
return NULL;
dst = quoted_str;
if (*str == '-' || *str == '+')
*dst++ = '.', *dst++ = '/';
for (src = str; *src != '\0'; src++) {
if (strchr(break_chars, *src) ||
strchr(extra_quote_chars, *src))