patch-2.1.119 linux/fs/isofs/joliet.c

Next file: linux/fs/isofs/namei.c
Previous file: linux/fs/isofs/inode.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.118/linux/fs/isofs/joliet.c linux/fs/isofs/joliet.c
@@ -79,8 +79,6 @@
 	unsigned char utf8;
 	struct nls_table *nls;
 	unsigned char len = 0;
-	int i;
-	char c;
 
 	utf8 = inode->i_sb->u.isofs_sb.s_utf8;
 	nls = inode->i_sb->u.isofs_sb.s_nls_iocharset;
@@ -96,14 +94,12 @@
 		len -= 2;
 	}
 
-        if (inode->i_sb->u.isofs_sb.s_name_check == 'r') {
-               for (i = 0; i < len; i++) {
-                       c = outname[i];
-                       /* lower case */
-                       if (c >= 'A' && c <= 'Z') c |= 0x20;
-                       if (c == ';') c = '.';
-                       outname[i] = c;
-               }
+	/*
+	 * Windows doesn't like periods at the end of a name,
+	 * so neither do we
+	 */
+	while (len >= 2 && (outname[len-1] == '.')) {
+		len--;
 	}
 
 	return len;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov