Mercurial > illumos > illumos-gate
changeset 13186:c777be6727c6
132 tr breaks scripts
Reviewed by: garrett@nexenta.com
Approved by: gwr@nexenta.com
| author | Richard Lowe <richlowe@richlowe.net> |
|---|---|
| date | Sun, 12 Sep 2010 14:15:04 -0400 |
| parents | 294b1fe4bc7f |
| children | 36a51d4e554c |
| files | usr/src/cmd/tr/cset.c usr/src/cmd/tr/str.c |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/usr/src/cmd/tr/cset.c Sun Sep 12 10:25:50 2010 -0700 +++ b/usr/src/cmd/tr/cset.c Sun Sep 12 14:15:04 2010 -0400 @@ -150,11 +150,11 @@ 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); }
--- a/usr/src/cmd/tr/str.c Sun Sep 12 10:25:50 2010 -0700 +++ b/usr/src/cmd/tr/str.c Sun Sep 12 14:15:04 2010 -0400 @@ -151,7 +151,7 @@ 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;