mirror of
https://https.git.savannah.gnu.org/git/bash.git
synced 2026-06-22 13:27:58 +02:00
Chet Ramey
54 lines
1.2 KiB
Diff
54 lines
1.2 KiB
Diff
*** ../bash-3.0/bashline.c Mon Jul 5 23:22:12 2004
|
|
--- bashline.c Thu Sep 2 16:00:12 2004
|
|
***************
|
|
*** 2514,2518 ****
|
|
static int ind;
|
|
int glen;
|
|
! char *ret;
|
|
|
|
if (state == 0)
|
|
--- 2545,2549 ----
|
|
static int ind;
|
|
int glen;
|
|
! char *ret, *ttext;
|
|
|
|
if (state == 0)
|
|
***************
|
|
*** 2524,2538 ****
|
|
FREE (globtext);
|
|
|
|
if (rl_explicit_arg)
|
|
{
|
|
! globorig = savestring (text);
|
|
! glen = strlen (text);
|
|
globtext = (char *)xmalloc (glen + 2);
|
|
! strcpy (globtext, text);
|
|
globtext[glen] = '*';
|
|
globtext[glen+1] = '\0';
|
|
}
|
|
else
|
|
! globtext = globorig = savestring (text);
|
|
|
|
matches = shell_glob_filename (globtext);
|
|
--- 2555,2574 ----
|
|
FREE (globtext);
|
|
|
|
+ ttext = bash_tilde_expand (text, 0);
|
|
+
|
|
if (rl_explicit_arg)
|
|
{
|
|
! globorig = savestring (ttext);
|
|
! glen = strlen (ttext);
|
|
globtext = (char *)xmalloc (glen + 2);
|
|
! strcpy (globtext, ttext);
|
|
globtext[glen] = '*';
|
|
globtext[glen+1] = '\0';
|
|
}
|
|
else
|
|
! globtext = globorig = savestring (ttext);
|
|
!
|
|
! if (ttext != text)
|
|
! free (ttext);
|
|
|
|
matches = shell_glob_filename (globtext);
|