]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/blob - src/patches/bash/bash32-050
Merge branch 'kernel-update' of ssh://git.ipfire.org/pub/git/ipfire-2.x into kernel...
[people/teissler/ipfire-2.x.git] / src / patches / bash / bash32-050
1 BASH PATCH REPORT
2 =================
3
4 Bash-Release: 3.2
5 Patch-ID: bash32-050
6
7 Bug-Reported-by: Jan Hnatek <Jan.Hnatek@Sun.COM>
8 Bug-Reference-ID: <4A44991F.8010005@sun.com>
9 Bug-Reference-URL: http://lists.gnu.org/archive/html/bug-bash/2009-06/msg00084.html
10
11 Bug-Description:
12
13 On systems where mbrtowc() returns -2 when passed a length argument with
14 value 0, when using a multibyte locale, Readline's emacs-mode forward-char
15 at the end of a line will leave the point beyond the end of the line.
16
17 Patch:
18
19 *** ../bash-3.2-patched/lib/readline/mbutil.c 2009-06-16 11:26:50.000000000 -0400
20 --- lib/readline/mbutil.c 2009-01-04 14:32:33.000000000 -0500
21 ***************
22 *** 132,141 ****
23 {
24 tmp = mbrtowc (&wc, string + point, strlen (string + point), &ps);
25 ! while (tmp > 0 && wcwidth (wc) == 0)
26 {
27 point += tmp;
28 tmp = mbrtowc (&wc, string + point, strlen (string + point), &ps);
29 - if (MB_NULLWCH (tmp) || MB_INVALIDCH (tmp))
30 - break;
31 }
32 }
33 --- 130,137 ----
34 {
35 tmp = mbrtowc (&wc, string + point, strlen (string + point), &ps);
36 ! while (MB_NULLWCH (tmp) == 0 && MB_INVALIDCH (tmp) == 0 && wcwidth (wc) == 0)
37 {
38 point += tmp;
39 tmp = mbrtowc (&wc, string + point, strlen (string + point), &ps);
40 }
41 }
42 *** ../bash-3.2/patchlevel.h Thu Apr 13 08:31:04 2006
43 --- patchlevel.h Mon Oct 16 14:22:54 2006
44 ***************
45 *** 26,30 ****
46 looks for to find the patch level (for the sccs version string). */
47
48 ! #define PATCHLEVEL 49
49
50 #endif /* _PATCHLEVEL_H_ */
51 --- 26,30 ----
52 looks for to find the patch level (for the sccs version string). */
53
54 ! #define PATCHLEVEL 50
55
56 #endif /* _PATCHLEVEL_H_ */