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
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
|
#! /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: bash-2.05b upstream patch 005
BASH PATCH REPORT
=================
Bash-Release: 2.05b
Patch-ID: bash205b-006
Bug-Reported-by: clowenst@ucsd.edu
Bug-Reference-ID: <156388ec.0212021151.51a48df1@posting.google.com>
Bug-Reference-URL:
Bug-Description:
When running in a locale with multibyte characters, the readline display
updater will use carriage returns when drawing the line, overwriting any
partial output already on the screen and not terminated by a newline.
Patch:
*** ../bash-2.05b/lib/readline/display.c Tue Jun 4 10:54:47 2002
--- lib/readline/display.c Fri Sep 13 16:22:57 2002
***************
*** 71,75 ****
#if defined (HANDLE_MULTIBYTE)
! static int _rl_col_width PARAMS((char *, int, int));
static int *_rl_wrapped_line;
#else
--- 71,75 ----
#if defined (HANDLE_MULTIBYTE)
! static int _rl_col_width PARAMS((const char *, int, int));
static int *_rl_wrapped_line;
#else
***************
*** 1349,1355 ****
_rl_output_some_chars (nfd + lendiff, temp - lendiff);
#if 0
- _rl_last_c_pos += _rl_col_width (nfd+lendiff, 0, temp-lendiff) - col_lendiff;
- #else
_rl_last_c_pos += _rl_col_width (nfd+lendiff, 0, temp-col_lendiff);
#endif
}
--- 1349,1355 ----
_rl_output_some_chars (nfd + lendiff, temp - lendiff);
#if 0
_rl_last_c_pos += _rl_col_width (nfd+lendiff, 0, temp-col_lendiff);
+ #else
+ _rl_last_c_pos += _rl_col_width (nfd+lendiff, 0, temp-lendiff);
#endif
}
***************
*** 1511,1516 ****
/* If we have multibyte characters, NEW is indexed by the buffer point in
a multibyte string, but _rl_last_c_pos is the display position. In
! this case, NEW's display position is not obvious. */
! if ((MB_CUR_MAX == 1 || rl_byte_oriented ) && _rl_last_c_pos == new) return;
#else
if (_rl_last_c_pos == new) return;
--- 1511,1523 ----
/* If we have multibyte characters, NEW is indexed by the buffer point in
a multibyte string, but _rl_last_c_pos is the display position. In
! this case, NEW's display position is not obvious and must be
! calculated. */
! if (MB_CUR_MAX == 1 || rl_byte_oriented)
! {
! if (_rl_last_c_pos == new)
! return;
! }
! else if (_rl_last_c_pos == _rl_col_width (data, 0, new))
! return;
#else
if (_rl_last_c_pos == new) return;
***************
*** 1595,1603 ****
{
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
! {
! tputs (_rl_term_cr, 1, _rl_output_character_function);
! for (i = 0; i < new; i++)
! putc (data[i], rl_outstream);
! }
else
_rl_backspace (_rl_last_c_pos - new);
--- 1602,1606 ----
{
if (MB_CUR_MAX > 1 && rl_byte_oriented == 0)
! _rl_backspace (_rl_last_c_pos - _rl_col_width (data, 0, new));
else
_rl_backspace (_rl_last_c_pos - new);
***************
*** 2118,2122 ****
static int
_rl_col_width (str, start, end)
! char *str;
int start, end;
{
--- 2121,2125 ----
static int
_rl_col_width (str, start, end)
! const char *str;
int start, end;
{
***************
*** 2194,2196 ****
}
#endif /* HANDLE_MULTIBYTE */
-
--- 2197,2198 ----
|
