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

uhtml: assume latin1 if not valid utf8

Browse source
This commit is contained in:
cinap_lenrek 2011-10-05 04:47:53 +02:00
parent 6f5e6eff59
commit 51c7856350
1 changed files with 37 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -3,8 +3,8 @@
#include <ctype.h> #include <ctype.h>
int nbuf; int nbuf;
char buf[4096+1]; char buf[64*1024+1];
char *cset = "utf"; char *cset = nil;
void void
usage(void) usage(void)
@ -40,8 +40,9 @@ strval(char *s)
void void
main(int argc, char *argv[]) main(int argc, char *argv[])
{ {
int pfd[2], pflag = 0; int n, pfd[2], pflag = 0;
char *arg[4], *s, *p; char *arg[4], *s, *p;
Rune r;
ARGBEGIN { ARGBEGIN {
case 'h': case 'h':
@ -59,25 +60,29 @@ main(int argc, char *argv[])
if(open(*argv, OREAD) != 1) if(open(*argv, OREAD) != 1)
sysfatal("open: %r"); sysfatal("open: %r");
} }
if((nbuf = readn(0, buf, sizeof(buf)-1)) < 0) nbuf = 0;
sysfatal("read: %r");
buf[nbuf] = 0;
p = buf; p = buf;
while(nbuf > 0){ while(nbuf < sizeof(buf)-1){
if(memcmp(p, "\xEF\xBB\xBF", 3)==0){ if((n = read(0, buf + nbuf, sizeof(buf)-1-nbuf)) <= 0)
p += 3;
cset = "utf";
break;
}
if(memcmp(p, "\xFE\xFF", 2) == 0){
p += 2;
cset = "unicode-be";
break;
}
if(memcmp(p, "\xFF\xFE", 2) == 0){
p += 2;
cset = "unicode-le";
break; break;
nbuf += n;
buf[nbuf] = 0;
if(nbuf == n){
if(memcmp(p, "\xEF\xBB\xBF", 3)==0){
p += 3;
cset = "utf";
break;
}
if(memcmp(p, "\xFE\xFF", 2) == 0){
p += 2;
cset = "unicode-be";
break;
}
if(memcmp(p, "\xFF\xFE", 2) == 0){
p += 2;
cset = "unicode-le";
break;
}
} }
if(s = cistrstr(p, "encoding=")) if(s = cistrstr(p, "encoding="))
if(s = strval(s+9)){ if(s = strval(s+9)){
@ -89,10 +94,21 @@ main(int argc, char *argv[])
cset = s; cset = s;
break; break;
} }
break;
} }
nbuf -= p - buf; 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;
}
}
}
if(pflag){ if(pflag){
print("%s\n", cset); print("%s\n", cset);
exits(0); exits(0);