patch-2.2.16 linux/fs/vfat/namei.c

Next file: linux/include/asm-alpha/byteorder.h
Previous file: linux/fs/ufs/inode.c
Back to the patch index
Back to the overall index

diff -urN v2.2.15/linux/fs/vfat/namei.c linux/fs/vfat/namei.c
@@ -675,10 +675,11 @@
 					ip += 4;
 					i += 4;
 				} else {
-					*op++ = nls->charset2uni[*ip].uni1;
-					*op++ = nls->charset2uni[*ip].uni2;
-					ip++;
-					i++;
+ 					int llen;
+ 					nls->char2uni(ip, &llen, op, op+1);
+ 					op += 2;
+ 					ip += llen;
+					i += llen;
 				}
 			}
 		} else {

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)