From 5697e93e654d04b1f872a3af3418ea3c293b5883 Mon Sep 17 00:00:00 2001 From: cinap_lenrek Date: Mon, 31 Dec 2012 22:49:29 +0100 Subject: unicode: use Runeerror --- sys/src/cmd/unicode.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'sys/src/cmd/unicode.c') diff --git a/sys/src/cmd/unicode.c b/sys/src/cmd/unicode.c index aec44b750..2d944c42e 100644 --- a/sys/src/cmd/unicode.c +++ b/sys/src/cmd/unicode.c @@ -85,9 +85,13 @@ nums(char *argv[]) q = *argv; while(*q){ w = chartorune(&r, q); - if(r==0x80 && (q[0]&0xFF)!=0x80){ - fprint(2, "unicode: invalid utf string %s\n", *argv); - return "bad utf"; + if(r==Runeerror){ + char b[UTFmax]; + + if(runetochar(b, &r) != w || memcmp(b, q, w) != 0){ + fprint(2, "unicode: invalid utf string %s\n", *argv); + return "bad utf"; + } } Bprint(&bout, "%.4x\n", r); q += w; -- cgit v1.2.3