|
From: Yuval <uv...@us...> - 2005-11-11 23:36:08
|
Changes by: uvman Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14000/ntfsprogs Modified Files: mkntfs.c ntfsinfo.c ntfsrm.c Log Message: Give a better name to MFT_RECORD_IS_8 and rename FILE_ATTR_DUP_* to match this meaning. Index: mkntfs.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v retrieving revision 1.100 retrieving revision 1.101 diff -u -p -r1.100 -r1.101 --- mkntfs.c 10 Nov 2005 20:54:00 -0000 1.100 +++ mkntfs.c 11 Nov 2005 23:35:57 -0000 1.101 @@ -4358,7 +4358,7 @@ static void mkntfs_create_root_structure add_attr_std_info(m, file_attrs, cpu_to_le32(0x0100)); } else if (i == 9) { - file_attrs |= FILE_ATTR_DUP_VIEW_INDEX_PRESENT; + file_attrs |= FILE_ATTR_VIEW_INDEX_PRESENT; add_attr_std_info(m, file_attrs, cpu_to_le32(0x0101)); } else if (i == 11) { @@ -4366,7 +4366,7 @@ static void mkntfs_create_root_structure cpu_to_le32(0x0101)); } else if (i == 24 || i == 25 || i == 26) { file_attrs |= FILE_ATTR_ARCHIVE; - file_attrs |= FILE_ATTR_DUP_VIEW_INDEX_PRESENT; + file_attrs |= FILE_ATTR_VIEW_INDEX_PRESENT; add_attr_std_info(m, file_attrs, cpu_to_le32(0x0101)); } else { @@ -4384,8 +4384,8 @@ static void mkntfs_create_root_structure m->link_count = cpu_to_le16(le16_to_cpu(m->link_count) + 1); err = add_attr_file_name(m, root_ref, 0LL, 0LL, FILE_ATTR_HIDDEN | FILE_ATTR_SYSTEM | - FILE_ATTR_DUP_FILE_NAME_INDEX_PRESENT, 0, 0, - ".", FILE_NAME_WIN32_AND_DOS); + FILE_ATTR_I30_INDEX_PRESENT, 0, 0, ".", + FILE_NAME_WIN32_AND_DOS); if (!err) { if (g_vol->major_ver == 1) { init_system_file_sd(FILE_root, &sd, &i); @@ -4690,14 +4690,13 @@ static void mkntfs_create_root_structure } else { ntfs_log_verbose("Creating $Secure (mft record 9)\n"); m = (MFT_RECORD*)(g_buf + 9 * g_vol->mft_record_size); - m->flags |= MFT_RECORD_IS_8; + m->flags |= MFT_RECORD_IS_VIEW_INDEX; if (!err) err = create_hardlink(g_index_block, root_ref, m, MK_LE_MREF(9, 9), 0LL, 0LL, FILE_ATTR_HIDDEN | FILE_ATTR_SYSTEM | - FILE_ATTR_DUP_VIEW_INDEX_PRESENT - , 0, 0, "$Secure", - FILE_NAME_WIN32_AND_DOS); + FILE_ATTR_VIEW_INDEX_PRESENT, 0, 0, + "$Secure", FILE_NAME_WIN32_AND_DOS); if (!err) { if (g_vol->minor_ver == 0) { g_buf_sds_first_size = 0x1E0; @@ -4782,9 +4781,8 @@ static void mkntfs_create_root_structure err = create_hardlink(g_index_block, root_ref, m, MK_LE_MREF(11, 11), 0LL, 0LL, FILE_ATTR_HIDDEN | FILE_ATTR_SYSTEM | - FILE_ATTR_DUP_FILE_NAME_INDEX_PRESENT, - 0, 0, "$Extend", - FILE_NAME_WIN32_AND_DOS); + FILE_ATTR_I30_INDEX_PRESENT, 0, 0, + "$Extend", FILE_NAME_WIN32_AND_DOS); /* FIXME: This should be IGNORE_CASE */ if (!err) err = add_attr_index_root(m, "$I30", 4, 0, AT_FILE_NAME, @@ -4811,11 +4809,11 @@ static void mkntfs_create_root_structure /* starting vith file 24 (ignoring file 16-23) */ if (g_vol->major_ver >= 3) { extend_flags = FILE_ATTR_HIDDEN | FILE_ATTR_SYSTEM | - FILE_ATTR_ARCHIVE | FILE_ATTR_DUP_VIEW_INDEX_PRESENT; + FILE_ATTR_ARCHIVE | FILE_ATTR_VIEW_INDEX_PRESENT; ntfs_log_verbose("Creating $Quota (mft record 24)\n"); m = (MFT_RECORD*)(g_buf + 24 * g_vol->mft_record_size); m->flags |= MFT_RECORD_IS_4; - m->flags |= MFT_RECORD_IS_8; + m->flags |= MFT_RECORD_IS_VIEW_INDEX; if (!err) err = create_hardlink_res((MFT_RECORD*)(g_buf + 11 * g_vol->mft_record_size), extend_ref, m, @@ -4836,7 +4834,7 @@ static void mkntfs_create_root_structure ntfs_log_verbose("Creating $ObjId (mft record 25)\n"); m = (MFT_RECORD*)(g_buf + 25 * g_vol->mft_record_size); m->flags |= MFT_RECORD_IS_4; - m->flags |= MFT_RECORD_IS_8; + m->flags |= MFT_RECORD_IS_VIEW_INDEX; if (!err) err = create_hardlink_res((MFT_RECORD*)(g_buf + 11 * g_vol->mft_record_size), extend_ref, @@ -4853,7 +4851,7 @@ static void mkntfs_create_root_structure ntfs_log_verbose("Creating $Reparse (mft record 26)\n"); m = (MFT_RECORD*)(g_buf + 26 * g_vol->mft_record_size); m->flags |= MFT_RECORD_IS_4; - m->flags |= MFT_RECORD_IS_8; + m->flags |= MFT_RECORD_IS_VIEW_INDEX; if (!err) err = create_hardlink_res((MFT_RECORD*)(g_buf + 11 * g_vol->mft_record_size), Index: ntfsinfo.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v retrieving revision 1.94 retrieving revision 1.95 diff -u -p -r1.94 -r1.95 --- ntfsinfo.c 7 Nov 2005 22:28:46 -0000 1.94 +++ ntfsinfo.c 11 Nov 2005 23:35:57 -0000 1.95 @@ -484,15 +484,17 @@ static void ntfs_dump_flags(ATTR_TYPES t printf(" ENCRYPTED"); flags &= ~FILE_ATTR_ENCRYPTED; } + /* We know that FILE_ATTR_I30_INDEX_PRESENT only exists on $FILE_NAME, + and in case we are wrong, let it appear as UNKNOWN */ if (type == AT_FILE_NAME) { - if (flags & FILE_ATTR_DUP_FILE_NAME_INDEX_PRESENT) { - printf(" FILE_NAME_INDEX"); - flags &= ~FILE_ATTR_DUP_FILE_NAME_INDEX_PRESENT; + if (flags & FILE_ATTR_I30_INDEX_PRESENT) { + printf(" I30_INDEX"); + flags &= ~FILE_ATTR_I30_INDEX_PRESENT; } } - if (flags & FILE_ATTR_DUP_VIEW_INDEX_PRESENT) { + if (flags & FILE_ATTR_VIEW_INDEX_PRESENT) { printf(" VIEW_INDEX"); - flags &= ~FILE_ATTR_DUP_VIEW_INDEX_PRESENT; + flags &= ~FILE_ATTR_VIEW_INDEX_PRESENT; } if (flags) printf(" UNKNOWN: 0x%x", (unsigned int)le32_to_cpu(flags)); Index: ntfsrm.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsrm.c,v retrieving revision 1.69 retrieving revision 1.70 diff -u -p -r1.69 -r1.70 --- ntfsrm.c 28 Oct 2005 04:47:52 -0000 1.69 +++ ntfsrm.c 11 Nov 2005 23:35:57 -0000 1.70 @@ -381,7 +381,7 @@ static BOOL utils_pathname_to_inode2(ntf ntfs_log_debug("dt = %p, data_len = %d, parent = %p\n", dt, dt->data_len, dt->parent); //printf("dt's flags = 0x%08x\n", dt->children[dt_num]->key.file_name.file_attributes); - if (dt->children[dt_num]->key.file_name.file_attributes == FILE_ATTR_DUP_FILE_NAME_INDEX_PRESENT) { + if (dt->children[dt_num]->key.file_name.file_attributes == FILE_ATTR_I30_INDEX_PRESENT) { //printf("DIR\n"); child = ntfs_dir_create(dir->vol, dt->children[dt_num]->indexed_file); //printf("child = %p (%lld)\n", child, MREF(dt->children[dt_num]->indexed_file)); |
