commit bash-20120606 snapshot

This commit is contained in:
Chet Ramey
2012-07-07 12:24:32 -04:00
parent 4e136352d0
commit 8360b906d6
36 changed files with 32277 additions and 45 deletions
+7 -3
View File
@@ -3044,6 +3044,8 @@ bash_directory_completion_hook (dirname)
else
nextch = 0;
}
else if (local_dirname[0] == '~')
should_expand_dirname = '~';
else
{
t = mbschr (local_dirname, '`');
@@ -3139,8 +3141,10 @@ bash_directory_completion_hook (dirname)
free (t);
temp2 = sh_canonpath (temp1, PATH_CHECKDOTDOT|PATH_CHECKEXISTS);
/* Try spelling correction if initial canonicalization fails. */
if (temp2 == 0 && dircomplete_spelling)
/* Try spelling correction if initial canonicalization fails. Make
sure we are set to replace the directory name with the results so
subsequent directory checks don't fail. */
if (temp2 == 0 && dircomplete_spelling && dircomplete_expand)
{
temp2 = dirspell (temp1);
if (temp2)
@@ -3818,7 +3822,7 @@ bash_quote_filename (s, rtype, qcp)
rtext = sh_single_quote (mtext);
break;
case COMPLETE_BSQUOTE:
rtext = sh_backslash_quote (mtext, complete_fullquote ? 0 : filename_bstab);
rtext = sh_backslash_quote (mtext, complete_fullquote ? 0 : filename_bstab, 0);
break;
}