bash30-013 1.6 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869
  1. *** bash-3.0/bashline.c Mon Jul 5 23:22:12 2004
  2. --- bash/bashline.c Thu Sep 2 16:00:12 2004
  3. ***************
  4. *** 2514,2518 ****
  5. static int ind;
  6. int glen;
  7. ! char *ret;
  8. if (state == 0)
  9. --- 2545,2549 ----
  10. static int ind;
  11. int glen;
  12. ! char *ret, *ttext;
  13. if (state == 0)
  14. ***************
  15. *** 2524,2538 ****
  16. FREE (globtext);
  17. if (rl_explicit_arg)
  18. {
  19. ! globorig = savestring (text);
  20. ! glen = strlen (text);
  21. globtext = (char *)xmalloc (glen + 2);
  22. ! strcpy (globtext, text);
  23. globtext[glen] = '*';
  24. globtext[glen+1] = '\0';
  25. }
  26. else
  27. ! globtext = globorig = savestring (text);
  28. matches = shell_glob_filename (globtext);
  29. --- 2555,2574 ----
  30. FREE (globtext);
  31. + ttext = bash_tilde_expand (text, 0);
  32. +
  33. if (rl_explicit_arg)
  34. {
  35. ! globorig = savestring (ttext);
  36. ! glen = strlen (ttext);
  37. globtext = (char *)xmalloc (glen + 2);
  38. ! strcpy (globtext, ttext);
  39. globtext[glen] = '*';
  40. globtext[glen+1] = '\0';
  41. }
  42. else
  43. ! globtext = globorig = savestring (ttext);
  44. !
  45. ! if (ttext != text)
  46. ! free (ttext);
  47. matches = shell_glob_filename (globtext);
  48. *** bash-3.0/patchlevel.h Wed Aug 22 08:05:39 2001
  49. --- bash/patchlevel.h Thu Sep 2 15:04:32 2004
  50. ***************
  51. *** 26,30 ****
  52. looks for to find the patch level (for the sccs version string). */
  53. ! #define PATCHLEVEL 12
  54. #endif /* _PATCHLEVEL_H_ */
  55. --- 26,30 ----
  56. looks for to find the patch level (for the sccs version string). */
  57. ! #define PATCHLEVEL 13
  58. #endif /* _PATCHLEVEL_H_ */