diff options
Diffstat (limited to 'meta-oe/recipes-extended/tcsh/files/tcsh-6.17.02-multibyte.patch')
| -rw-r--r-- | meta-oe/recipes-extended/tcsh/files/tcsh-6.17.02-multibyte.patch | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/meta-oe/recipes-extended/tcsh/files/tcsh-6.17.02-multibyte.patch b/meta-oe/recipes-extended/tcsh/files/tcsh-6.17.02-multibyte.patch index 7f3e92624..3dd420a0e 100644 --- a/meta-oe/recipes-extended/tcsh/files/tcsh-6.17.02-multibyte.patch +++ b/meta-oe/recipes-extended/tcsh/files/tcsh-6.17.02-multibyte.patch | |||
| @@ -1,16 +1,18 @@ | |||
| 1 | Author: Jean-Luc Leger <reiga@dspnet.fr.eu.org> | 1 | Author: Jean-Luc Leger <reiga@dspnet.fr.eu.org> |
| 2 | Description: fix broken globbing expansion | 2 | Description: fix broken globbing expansion |
| 3 | Debian-Bug: #603545 | 3 | Debian-Bug: #603545 |
| 4 | --- a/tc.str.c | 4 | Index: tcsh-6.18.01/tc.str.c |
| 5 | +++ b/tc.str.c | 5 | =================================================================== |
| 6 | @@ -104,8 +104,9 @@ rt_mbtowc(Char *pwc, const char *s, size_t n) | 6 | --- tcsh-6.18.01.orig/tc.str.c 2012-01-10 13:34:31.000000000 -0800 |
| 7 | 7 | +++ tcsh-6.18.01/tc.str.c 2013-02-26 13:12:13.429153489 -0800 | |
| 8 | memset (&mb, 0, sizeof mb); | 8 | @@ -122,8 +122,9 @@ |
| 9 | ret = mbrtowc(&tmp, s, n, &mb); | 9 | #else |
| 10 | ret = mbtowc(&tmp, s, n); | ||
| 11 | #endif | ||
| 10 | - if (ret > 0) { | 12 | - if (ret > 0) { |
| 11 | + if (ret >= 0) | 13 | + if (ret >= 0) |
| 12 | *pwc = tmp; | 14 | *pwc = tmp; |
| 13 | + if (ret > 0) { | 15 | + if (ret >= 0) { |
| 14 | #ifdef UTF16_STRINGS | 16 | #if defined(UTF16_STRINGS) && defined(HAVE_MBRTOWC) |
| 15 | if (tmp >= 0xd800 && tmp <= 0xdbff) { | 17 | if (tmp >= 0xd800 && tmp <= 0xdbff) { |
| 16 | /* UTF-16 surrogate pair. Fetch second half and compute | 18 | /* UTF-16 surrogate pair. Fetch second half and compute |