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

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

diff -u --recursive --new-file v2.0.35/linux/fs/isofs/joliet.c linux/fs/isofs/joliet.c
@@ -7,7 +7,6 @@
  */
 
 #include <linux/string.h>
-#include <linux/config.h>
 #include <linux/nls.h>
 #include <linux/malloc.h>
 #include <linux/iso_fs.h>
@@ -95,6 +94,13 @@
 	}
 	if ((len > 2) && (outname[len-2] == ';') && (outname[len-1] == '1')) {
 		len -= 2;
+	}
+
+	/*
+	 * Windows doesn't like periods at the end of a name
+	 */
+	while (len >= 2 && (outname[len-1] == '.')) {
+		len--;
 	}
 
         if (inode->i_sb->u.isofs_sb.s_name_check == 'r') {

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