diff options
| author | Richard Lowe <richlowe@richlowe.net> | 2010-09-12 14:15:04 -0400 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2010-09-12 14:15:04 -0400 |
| commit | 84cf253f8f6b41850d9fd9d5c853b30ce633bb40 (patch) | |
| tree | b9177fdb88d55f6b5342a65ac5236b064a3644a0 | |
| parent | 6ea3c0609e50782557505b88bb391b786bca32c9 (diff) | |
| download | illumos-joyent-84cf253f8f6b41850d9fd9d5c853b30ce633bb40.tar.gz | |
132 tr breaks scripts
Reviewed by: garrett@nexenta.com
Approved by: gwr@nexenta.com
| -rw-r--r-- | usr/src/cmd/tr/cset.c | 4 | ||||
| -rw-r--r-- | usr/src/cmd/tr/str.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/usr/src/cmd/tr/cset.c b/usr/src/cmd/tr/cset.c index 203db18283..fad4ee3ddf 100644 --- a/usr/src/cmd/tr/cset.c +++ b/usr/src/cmd/tr/cset.c @@ -150,11 +150,11 @@ cset_in_hard(struct cset *cs, wchar_t ch) struct csclass *csc; for (csc = cs->cs_classes; csc != NULL; csc = csc->csc_next) - if ((csc->csc_invert ^ iswctype(ch, csc->csc_type)) != 0) + if (csc->csc_invert ^ (iswctype(ch, csc->csc_type) != 0)) return (cs->cs_invert ^ true); if (cs->cs_root != NULL) { cs->cs_root = cset_splay(cs->cs_root, ch); - return ((cs->cs_invert ^ cset_rangecmp(cs->cs_root, ch)) == 0); + return (cs->cs_invert ^ (cset_rangecmp(cs->cs_root, ch) == 0)); } return (cs->cs_invert ^ false); } diff --git a/usr/src/cmd/tr/str.c b/usr/src/cmd/tr/str.c index 32efe31fe7..6219e7819c 100644 --- a/usr/src/cmd/tr/str.c +++ b/usr/src/cmd/tr/str.c @@ -151,7 +151,7 @@ bracket(s) s->str = p + 1; return (1); case '=': /* "[=equiv=]" */ - if ((p = strchr(s->str + 2, ']')) == NULL) + if ((p = strchr(s->str + 3, ']')) == NULL) return (0); if (*(p - 1) != '=' || p - s->str < 4) goto repeat; |