Index: xvfs.c.rvt
==================================================================
--- xvfs.c.rvt
+++ xvfs.c.rvt
@@ -30,16 +30,18 @@
 	package require xvfs
 	xvfs::main $argv
 ?>
 static long xvfs_<?= $::xvfs::fsName ?>_nameToIndex(const char *path) {
 	unsigned int pathHash;
+	size_t pathLen;
 	
 	if (path == NULL) {
 		return(XVFS_NAME_LOOKUP_ERROR);
 	}
-	
-	pathHash = Tcl_ZlibAdler32(0, (const unsigned char *) path, strlen(path));
+
+	pathLen = strlen(path);
+	pathHash = Tcl_ZlibAdler32(0, (const unsigned char *) path, pathLen);
 	switch (pathHash) {
 <?
 	for {set index 0} {$index < [llength $::xvfs::outputFiles]} {incr index} {
 		set outputFile [lindex $::xvfs::outputFiles $index]
 		set outputFileHash [zlib adler32 $outputFile 0]
@@ -48,11 +50,14 @@
 	
 	foreach {outputFileHash outputFileIndexes} [lsort -stride 2 -dictionary [array get outputFileHashToIndex]] {
 ?>		case <?= $outputFileHash ?>:
 <?
 			foreach outputFileIndex $outputFileIndexes {
-?>			if (strcmp(path, xvfs_<?= $::xvfs::fsName ?>_data[<?= $outputFileIndex ?>].name) == 0) {
+				set outputFileName [lindex $::xvfs::outputFiles $outputFileIndex]
+				set outputFileName [encoding convertto utf-8 $outputFileName]
+				set outputFileNameLen [string length $outputFileName]
+?>			if (pathLen == <?= $outputFileNameLen ?> && memcmp(path, xvfs_<?= $::xvfs::fsName ?>_data[<?= $outputFileIndex ?>].name, pathLen) == 0) {
 				return(<?= $outputFileIndex ?>);
 			}
 <?
 			}
 ?>			break;