xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

uhtml: use first match

Browse source
This commit is contained in:
cinap_lenrek 2012-07-16 05:32:16 +02:00
parent 739c04e572
commit 4c2c62ee96
1 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
sys/src/cmd/uhtml.c
View file

@ -39,8 +39,8 @@ attr(char *s, char *a)
continue;
break;
}
if(e - s > 1)
return smprint("%.*s", (int)(e-s), s);
if((e - s) > 1)
return smprint("%.*s", (int)(e - s), s);
return nil;
}
@ -78,18 +78,21 @@ main(int argc, char *argv[])
if(nbuf == n){
if(memcmp(p, "\xEF\xBB\xBF", 3)==0){
p += 3;
nbuf -= 3;
cset = "utf";
break;
goto Found;
}
if(memcmp(p, "\xFE\xFF", 2) == 0){
p += 2;
nbuf -= 2;
cset = "unicode-be";
break;
goto Found;
}
if(memcmp(p, "\xFF\xFE", 2) == 0){
p += 2;
nbuf -= 2;
cset = "unicode-le";
break;
goto Found;
}
}
s = g;
@ -114,28 +117,24 @@ main(int argc, char *argv[])
t = *e;
*e = 0;
if((a = attr(g, "encoding")) || (a = attr(g, "charset"))){
cset = a;
*e = t;
break;
cset = a;
goto Found;
}
*e = t;
s = ++e;
} while(t);
}
nbuf -= p - buf;
if(cset == nil){
cset = "utf";
s = p;
while(s+UTFmax < p+nbuf){
s += chartorune(&r, s);
if(r == Runeerror){
cset = "latin1";
break;
}
s = p;
while(s+UTFmax < p+nbuf){
s += chartorune(&r, s);
if(r == Runeerror){
cset = "latin1";
goto Found;
}
}
cset = "utf";
Found:
if(pflag){
print("%s\n", cset);
exits(0);