ndb/dns: remove single-ip-address assuptions

[plan9front.git] / sys / src / cmd / unicode.c

diff --git a/sys/src/cmd/unicode.c b/sys/src/cmd/unicode.c
index a04472711b6590b8aa95e52960bfdfd447c453b9..2d944c42e47afbb9ef914bfa33c0443f6229644d 100644 (file)
--- a/sys/src/cmd/unicode.c
+++ b/sys/src/cmd/unicode.c
@@ -51,13 +51,13 @@ range(char *argv[])
                        return "bad range";
                }
                min = strtoul(q, &q, 16);
-               if(min<0 || min>0xFFFF || *q!='-')
+               if(min<0 || min>Runemax || *q!='-')
                        goto err;
                q++;
                if(strchr(hex, *q) == 0)
                        goto err;
                max = strtoul(q, &q, 16);
-               if(max<0 || max>0xFFFF || max<min || *q!=0)
+               if(max<0 || max>Runemax || max<min || *q!=0)
                        goto err;
                i = 0;
                do{
@@ -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;
@@ -111,7 +115,7 @@ chars(char *argv[])
                        return "bad char";
                }
                m = strtoul(q, &q, 16);
-               if(m<0 || m>0xFFFF || *q!=0)
+               if(m<0 || m>Runemax || *q!=0)
                        goto err;
                Bprint(&bout, "%C", m);
                if(!text)