diff options
| author | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
|---|---|---|
| committer | Chris Larson <clarson@kergoth.com> | 2004-11-09 00:36:47 +0000 |
| commit | f96441b9faf769c9ecdd4d338b605ea3d0cc4010 (patch) | |
| tree | edb17ec2c4ea13c5acb1c7350957a249a820e28d /bash/bash-2.05b/bash205b-005.patch | |
| parent | b6588aa6851fb220cedc387d21c51513ef8d67f4 (diff) | |
Disable bk EOLN_NATIVE conversions on all files in packages FILESPATHs, to prevent it screwing up patches.
BKrev: 4190111fA4MuVozAqwE7xOSL9fr-TA
Diffstat (limited to 'bash/bash-2.05b/bash205b-005.patch')
| -rw-r--r-- | bash/bash-2.05b/bash205b-005.patch | 68 |
1 files changed, 68 insertions, 0 deletions
diff --git a/bash/bash-2.05b/bash205b-005.patch b/bash/bash-2.05b/bash205b-005.patch index e69de29bb2..366477744b 100644 --- a/bash/bash-2.05b/bash205b-005.patch +++ b/bash/bash-2.05b/bash205b-005.patch @@ -0,0 +1,68 @@ +*** ../bash-2.05b/lib/readline/mbutil.c Tue Jun 4 11:54:29 2002 +--- lib/readline/mbutil.c Mon Aug 5 11:20:39 2002 +*************** +*** 206,210 **** + { + /* shorted to compose multibyte char */ +! memset (ps, 0, sizeof(mbstate_t)); + return -2; + } +--- 206,211 ---- + { + /* shorted to compose multibyte char */ +! if (ps) +! memset (ps, 0, sizeof(mbstate_t)); + return -2; + } +*************** +*** 213,217 **** + /* invalid to compose multibyte char */ + /* initialize the conversion state */ +! memset (ps, 0, sizeof(mbstate_t)); + return -1; + } +--- 214,219 ---- + /* invalid to compose multibyte char */ + /* initialize the conversion state */ +! if (ps) +! memset (ps, 0, sizeof(mbstate_t)); + return -1; + } +*************** +*** 226,232 **** + int + _rl_compare_chars (buf1, pos1, ps1, buf2, pos2, ps2) +! char *buf1, *buf2; +! mbstate_t *ps1, *ps2; +! int pos1, pos2; + { + int i, w1, w2; +--- 228,237 ---- + int + _rl_compare_chars (buf1, pos1, ps1, buf2, pos2, ps2) +! char *buf1; +! int pos1; +! mbstate_t *ps1; +! char *buf2; +! int pos2; +! mbstate_t *ps2; + { + int i, w1, w2; +*************** +*** 277,282 **** + /* clear the state of the byte sequence, because + in this case effect of mbstate is undefined */ +! memset (ps, 0, sizeof (mbstate_t)); + } + else + pos += tmp; +--- 282,290 ---- + /* clear the state of the byte sequence, because + in this case effect of mbstate is undefined */ +! if (ps) +! memset (ps, 0, sizeof (mbstate_t)); + } ++ else if (tmp == 0) ++ pos++; + else + pos += tmp; |