From 6cadd03bbeace1c256ba875c2e6a877f924877cd Mon Sep 17 00:00:00 2001 From: cinap_lenrek Date: Mon, 31 Dec 2012 21:09:46 +0100 Subject: fix utf and rune handling in preparation for 32bit runes --- sys/src/cmd/disk/9660/cdrdwr.c | 1 - sys/src/cmd/disk/9660/jchar.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'sys/src/cmd/disk') diff --git a/sys/src/cmd/disk/9660/cdrdwr.c b/sys/src/cmd/disk/9660/cdrdwr.c index 36e849377..b80195100 100644 --- a/sys/src/cmd/disk/9660/cdrdwr.c +++ b/sys/src/cmd/disk/9660/cdrdwr.c @@ -503,7 +503,6 @@ Cputrscvt(Cdimg *cd, char *s, int size) { Rune r[256]; - strtorune(r, s); Cputrs(cd, strtorune(r, s), size); } diff --git a/sys/src/cmd/disk/9660/jchar.c b/sys/src/cmd/disk/9660/jchar.c index c49da6351..9836b610c 100644 --- a/sys/src/cmd/disk/9660/jchar.c +++ b/sys/src/cmd/disk/9660/jchar.c @@ -45,8 +45,7 @@ isbadjoliet(char *s) if(utflen(s) > 64) return 1; - strtorune(r, s); - for(p=r; *p; p++) + for(p=strtorune(r, s); *p; p++) if(isjolietfrog(*p)) return 1; return 0; -- cgit v1.2.3