patch-2.4.0-prerelease linux/fs/vfat/namei.c

• Lines: 22
• Date: Sun Dec 31 10:26:17 2000
• Orig file: v2.4.0-test12/linux/fs/vfat/namei.c
• Orig date: Tue Oct 31 12:42:27 2000

diff -u --recursive --new-file v2.4.0-test12/linux/fs/vfat/namei.c linux/fs/vfat/namei.c
@@ -442,10 +442,9 @@
 	space = 1; /* disallow names starting with a dot */
 	for (walk = name; len && walk-name < 8;) {
 		len--;
-		if ( (chl = nls->uni2char(*walk, charbuf, NLS_MAX_CHARSET_SIZE)) < 0) {
-			walk++;
+		chl = nls->uni2char(*walk++, charbuf, NLS_MAX_CHARSET_SIZE);
+		if (chl < 0)
 			return -EINVAL;
-		}
 
 		for (chi = 0; chi < chl; chi++) {
 			c = vfat_getupper(nls, charbuf[chi]);
@@ -471,7 +470,7 @@
 		if (len >= 4) return -EINVAL;
 		while (len > 0) {
 			len--;
-			chl = vfat_uni2short(nls, *walk++, charbuf, NLS_MAX_CHARSET_SIZE);
+			chl = nls->uni2char(*walk++, charbuf, NLS_MAX_CHARSET_SIZE);
 			if (chl < 0)
 				return -EINVAL;
 			for (chi = 0; chi < chl; chi++) {