bash30-001 4.1 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139
  1. *** bash-3.0/arrayfunc.c Fri Dec 19 00:03:09 2003
  2. --- bash/arrayfunc.c Sun Aug 1 20:43:00 2004
  3. ***************
  4. *** 612,616 ****
  5. free (t);
  6. ! return var;
  7. }
  8. --- 612,616 ----
  9. free (t);
  10. ! return (var == 0 || invisible_p (var)) ? (SHELL_VAR *)0 : var;
  11. }
  12. *** bash-3.0/subst.c Sun Jul 4 13:56:13 2004
  13. --- bash/subst.c Thu Aug 12 13:36:17 2004
  14. ***************
  15. *** 4983,4987 ****
  16. return -1;
  17. }
  18. ! else if ((v = find_variable (varname)) && array_p (v))
  19. {
  20. vtype = VT_ARRAYMEMBER;
  21. --- 5003,5007 ----
  22. return -1;
  23. }
  24. ! else if ((v = find_variable (varname)) && (invisible_p (v) == 0) && array_p (v))
  25. {
  26. vtype = VT_ARRAYMEMBER;
  27. *** bash-3.0/variables.c Sun Jul 4 13:57:26 2004
  28. --- bash/variables.c Wed Aug 4 15:28:04 2004
  29. ***************
  30. *** 1420,1428 ****
  31. # if defined (DEBUGGER)
  32. ! v = init_dynamic_array_var ("BASH_ARGC", get_self, null_array_assign, (att_invisible|att_noassign));
  33. ! v = init_dynamic_array_var ("BASH_ARGV", get_self, null_array_assign, (att_invisible|att_noassign));
  34. # endif /* DEBUGGER */
  35. ! v = init_dynamic_array_var ("BASH_SOURCE", get_self, null_array_assign, (att_invisible|att_noassign));
  36. ! v = init_dynamic_array_var ("BASH_LINENO", get_self, null_array_assign, (att_invisible|att_noassign));
  37. #endif
  38. --- 1420,1428 ----
  39. # if defined (DEBUGGER)
  40. ! v = init_dynamic_array_var ("BASH_ARGC", get_self, null_array_assign, att_noassign);
  41. ! v = init_dynamic_array_var ("BASH_ARGV", get_self, null_array_assign, att_noassign);
  42. # endif /* DEBUGGER */
  43. ! v = init_dynamic_array_var ("BASH_SOURCE", get_self, null_array_assign, att_noassign);
  44. ! v = init_dynamic_array_var ("BASH_LINENO", get_self, null_array_assign, att_noassign);
  45. #endif
  46. ***************
  47. *** 1600,1604 ****
  48. old_var = find_variable (name);
  49. if (old_var && local_p (old_var) && old_var->context == variable_context)
  50. ! return (old_var);
  51. was_tmpvar = old_var && tempvar_p (old_var);
  52. --- 1600,1607 ----
  53. old_var = find_variable (name);
  54. if (old_var && local_p (old_var) && old_var->context == variable_context)
  55. ! {
  56. ! VUNSETATTR (old_var, att_invisible);
  57. ! return (old_var);
  58. ! }
  59. was_tmpvar = old_var && tempvar_p (old_var);
  60. *** bash-3.0/pcomplete.c Thu Jan 8 10:36:17 2004
  61. --- bash/pcomplete.c Tue Aug 3 23:15:41 2004
  62. ***************
  63. *** 864,867 ****
  64. --- 864,869 ----
  65. v = convert_var_to_array (v);
  66. v = assign_array_var_from_word_list (v, lwords);
  67. +
  68. + VUNSETATTR (v, att_invisible);
  69. return v;
  70. }
  71. ***************
  72. *** 1022,1025 ****
  73. --- 1024,1029 ----
  74. if (array_p (v) == 0)
  75. v = convert_var_to_array (v);
  76. +
  77. + VUNSETATTR (v, att_invisible);
  78. a = array_cell (v);
  79. *** bash-3.0/array.c Thu May 6 08:24:13 2004
  80. --- bash/array.c Wed Aug 25 15:50:42 2004
  81. ***************
  82. *** 452,456 ****
  83. array_dispose_element(new);
  84. free(element_value(ae));
  85. ! ae->value = savestring(v);
  86. return(0);
  87. } else if (element_index(ae) > i) {
  88. --- 454,458 ----
  89. array_dispose_element(new);
  90. free(element_value(ae));
  91. ! ae->value = v ? savestring(v) : (char *)NULL;
  92. return(0);
  93. } else if (element_index(ae) > i) {
  94. *** bash-3.0/patchlevel.h Wed Aug 22 08:05:39 2001
  95. --- bash/patchlevel.h Thu Sep 2 15:04:32 2004
  96. ***************
  97. *** 26,30 ****
  98. looks for to find the patch level (for the sccs version string). */
  99. ! #define PATCHLEVEL 0
  100. #endif /* _PATCHLEVEL_H_ */
  101. --- 26,30 ----
  102. looks for to find the patch level (for the sccs version string). */
  103. ! #define PATCHLEVEL 1
  104. #endif /* _PATCHLEVEL_H_ */
  105. *** bash-3.0/tests/dbg-support.tests Tue Mar 25 15:33:03 2003
  106. --- bash/tests/dbg-support.tests Tue Aug 3 23:09:29 2004
  107. ***************
  108. *** 63,68 ****
  109. trap 'print_return_trap $LINENO' RETURN
  110. ! # Funcname is now an array. Vanilla Bash 2.05 doesn't have FUNCNAME array.
  111. ! echo "FUNCNAME" ${FUNCNAME[0]}
  112. # We should trace into the below.
  113. --- 63,68 ----
  114. trap 'print_return_trap $LINENO' RETURN
  115. ! # Funcname is now an array, but you still can't see it outside a function
  116. ! echo "FUNCNAME" ${FUNCNAME[0]:-main}
  117. # We should trace into the below.