summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJim Meyering <meyering@redhat.com>2007-10-21 12:38:33 +0200
committerJim Meyering <meyering@redhat.com>2007-10-21 14:01:28 +0200
commitaf5d0c363a52e787a4311a11f035209eecdc4115 (patch)
tree30ee17355928ee3ba04a78d66b2f290d8a47e159 /src
parentc365bafa815695e187089ab711eca4ca55282b0d (diff)
downloadcoreutils-af5d0c363a52e787a4311a11f035209eecdc4115.tar.xz
tr: do not reject an unmatched [:lower:] or [:upper:] in SET1.
* NEWS: Mention this. * src/tr.c (get_next) [RE_CHAR_CLASS]: Don't skip the loop when processing [:lower:] and [:upper:]. (main): Require [:lower:] or [:upper:] in SET1 only when when one of those is specified in SET2. * tests/tr/Test.pm: Add tests for this fix. Reported by Per Starbäck. Signed-off-by: Jim Meyering <meyering@redhat.com>
Diffstat (limited to 'src')
-rw-r--r--src/tr.c23
1 files changed, 5 insertions, 18 deletions
diff --git a/src/tr.c b/src/tr.c
index f79f3bac1..dff602e6b 100644
--- a/src/tr.c
+++ b/src/tr.c
@@ -1077,27 +1077,15 @@ get_next (struct Spec_list *s, enum Upper_Lower_class *class)
case RE_CHAR_CLASS:
if (class)
{
- bool upper_or_lower;
switch (p->u.char_class)
{
case CC_LOWER:
*class = UL_LOWER;
- upper_or_lower = true;
break;
case CC_UPPER:
*class = UL_UPPER;
- upper_or_lower = true;
break;
default:
- upper_or_lower = false;
- break;
- }
-
- if (upper_or_lower)
- {
- s->tail = p->next;
- s->state = NEW_ELEMENT;
- return_val = 0;
break;
}
}
@@ -1833,12 +1821,11 @@ main (int argc, char **argv)
c1 = get_next (s1, &class_s1);
c2 = get_next (s2, &class_s2);
- /* When constructing the translation array, either one of the
- values returned by paired calls to get_next must be from
- [:upper:] and the other is [:lower:], or neither can be from
- upper or lower. */
-
- if ((class_s1 == UL_NONE) != (class_s2 == UL_NONE))
+ /* When translating and there is an [:upper:] or [:lower:]
+ class in SET2, then there must be a corresponding [:lower:]
+ or [:upper:] class in SET1. */
+ if (class_s1 == UL_NONE
+ && (class_s2 == UL_LOWER || class_s2 == UL_UPPER))
error (EXIT_FAILURE, 0,
_("misaligned [:upper:] and/or [:lower:] construct"));