diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | Src/utils.c | 11 |
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 3b00e8644..51f92be7f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2006-12-19 Peter Stephenson <pws@csr.com> + * 23071: Src/utils.c: problem with signed characters with + no multibyte support. + * 23070: Test/C02cond.ztst: Skip [[ -N file ]] test on NFS file systems. diff --git a/Src/utils.c b/Src/utils.c index a0f762896..d4bf6c2eb 100644 --- a/Src/utils.c +++ b/Src/utils.c @@ -4146,15 +4146,20 @@ mb_metastrlen(char *ptr, int width) /**/ mod_export int -metacharlenconv(char *x, int *c) +metacharlenconv(const char *x, int *c) { + /* + * Here we don't use STOUC() on the chars since they + * may be compared against other chars and this will fail + * if chars are signed and the high bit is set. + */ if (*x == Meta) { if (c) - *c = STOUC(x[1]) ^ 32; + *c = x[1] ^ 32; return 2; } if (c) - *c = STOUC(*x); + *c = (char)*x; return 1; } |