patch-2.3.40 linux/fs/hfs/inode.c

Next file: linux/fs/lockd/mon.c
Previous file: linux/fs/hfs/hfs_btree.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.39/linux/fs/hfs/inode.c linux/fs/hfs/inode.c
@@ -44,14 +44,18 @@
 	}
 
 	if (fork == HFS_FK_DATA) {
+#if 0 /* XXX: disable crlf translations for now */
 		hfs_u32 type = hfs_get_nl(entry->info.file.finfo.fdType);
 
-		fk = &entry->u.file.data_fork;
 		HFS_I(inode)->convert =
 			((HFS_SB(inode->i_sb)->s_conv == 't') ||
 			 ((HFS_SB(inode->i_sb)->s_conv == 'a') &&
 			  ((type == htonl(0x54455854)) ||   /* "TEXT" */
 			   (type == htonl(0x7474726f)))));  /* "ttro" */
+#else
+		HFS_I(inode)->convert = 0;
+#endif
+		fk = &entry->u.file.data_fork;
 	} else {
 		fk = &entry->u.file.rsrc_fork;
 		HFS_I(inode)->convert = 0;

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