projects / packages / bash.git / blame
| Commit | Line | Data |
|---|---|---|
| 4e9fe84f JB |
1 | BASH PATCH REPORT |
| 2 | ================= | |
| 3 | ||
| 4 | Bash-Release: 3.0 | |
| 5 | Patch-ID: bash30-013 | |
| 6 | ||
| 7 | Bug-Reported-by: Len Lattanzi <llattanzi@apple.com> | |
| 8 | Bug-Reference-ID: <556CE1CE-E1AC-11D8-A2D9-00039383EC60@apple.com> | |
| 9 | Bug-Reference-URL: | |
| 10 | ||
| 11 | Bug-Description: | |
| 12 | ||
| 13 | vi-mode filename completion/glob expansion should understand and perform | |
| 14 | tilde expansion. | |
| 15 | ||
| 16 | Patch: | |
| 17 | ||
| 18 | *** ../bash-3.0/bashline.c Mon Jul 5 23:22:12 2004 | |
| 19 | --- bashline.c Thu Sep 2 16:00:12 2004 | |
| 20 | *************** | |
| 21 | *** 2514,2518 **** | |
| 22 | static int ind; | |
| 23 | int glen; | |
| 24 | ! char *ret; | |
| 25 | ||
| 26 | if (state == 0) | |
| 27 | --- 2545,2549 ---- | |
| 28 | static int ind; | |
| 29 | int glen; | |
| 30 | ! char *ret, *ttext; | |
| 31 | ||
| 32 | if (state == 0) | |
| 33 | *************** | |
| 34 | *** 2524,2538 **** | |
| 35 | FREE (globtext); | |
| 36 | ||
| 37 | if (rl_explicit_arg) | |
| 38 | { | |
| 39 | ! globorig = savestring (text); | |
| 40 | ! glen = strlen (text); | |
| 41 | globtext = (char *)xmalloc (glen + 2); | |
| 42 | ! strcpy (globtext, text); | |
| 43 | globtext[glen] = '*'; | |
| 44 | globtext[glen+1] = '\0'; | |
| 45 | } | |
| 46 | else | |
| 47 | ! globtext = globorig = savestring (text); | |
| 48 | ||
| 49 | matches = shell_glob_filename (globtext); | |
| 50 | --- 2555,2574 ---- | |
| 51 | FREE (globtext); | |
| 52 | ||
| 53 | + ttext = bash_tilde_expand (text, 0); | |
| 54 | + | |
| 55 | if (rl_explicit_arg) | |
| 56 | { | |
| 57 | ! globorig = savestring (ttext); | |
| 58 | ! glen = strlen (ttext); | |
| 59 | globtext = (char *)xmalloc (glen + 2); | |
| 60 | ! strcpy (globtext, ttext); | |
| 61 | globtext[glen] = '*'; | |
| 62 | globtext[glen+1] = '\0'; | |
| 63 | } | |
| 64 | else | |
| 65 | ! globtext = globorig = savestring (ttext); | |
| 66 | ! | |
| 67 | ! if (ttext != text) | |
| 68 | ! free (ttext); | |
| 69 | ||
| 70 | matches = shell_glob_filename (globtext); | |
| 71 | ||
| 72 | *** ../bash-3.0/patchlevel.h Wed Aug 22 08:05:39 2001 | |
| 73 | --- patchlevel.h Thu Sep 2 15:04:32 2004 | |
| 74 | *************** | |
| 75 | *** 26,30 **** | |
| 76 | looks for to find the patch level (for the sccs version string). */ | |
| 77 | ||
| 78 | ! #define PATCHLEVEL 12 | |
| 79 | ||
| 80 | #endif /* _PATCHLEVEL_H_ */ | |
| 81 | --- 26,30 ---- | |
| 82 | looks for to find the patch level (for the sccs version string). */ | |
| 83 | ||
| 84 | ! #define PATCHLEVEL 13 | |
| 85 | ||
| 86 | #endif /* _PATCHLEVEL_H_ */ |