patch-2.2.16 linux/fs/ncpfs/ncplib_kernel.h

• Lines: 58
• Date: Wed Jun 7 14:26:43 2000
• Orig file: v2.2.15/linux/fs/ncpfs/ncplib_kernel.h
• Orig date: Fri May 14 12:43:13 1999

diff -urN v2.2.15/linux/fs/ncpfs/ncplib_kernel.h linux/fs/ncpfs/ncplib_kernel.h
@@ -114,9 +114,9 @@
 static inline void
 io2vol(struct ncp_server *server, char *name, int case_trans)
 {
-	unsigned char nc;
+	unsigned char nc[2];
 	unsigned char *np;
-	unsigned char *up;
+	int len;
 	struct nls_unicode uc;
 	struct nls_table *nls_in;
 	struct nls_table *nls_out;
@@ -127,11 +127,10 @@
 
 	while (*np)
 	{
-		nc = 0;
-		uc = nls_in->charset2uni[toupperif(*np, case_trans)];
-		up = nls_out->page_uni2charset[uc.uni2];
-		if (up != NULL)	nc = up[uc.uni1];
-		if (nc != 0) *np = nc;
+		nc[0] = toupperif(*np, case_trans);
+		nc[1] = 0x00;
+		nls_in->char2uni(nc, &len, &uc.uni2, &uc.uni1);
+		nls_out->uni2char(0x00, uc.uni2, np, 1, &len);
 		np++;
 	}
 }
@@ -139,9 +138,9 @@
 static inline void
 vol2io(struct ncp_server *server, char *name, int case_trans)
 {
-	unsigned char nc;
+	unsigned char nc[2];
 	unsigned char *np;
-	unsigned char *up;
+	int len;
 	struct nls_unicode uc;
 	struct nls_table *nls_in;
 	struct nls_table *nls_out;
@@ -152,12 +151,11 @@
 
 	while (*np)
 	{
-		nc = 0;
-		uc = nls_in->charset2uni[*np];
-		up = nls_out->page_uni2charset[uc.uni2];
-		if (up != NULL)	nc = up[uc.uni1];
-		if (nc == 0) nc = *np;
-		*np = tolowerif(nc, case_trans);
+		nc[0] = *np;
+		nc[1] = 0;
+		nls_in->char2uni(nc, &len, &uc.uni2, &uc.uni1);
+		nls_out->uni2char(0x00, uc.uni2, nc, 1, &len);
+		*np = tolowerif(nc[0], case_trans);
 		np++;
 	}
 }