1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
|
#! /bin/sh -e
if [ $# -eq 3 -a "$2" = '-d' ]; then
pdir="-d $3"
elif [ $# -ne 1 ]; then
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1
fi
case "$1" in
-patch) patch $pdir -f --no-backup-if-mismatch -p0 < $0;;
-unpatch) patch $pdir -f --no-backup-if-mismatch -R -p0 < $0;;
*)
echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
exit 1
esac
exit 0
# DP: upstream patch bash30-016
BASH PATCH REPORT
=================
Bash-Release: 3.0
Patch-ID: bash30-016
Bug-Reported-by: William Park <opengeometry@yahoo.ca>
Bug-Reference-ID: <200411012217.iA1MHxL7031818@node1.opengeometry.net>
Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2004-11/msg00017.html
Bug-Description:
Offset from the end of array in ${var: -n} is still off by 1. Eg.
x=( {0..9} )
echo ${x[*]: -1} --> 8 9
Patch:
*** ../bash-3.0-patched/subst.c Wed Sep 8 11:07:55 2004
--- subst.c Tue Nov 9 16:26:59 2004
***************
*** 4900,4905 ****
case VT_ARRAYVAR:
a = (ARRAY *)value;
! /* For arrays, the first value deals with array indices. */
! len = array_max_index (a); /* arrays index from 0 to n - 1 */
break;
#endif
--- 4900,4906 ----
case VT_ARRAYVAR:
a = (ARRAY *)value;
! /* For arrays, the first value deals with array indices. Negative
! offsets count from one past the array's maximum index. */
! len = array_max_index (a) + (*e1p < 0); /* arrays index from 0 to n - 1 */
break;
#endif
*** ../bash-3.0-patched/tests/array.tests Sat Oct 4 23:25:00 2003
--- tests/array.tests Tue Nov 9 16:36:29 2004
***************
*** 323,327 ****
echo positive offset - expect five seven
echo ${av[@]:5:2}
! echo negative offset - expect five seven
echo ${av[@]: -2:2}
--- 323,327 ----
echo positive offset - expect five seven
echo ${av[@]:5:2}
! echo negative offset to unset element - expect seven
echo ${av[@]: -2:2}
*** ../bash-3.0-patched/tests/array.right Sat Oct 4 23:25:10 2003
--- tests/array.right Tue Nov 9 16:37:25 2004
***************
*** 171,176 ****
positive offset - expect five seven
five seven
! negative offset - expect five seven
! five seven
positive offset 2 - expect seven
seven
--- 171,176 ----
positive offset - expect five seven
five seven
! negative offset to unset element - expect seven
! seven
positive offset 2 - expect seven
seven
*** ../bash-3.0-patched/patchlevel.h Tue Oct 26 17:13:29 2004
--- patchlevel.h Tue Nov 9 16:31:24 2004
***************
*** 26,30 ****
looks for to find the patch level (for the sccs version string). */
! #define PATCHLEVEL 15
#endif /* _PATCHLEVEL_H_ */
--- 26,30 ----
looks for to find the patch level (for the sccs version string). */
! #define PATCHLEVEL 16
#endif /* _PATCHLEVEL_H_ */
|
