summaryrefslogtreecommitdiff
path: root/sys/src/cmd/disk
diff options
context:
space:
mode:
authorcinap_lenrek <cinap_lenrek@gmx.de>2012-12-31 21:09:46 +0100
committercinap_lenrek <cinap_lenrek@gmx.de>2012-12-31 21:09:46 +0100
commit6cadd03bbeace1c256ba875c2e6a877f924877cd (patch)
tree8079ea6f6ccdb1c2cbb2b7813f618837617cb33e /sys/src/cmd/disk
parent6d99096136278f06f6333f927da34105a8dfe0bf (diff)
fix utf and rune handling in preparation for 32bit runes
Diffstat (limited to 'sys/src/cmd/disk')
-rw-r--r--sys/src/cmd/disk/9660/cdrdwr.c1
-rw-r--r--sys/src/cmd/disk/9660/jchar.c3
2 files changed, 1 insertions, 3 deletions
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;