You can subscribe to this list here.
| 2001 |
Jan
(38) |
Feb
(25) |
Mar
(37) |
Apr
(50) |
May
|
Jun
(156) |
Jul
(174) |
Aug
(94) |
Sep
(107) |
Oct
(18) |
Nov
(153) |
Dec
(91) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(79) |
Feb
(117) |
Mar
(39) |
Apr
(164) |
May
(12) |
Jun
(64) |
Jul
(138) |
Aug
(43) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
(17) |
Jun
(100) |
Jul
(210) |
Aug
(127) |
Sep
(89) |
Oct
(214) |
Nov
(176) |
Dec
(20) |
| 2006 |
Jan
(29) |
Feb
(85) |
Mar
(45) |
Apr
(54) |
May
(9) |
Jun
(7) |
Jul
(28) |
Aug
(65) |
Sep
(3) |
Oct
(62) |
Nov
(68) |
Dec
(52) |
| 2007 |
Jan
(6) |
Feb
|
Mar
(8) |
Apr
|
May
|
Jun
(2) |
Jul
(4) |
Aug
|
Sep
|
Oct
(2) |
Nov
|
Dec
|
|
From: Anton A. <an...@us...> - 2001-06-08 19:58:28
|
Changes by: antona Update of /cvsroot/linux-ntfs/linux-ntfs/include In directory usw-pr-cvs1:/tmp/cvs-serv22856/include Modified Files: layout.h Log Message: getting closer to mkntfs alpha. Index: layout.h =================================================================== RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/layout.h,v retrieving revision 1.7 retrieving revision 1.8 diff -U2 -r1.7 -r1.8 --- layout.h 2001/06/06 22:55:49 1.7 +++ layout.h 2001/06/08 19:58:24 1.8 @@ -1899,5 +1899,5 @@ index key. */ __u16 data_length; /* Data length in bytes. */ - __u32 reserved; /* Reserved (zero). */ + __u32 reservedV; /* Reserved (zero). */ } __attribute__ ((__packed__)); } __attribute__ ((__packed__)); |
|
From: Anton A. <an...@us...> - 2001-06-08 14:09:55
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools
In directory usw-pr-cvs1:/tmp/cvs-serv18316/ntfstools
Modified Files:
mkntfs.c
Log Message:
mkntfs compiles. But untested. Also there are still things to do...
Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/mkntfs.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -U2 -r1.14 -r1.15
--- mkntfs.c 2001/06/07 23:31:54 1.14
+++ mkntfs.c 2001/06/08 14:09:52 1.15
@@ -85,6 +85,7 @@
unsigned char *lcn_bitmap = NULL;
run_list *rl = NULL, *rl_mft = NULL, *rl_mftmirr = NULL, *rl_logfile = NULL;
-run_list *rl_boot = NULL, *rl_bad = NULL;
-INDEX_ALLOCATION *index = NULL;
+run_list *rl_boot = NULL, *rl_bad = NULL, *rl_index;
+INDEX_ALLOCATION *index_block = NULL;
+uchar_t *ustr = NULL;
struct {
@@ -1545,24 +1546,8 @@
}
-/*
- * Write @val_len bytes from @val into the non-resident value of the attribute
- * @a in the mft record @m at offset @ofs into the attribute value.
- *
- * Note, the attribute value must be of sufficient size (>= @ofs + @val_len) for
- * this function to succeed; i.e. this function does not resize the attribute
- * value.
- *
- * Return 0 on success or -errno on error.
- */
-int write_non_resident_attr_value(MFT_RECORD *m, ATTR_RECORD *a, char *val,
- char *val_len)
-{
- retun -ENOTSUP;
-}
-
__s64 time2ntfs(__s64 time)
{
return cpu_to_le64((time + (__s64)(369 * 365 + 89) * 24 * 3600)
- * 10000000);
+ * 10000000);
}
@@ -2127,6 +2112,6 @@
while ((char*)ie < index_end && !(ie->flags & INDEX_ENTRY_END)) {
ie_key_len = le16_to_cpu(ie->key_length);
- i = memcmp(ie->key.file_name, file_name, min(ie_key_len,
- file_name_size));
+ i = memcmp((char*)&ie->key.file_name, (char*)file_name,
+ min(ie_key_len, file_name_size));
/* Gone too far, thus found insertion location. */
if (i > 0)
@@ -2155,5 +2140,5 @@
if (err) {
Eprintf("make_room_for_index_entry_in_index_block failed: "
- "%s\n", sterror(-err));
+ "%s\n", strerror(-err));
return err;
}
@@ -2191,6 +2176,6 @@
int err;
- if (index)
- free(index);
+ if (index_block)
+ free(index_block);
if (buf)
free(buf);
@@ -2213,4 +2198,8 @@
if (rl_bad)
free(rl_bad);
+ if (rl_index)
+ free(rl_index);
+ if (ustr)
+ free(ustr);
if (opt.bad_blocks)
free(opt.bad_blocks);
@@ -2406,5 +2395,6 @@
/* Needs to be multiple of 8 bytes. */
lcn_bitmap_byte_size = lcn_bitmap_byte_size + 7 & ~7;
- i = lcn_bitmap_byte_size + opt.cluster_size - 1 & ~(opt.cluster_size - 1);
+ i = lcn_bitmap_byte_size + opt.cluster_size - 1 &
+ ~(opt.cluster_size - 1);
Dprintf("lcn_bitmap_byte_size = %i, allocated = %i\n",
lcn_bitmap_byte_size, i);
@@ -2673,5 +2663,5 @@
if (!err) {
err = upgrade_to_large_index(m, "$I30", 4, IGNORE_CASE,
- opt.upcase, opt.upcase_len, &index);
+ opt.upcase, opt.upcase_len, &index_block);
}
if (!err) {
@@ -2683,5 +2673,5 @@
err_exit("BUG: $FILE_NAME attribute not found.\n");
a = ctx.attr;
- err = insert_file_link_in_dir_index(index, root_ref,
+ err = insert_file_link_in_dir_index(index_block, root_ref,
(FILE_NAME_ATTR*)((char*)a +
le16_to_cpu(a->value_offset)),
@@ -2694,15 +2684,31 @@
/* Sync the root directory's index block @index to disk. */
Dprintf("Syncing root directory index record.\n");
+ i = 5 * sizeof(uchar_t);
+ ustr = (uchar_t*)calloc(1, i);
+ if (!ustr)
+ err_exit("Not enough memory to allocate internal buffer.\n");;
+ j = stoucs(ustr, "$I30", i);
+ memset(&ctx, 0, sizeof(ctx));
+ ctx.mrec = m;
+ if (!find_first_attr($INDEX_ALLOCATION, ustr, j, IGNORE_CASE,
+ opt.upcase, opt.upcase_len, NULL, 0, &ctx))
+ err_exit("BUG: $INDEX_ALLOCATION attribute not found.\n");
+ a = ctx.attr;
i = sizeof(INDEX_BLOCK) - sizeof(INDEX_HEADER) +
- le32_to_cpu(index->index.allocated_size);
- err = pre_write_mst_fixup((NTFS_RECORD*)index, i);
+ le32_to_cpu(index_block->index.allocated_size);
+ if (sle64_to_cpu(a->initialized_size) < i)
+ err_exit("BUG: $INDEX_ALLOCATION attribute too short.\n");
+ rl_index = decompress_run_list(a);
+ if (!rl_index)
+ err_exit("Failed to decompress run list of $INDEX_ALLOCATION "
+ "attribute.\n");
+ err = pre_write_mst_fixup((NTFS_RECORD*)index_block, i);
if (err)
err_exit("pre_write_mst_fixup() failed while syncing root "
"directory index block.\n");
- err = write_non_resident_attr_value();
- if (err)
- err_exit("write_non_resident_attr_value() failed while syncing "
- "root directory index block.\n");
- __post_read_mst_fixup((NTFS_RECORD*)index, i);
+ lw = ntfs_rlwrite(f, rl_index, (char*)index_block, i, NULL);
+ if (lw != i)
+ err_exit("Error writing $INDEX_ALLOCATION.\n");
+ __post_read_mst_fixup((NTFS_RECORD*)index_block, i);
// move down up to here
dump_mft_record(m);
|
|
From: Anton A. <an...@us...> - 2001-06-08 14:09:55
|
Changes by: antona Update of /cvsroot/linux-ntfs/linux-ntfs In directory usw-pr-cvs1:/tmp/cvs-serv18316 Modified Files: TODO.mkntfs Log Message: mkntfs compiles. But untested. Also there are still things to do... Index: TODO.mkntfs =================================================================== RCS file: /cvsroot/linux-ntfs/linux-ntfs/TODO.mkntfs,v retrieving revision 1.2 retrieving revision 1.3 diff -U2 -r1.2 -r1.3 --- TODO.mkntfs 2001/06/01 02:07:23 1.2 +++ TODO.mkntfs 2001/06/08 14:09:52 1.3 @@ -9,7 +9,9 @@ middle of the volume. This saves us from having to access the last sector but still requires us to know how many sectors there are. +- re: last sector. In the case when we do have an even number of sectors so that +we don't have a free sector at the end of the volume we need to kill the last +cluster to get a free sector at the end. - need to create the root directory. for this need index root and index allocation creation and handling functions (mutch work) - implement command line parsing using the get_opt*() stuff: for now just want clust size selection, no action, verbose and debug. rest can follow later -- modify syscalls for sector size / nr sectors to get defaults when failed. |
|
From: Anton A. <an...@us...> - 2001-06-07 23:31:57
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools
In directory usw-pr-cvs1:/tmp/cvs-serv19777/ntfstools
Modified Files:
mkntfs.c
Log Message:
mkntfs - the end to the saga draws closer...
Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/mkntfs.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -U2 -r1.13 -r1.14
--- mkntfs.c 2001/06/06 22:55:49 1.13
+++ mkntfs.c 2001/06/07 23:31:54 1.14
@@ -87,5 +87,4 @@
run_list *rl_boot = NULL, *rl_bad = NULL;
INDEX_ALLOCATION *index = NULL;
-unsigned int index_size;
struct {
@@ -1546,4 +1545,20 @@
}
+/*
+ * Write @val_len bytes from @val into the non-resident value of the attribute
+ * @a in the mft record @m at offset @ofs into the attribute value.
+ *
+ * Note, the attribute value must be of sufficient size (>= @ofs + @val_len) for
+ * this function to succeed; i.e. this function does not resize the attribute
+ * value.
+ *
+ * Return 0 on success or -errno on error.
+ */
+int write_non_resident_attr_value(MFT_RECORD *m, ATTR_RECORD *a, char *val,
+ char *val_len)
+{
+ retun -ENOTSUP;
+}
+
__s64 time2ntfs(__s64 time)
{
@@ -1552,4 +1567,5 @@
}
+/* Return 0 on success or -errno on error. */
int add_attr_std_info(MFT_RECORD *m, const FILE_ATTR_FLAGS flags)
{
@@ -1894,5 +1910,5 @@
__u32 name_len, const IGNORE_CASE_BOOL ic,
const uchar_t *upcase, const __u32 upcase_len,
- INDEX_ALLOCATION **index, __u32 **index_size)
+ INDEX_ALLOCATION **index)
{
attr_search_context ctx;
@@ -2027,5 +2043,4 @@
}
*index = ia_val;
- *index_size = index_block_size;
return 0;
}
@@ -2083,15 +2098,14 @@
* Insert the fully completed FILE_NAME_ATTR @file_name which is inside
* the file with mft reference @file_ref into the index (allocation) block
- * @index of the parent directory with mft reference @parent_ref and mft
- * record @parent_dir.
+ * @index (which belongs to @file_ref's parent directory).
*
* Return 0 on success or -errno on error.
*/
-int insert_file_link_in_dir_index(INDEX_BLOCK *index, MFT_REF parent_ref,
- MFT_RECORD *parent_dir, MFT_REF file_ref,
+int insert_file_link_in_dir_index(INDEX_BLOCK *index, MFT_REF file_ref,
FILE_NAME_ATTR *file_name, __u32 file_name_size)
{
- int err;
+ int err, ie_key_len, i;
INDEX_ENTRY *ie;
+ char *index_end;
/*
@@ -2099,17 +2113,55 @@
* insertion location.
*/
- while (/**/) {
- //..
+ // FIXME: This is written doing a binary comparison of the
+ // file_name_attr values. This might NOT be what COLLATION_FILE_NAME
+ // means! Check it out!!! It quite probably is a comparison of the
+ // actual names within the file_name_attributes rather than this.
+ index_end = (char*)&index->index +
+ le32_to_cpu(index->index.index_length);
+ ie = (INDEX_ENTRY*)((char*)&index->index +
+ le32_to_cpu(index->index.entries_offset));
+ /*
+ * Loop until we exceed valid memory (corruption case) or until we
+ * reach the last entry.
+ */
+ while ((char*)ie < index_end && !(ie->flags & INDEX_ENTRY_END)) {
+ ie_key_len = le16_to_cpu(ie->key_length);
+ i = memcmp(ie->key.file_name, file_name, min(ie_key_len,
+ file_name_size));
+ /* Gone too far, thus found insertion location. */
+ if (i > 0)
+ break;
+ /* Perfect match. But what about the lengths? */
+ if (!i) {
+ /* Gone too far, thus found insertion location. */
+ if (ie_key_len > file_name_size)
+ break;
+ /* Found it. Bugger! Shouldn't be there! */
+ if (ie_key_len == file_name_size)
+ return -EEXIST;
+ /* Name too short, keep looking. */
+ /* if (ie_key_len < file_name_size)
+ goto do_next; */
+ }
+ /* Not found it yet, keep looking. */
+ /* if (i < 0)
+ goto do_next; */
+do_next:
+ /* Next entry. */
+ ie = (INDEX_ENTRY*)((char*)ie + le16_to_cpu(ie->length));
};
err = make_room_for_index_entry_in_index_block(index, ie,
file_name_size);
if (err) {
- //..
+ Eprintf("make_room_for_index_entry_in_index_block failed: "
+ "%s\n", sterror(-err));
+ return err;
}
/* Create entry in place and copy file name attribute value. */
ie->indexed_file = file_ref;
- ie->length = cpu_to_le16();
+ ie->length = cpu_to_le16(sizeof(INDEX_ENTRY_HEADER) + file_name_size +
+ 7 & ~7);
ie->key_length = cpu_to_le16(file_name_size);
- ie->flags = ;
+ ie->flags = 0;
ie->reserved = cpu_to_le16(0);
memcpy((char*)&ie->key.file_name, (char*)file_name, file_name_size);
@@ -2138,5 +2190,7 @@
{
int err;
-
+
+ if (index)
+ free(index);
if (buf)
free(buf);
@@ -2619,6 +2673,5 @@
if (!err) {
err = upgrade_to_large_index(m, "$I30", 4, IGNORE_CASE,
- opt.upcase, opt.upcase_len, &index,
- &index_size);
+ opt.upcase, opt.upcase_len, &index);
}
if (!err) {
@@ -2631,11 +2684,26 @@
a = ctx.attr;
err = insert_file_link_in_dir_index(index, root_ref,
- m, root_ref, (FILE_NAME_ATTR*)((char*)a +
+ (FILE_NAME_ATTR*)((char*)a +
le16_to_cpu(a->value_offset)),
le32_to_cpu(a->value_length));
}
- if (err < 0)
+ if (err)
err_exit("Couldn't create root directory: %s\n",
strerror(-err));
+ // move this to the end after verifying it works ok so far
+ /* Sync the root directory's index block @index to disk. */
+ Dprintf("Syncing root directory index record.\n");
+ i = sizeof(INDEX_BLOCK) - sizeof(INDEX_HEADER) +
+ le32_to_cpu(index->index.allocated_size);
+ err = pre_write_mst_fixup((NTFS_RECORD*)index, i);
+ if (err)
+ err_exit("pre_write_mst_fixup() failed while syncing root "
+ "directory index block.\n");
+ err = write_non_resident_attr_value();
+ if (err)
+ err_exit("write_non_resident_attr_value() failed while syncing "
+ "root directory index block.\n");
+ __post_read_mst_fixup((NTFS_RECORD*)index, i);
+ // move down up to here
dump_mft_record(m);
/* Add all other attributes, on a per-file basis for clarity. */
|
|
From: Anton A. <an...@us...> - 2001-06-06 22:55:52
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv1263/include
Modified Files:
layout.h
Log Message:
And some more mkntfs + some updates to layout.h concerning directories and
alignment requirements.
Index: layout.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/layout.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -U2 -r1.6 -r1.7
--- layout.h 2001/06/04 14:04:30 1.6
+++ layout.h 2001/06/06 22:55:49 1.7
@@ -1702,9 +1702,11 @@
*/
typedef struct {
- __u32 entries_offset; /* Byte offset to first INDEX_ENTRY. */
+ __u32 entries_offset; /* Byte offset to first INDEX_ENTRY
+ aligned to 8-byte boundary. */
__u32 index_length; /* Data size of the index in bytes,
i.e. bytes used from allocated
- size. */
- __u32 allocated_size; /* Byte size of this index (block). */
+ size, aligned to 8-byte boundary. */
+ __u32 allocated_size; /* Byte size of this index (block),
+ multiple of 8 bytes. */
/* NOTE: For the index root attribute, the above two numbers are always
equal, as the attribute is resident and it is resized as needed. In
@@ -1900,7 +1902,9 @@
} __attribute__ ((__packed__));
} __attribute__ ((__packed__));
-/* 8*/ __u16 length; /* Byte size of this index entry. */
+/* 8*/ __u16 length; /* Byte size of this index entry, multiple of
+ 8-bytes. */
/* 10*/ __u16 key_length; /* Byte size of the key value, which is in the
- index entry. It follows field reserved. */
+ index entry. It follows field reserved. Not
+ multiple of 8-bytes. */
/* 12*/ INDEX_ENTRY_FLAGS flags; /* Bit field of INDEX_ENTRY_* flags. */
/* 14*/ __u16 reserved; /* Reserved/align to 8-byte boundary. */
@@ -1922,5 +1926,5 @@
FILE_NAME_ATTR. On NTFS 3.0+ the following
additional index keys are defined: */
- FILE_NAME_ATTR filename;/* $I30 index in directories. */
+ FILE_NAME_ATTR file_name;/* $I30 index in directories. */
SII_INDEX_KEY sii; /* $SII index in $Secure. */
SDH_INDEX_KEY sdh; /* $SDH index in $Secure. */
|
|
From: Anton A. <an...@us...> - 2001-06-06 22:55:52
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools
In directory usw-pr-cvs1:/tmp/cvs-serv1263/ntfstools
Modified Files:
mkntfs.c
Log Message:
And some more mkntfs + some updates to layout.h concerning directories and
alignment requirements.
Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/mkntfs.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -U2 -r1.12 -r1.13
--- mkntfs.c 2001/06/05 23:45:47 1.12
+++ mkntfs.c 2001/06/06 22:55:49 1.13
@@ -86,4 +86,6 @@
run_list *rl = NULL, *rl_mft = NULL, *rl_mftmirr = NULL, *rl_logfile = NULL;
run_list *rl_boot = NULL, *rl_bad = NULL;
+INDEX_ALLOCATION *index = NULL;
+unsigned int index_size;
struct {
@@ -1891,5 +1893,6 @@
int upgrade_to_large_index(MFT_RECORD *m, const char *name,
__u32 name_len, const IGNORE_CASE_BOOL ic,
- const uchar_t *upcase, const __u32 upcase_len)
+ const uchar_t *upcase, const __u32 upcase_len,
+ INDEX_ALLOCATION **index, __u32 **index_size)
{
attr_search_context ctx;
@@ -2020,14 +2023,96 @@
__post_read_mst_fixup((NTFS_RECORD*)ia_val, index_block_size);
// Revert index root from index allocation.
+ free(ia_val);
+ return err;
}
- free(ia_val);
- return err;
+ *index = ia_val;
+ *index_size = index_block_size;
+ return 0;
}
-/* Return 0 on success or -errno on error. */
-int insert_file_link_in_dir(MFT_RECORD *parent_dir, FILE_NAME *file_name,
- __u32 file_name_size)
+/*
+ * Create space of @size bytes at position @pos inside the index block @index.
+ *
+ * Return 0 on success or -errno on error.
+ */
+int make_room_for_index_entry_in_index_block(INDEX_BLOCK *index,
+ INDEX_ENTRY *pos, __u32 size)
{
- return -ENOTSUP;
+ __u32 biu;
+
+ if (!size)
+ return 0;
+#ifdef DEBUG
+ /*
+ * Rigorous consistency checks. Always return -EINVAL even if more
+ * appropriate codes exist for simplicity of parsing the return value.
+ */
+ if (size != (size + 7 & ~7)) {
+ Eprintf("make_room_for_index_entry_in_index_block() received "
+ "non 8-byte aligned size.\n");
+ return -EINVAL;
+ }
+ if (!index || !pos)
+ return -EINVAL;
+ if ((char*)pos < (char*)index || (char*)pos + size < (char*)index ||
+ (char*)pos > (char*)index + sizeof(INDEX_BLOCK) -
+ sizeof(INDEX_HEADER) +
+ le32_to_cpu(index->index.allocated_size) ||
+ (char*)pos + size > (char*)index + sizeof(INDEX_BLOCK) -
+ sizeof(INDEX_HEADER) +
+ le32_to_cpu(index->index.allocated_size))
+ return -EINVAL;
+ /* The - sizeof(INDEX_ENTRY_HEADER) is for the index terminator. */
+ if ((char*)pos - (char*)index > le32_to_cpu(index->index.index_length)
+ - sizeof(INDEX_ENTRY_HEADER))
+ return -EINVAL;
+#endif
+ biu = le32_to_cpu(index->index.index_length);
+ /* Do we have enough space? */
+ if (biu + size > le32_to_cpu(index->index.allocated_size))
+ return -ENOSPC;
+ /* Move everything after pos to pos + size. */
+ memmove((char*)pos + size, (char*)pos, biu - ((char*)pos -
+ (char*)&index->index));
+ /* Update index block. */
+ index->index.index_length = cpu_to_le32(biu + size);
+ return 0;
+}
+
+/*
+ * Insert the fully completed FILE_NAME_ATTR @file_name which is inside
+ * the file with mft reference @file_ref into the index (allocation) block
+ * @index of the parent directory with mft reference @parent_ref and mft
+ * record @parent_dir.
+ *
+ * Return 0 on success or -errno on error.
+ */
+int insert_file_link_in_dir_index(INDEX_BLOCK *index, MFT_REF parent_ref,
+ MFT_RECORD *parent_dir, MFT_REF file_ref,
+ FILE_NAME_ATTR *file_name, __u32 file_name_size)
+{
+ int err;
+ INDEX_ENTRY *ie;
+
+ /*
+ * Lookup dir entry @file_name in dir @index to determine correct
+ * insertion location.
+ */
+ while (/**/) {
+ //..
+ };
+ err = make_room_for_index_entry_in_index_block(index, ie,
+ file_name_size);
+ if (err) {
+ //..
+ }
+ /* Create entry in place and copy file name attribute value. */
+ ie->indexed_file = file_ref;
+ ie->length = cpu_to_le16();
+ ie->key_length = cpu_to_le16(file_name_size);
+ ie->flags = ;
+ ie->reserved = cpu_to_le16(0);
+ memcpy((char*)&ie->key.file_name, (char*)file_name, file_name_size);
+ return 0;
}
@@ -2532,7 +2617,9 @@
opt.upcase_len, $FILE_NAME, COLLATION_FILE_NAME,
opt.index_block_size);
- if (!err)
+ if (!err) {
err = upgrade_to_large_index(m, "$I30", 4, IGNORE_CASE,
- opt.upcase, opt.upcase_len);
+ opt.upcase, opt.upcase_len, &index,
+ &index_size);
+ }
if (!err) {
memset(&ctx, 0, sizeof(ctx));
@@ -2543,5 +2630,6 @@
err_exit("BUG: $FILE_NAME attribute not found.\n");
a = ctx.attr;
- err = insert_file_link_in_dir(m, (FILE_NAME*)((char*)a +
+ err = insert_file_link_in_dir_index(index, root_ref,
+ m, root_ref, (FILE_NAME_ATTR*)((char*)a +
le16_to_cpu(a->value_offset)),
le32_to_cpu(a->value_length));
|
|
From: Anton A. <an...@us...> - 2001-06-05 23:45:51
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools
In directory usw-pr-cvs1:/tmp/cvs-serv5631/ntfstools
Modified Files:
mkntfs.c
Log Message:
The mkntfs saga continues.
Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/mkntfs.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -U2 -r1.11 -r1.12
--- mkntfs.c 2001/06/05 10:33:02 1.11
+++ mkntfs.c 2001/06/05 23:45:47 1.12
@@ -980,4 +980,33 @@
}
+/* Return 0 on success and -errno on error. */
+int resize_resident_attribute_value(MFT_RECORD *m, ATTR_RECORD *a,
+ const __u32 new_vsize)
+{
+ int new_alen, new_muse;
+
+ /* New attribute length and mft record bytes used. */
+ new_alen = le32_to_cpu(a->length) - le32_to_cpu(a->value_length) +
+ new_vsize + 7 & ~7;
+ new_muse = le32_to_cpu(m->bytes_in_use) - le32_to_cpu(a->length) +
+ new_alen;
+ /* Check for sufficient space. */
+ if (new_muse > le32_to_cpu(m->bytes_allocated) ) {
+ // Aarrgghh! Need to make space. Probably want generic function
+ // for this as we need to call it from other places, too.
+ return -ENOTSUP;
+ }
+ /* Move attributes behind @a to their new location. */
+ memmove((char*)a + new_alen, (char*)a + le32_to_cpu(a->length),
+ le32_to_cpu(m->bytes_in_use) - ((char*)a - (char*)m) -
+ le32_to_cpu(a->length));
+ /* Adjust @m to reflect change in used space. */
+ m->bytes_in_use = cpu_to_le32(new_muse);
+ /* Adjust @a to reflect new value size. */
+ a->length = cpu_to_le32(new_alen);
+ a->value_length = cpu_to_le32(new_vsize);
+ return -ENOTSUP;
+}
+
void deallocate_scattered_clusters(const run_list *rl)
{
@@ -1871,5 +1900,5 @@
uchar_t *uname;
char bmp[8];
- char *re_end;
+ char *re_start, *re_end;
int i, err, r_size, index_block_size;
@@ -1900,5 +1929,6 @@
r = (INDEX_ROOT*)((char*)a + le16_to_cpu(a->value_offset));
re_end = (char*)r + le32_to_cpu(a->value_length);
- re = (INDEX_ENTRY*)((char*)&r->index + r->index.entries_offset);
+ re_start = (char*)&r->index + le32_to_cpu(r->index.entries_offset);
+ re = (INDEX_ENTRY*)re_start;
index_block_size = le32_to_cpu(r->index_block_size);
memset(bmp, 0, sizeof(bmp));
@@ -1914,7 +1944,5 @@
/* Setup header. */
ia_val->magic = magic_INDX;
- /* should be at 0x28 */
ia_val->usa_ofs = cpu_to_le16(sizeof(INDEX_ALLOCATION));
- /* should be 9 */
if (index_block_size >= NTFS_SECTOR_SIZE)
ia_val->usa_count = cpu_to_le16(index_block_size /
@@ -1928,4 +1956,6 @@
"system created was corrupt.\nThank you.");
}
+ Dprintf("usa count in index block = %i\n",
+ cpu_to_le16(ia_val->usa_count));
/* Set USN to 1. */
*(__u16*)((char*)ia_val + le16_to_cpu(ia_val->usa_ofs)) =
@@ -1933,49 +1963,69 @@
ia_val->lsn = cpu_to_le64(0);
ia_val->index_block_vcn = cpu_to_le64(0);
+ ia_val->index.flags = LEAF_NODE;
/* Align to 8-byte boundary. */
- ia_val->index.entries_offset = cpu_to_le32((sizeof(INDEX_HEADER) +
- le16_to_cpu(ia_val->usa_count) * 2) + 7 & ~7);
+ ia_val->index.entries_offset = cpu_to_le32(sizeof(INDEX_HEADER) +
+ le16_to_cpu(ia_val->usa_count) * 2 + 7 & ~7);
ia_val->index.allocated_size = cpu_to_le32(index_block_size -
(sizeof(INDEX_ALLOCATION) - sizeof(INDEX_HEADER)));
- ae = (INDEX_ENTRY*)((char*)ia_val +
- le32_to_cpu(ia_val->index.entries_offset));
- /* Move one entry. */
- memcpy(ae, re, le16_to_cpu(re->length));
- /* If there are more entries move them all. */
+ /* Find the last entry in the index root and save it in re. */
while ((char*)re < re_end && !(re->flags & INDEX_ENTRY_END)) {
/* Next entry in index root. */
re = (INDEX_ENTRY*)((char*)re + le16_to_cpu(re->length));
- /* Next entry in index allocation. */
- ae = (INDEX_ENTRY*)((char*)ae + le16_to_cpu(ae->length));
- /* Move the entry. */
- memcpy(ae, re, le16_to_cpu(re->length));
}
- ia_val->index.index_length = cpu_to_le32((char*)ae -
- (char*)&ia_val->index + le16_to_cpu(ae->length));
- /*
- * Finished with setting up of index allocation. Now fixup index root
- * to be empty and just to point to the index allocation VCN 0.
- */
- // Need to change the r->index.index_length and .allocated_size and
- // make the first entry to be a terminator with vcn and vcn = 0LL.
- // re at the moment points to the index root termination index entry
- // Also, need to resize the index root attribute! Especially so if it
- // was empty like it is in the mkntfs case as we are actualy making it
- // bigger by 8 bytes for the VCN in the termination entry!!! We would
- // overwrite the next attribute otherwise! BANG.
- r->index.index_length = cpu_to_le32((char*)ae -
- (char*)&ia_val->index + le16_to_cpu(ae->length));
+ /* Copy all the entries including the termination entry. */
+ i = (char*)re - re_start + le16_to_cpu(re->length);
+ memcpy((char*)ia_val + le32_to_cpu(ia_val->index.entries_offset),
+ re_start, i);
+ /* Finish setting up index allocation. */
+ ia_val->index.index_length = cpu_to_le32(i +
+ le32_to_cpu(ia_val->index.entries_offset));
+ /* Move the termination entry forward to the beginning if necessary. */
+ if ((char*)re > re_start) {
+ memmove(re_start, (char*)re, le16_to_cpu(re->length));
+ re = (INDEX_ENTRY*)re_start;
+ }
+ /* Now fixup empty index root with pointer to index allocation VCN 0. */
+ r->index.flags = LARGE_INDEX;
+ re->flags |= INDEX_ENTRY_NODE;
+ if (le16_to_cpu(re->length) < sizeof(INDEX_ENTRY_HEADER) + sizeof(VCN))
+ re->length = cpu_to_le16(le16_to_cpu(re->length) + sizeof(VCN));
+ r->index.index_length = cpu_to_le32(le32_to_cpu(r->index.entries_offset)
+ + le16_to_cpu(re->length));
+ r->index.allocated_size = r->index.index_length;
+ /* Resize index root attribute. */
+ err = resize_resident_attribute_value(m, a, sizeof(INDEX_ROOT) -
+ sizeof(INDEX_HEADER) +
+ le32_to_cpu(r->index.allocated_size));
+ if (err) {
+ // TODO: Remove the added bitmap!
+ // Revert index root from index allocation.
+ free(ia_val);
+ return err;
+ }
+ /* Set VCN pointer to 0LL. */
+ *(VCN*)((char*)re + cpu_to_le16(re->length) - sizeof(VCN)) =
+ cpu_to_le64(0);
+ err = pre_write_mst_fixup((NTFS_RECORD*)ia_val, index_block_size);
+ if (!err) {
+ Eprintf("pre_write_mst_fixup() failed in "
+ "upgrade_to_large_index.\n");
+ free(ia_val);
+ return -EINVAL;
+ }
err = add_attr_index_alloc(m, name, name_len, ic, upcase, upcase_len,
(char*)ia_val, index_block_size);
if (err) {
// TODO: Remove the added bitmap!
- return err;
+ __post_read_mst_fixup((NTFS_RECORD*)ia_val, index_block_size);
+ // Revert index root from index allocation.
}
- err = -ENOTSUP;
+ free(ia_val);
return err;
}
/* Return 0 on success or -errno on error. */
-int insert_file_link_in_dir(MFT_RECORD *m)
+int insert_file_link_in_dir(MFT_RECORD *parent_dir, FILE_NAME *file_name,
+ __u32 file_name_size)
{
return -ENOTSUP;
@@ -2483,7 +2533,18 @@
opt.index_block_size);
if (!err)
- err = insert_file_link_in_dir(m);
- // add_attr_bitmap(m, );
- // add_attr_index_alloc(m, );
+ err = upgrade_to_large_index(m, "$I30", 4, IGNORE_CASE,
+ opt.upcase, opt.upcase_len);
+ if (!err) {
+ memset(&ctx, 0, sizeof(ctx));
+ ctx.mrec = m;
+ /* There is exactly one file name so this is ok. */
+ if (!find_first_attr($FILE_NAME, NULL, 0, 0, NULL, 0, NULL, 0,
+ &ctx))
+ err_exit("BUG: $FILE_NAME attribute not found.\n");
+ a = ctx.attr;
+ err = insert_file_link_in_dir(m, (FILE_NAME*)((char*)a +
+ le16_to_cpu(a->value_offset)),
+ le32_to_cpu(a->value_length));
+ }
if (err < 0)
err_exit("Couldn't create root directory: %s\n",
@@ -2495,4 +2556,13 @@
err = add_attr_data_positioned(m, NULL, 0, 0, NULL, 0, 0, rl_mft, buf,
opt.mft_size);
+ // FIXME: Do a higher level directory link insertion so that we make
+ // a call simillar to the below but also with the parent dir and that
+ // call does the add_attr_file_name and the insert_file_link_in_dir
+ // and anything else necessary in one go.
+ // Also think about in general having the functions return the created
+ // attribute value so we can modify it in memory and at the end sync to
+ // disk rather than having each function call result in a disk read.
+ // Even though read/writes should be cached in the buffer cache so it
+ // shouldn't be too much of a problem.
if (!err)
err = add_attr_file_name(m, root_ref, opt.mft_size,
|
|
From: Anton A. <an...@us...> - 2001-06-05 10:33:06
|
Changes by: antona Update of /cvsroot/linux-ntfs/linux-ntfs In directory usw-pr-cvs1:/tmp/cvs-serv18737 Modified Files: config.h.in configure configure.in Log Message: Update automatic config/make process and mkntfs to use the cvs release tag for version reporting. Index: config.h.in =================================================================== RCS file: /cvsroot/linux-ntfs/linux-ntfs/config.h.in,v retrieving revision 1.3 retrieving revision 1.4 diff -U2 -r1.3 -r1.4 --- config.h.in 2001/06/01 02:07:23 1.3 +++ config.h.in 2001/06/05 10:33:02 1.4 @@ -82,4 +82,7 @@ #undef HAVE_PUTS +/* Define if you have the `random' function. */ +#undef HAVE_RANDOM + /* Define if you have the `read' function. */ #undef HAVE_READ @@ -100,4 +103,7 @@ #undef HAVE_SIGNAL_H +/* Define if you have the `srandom' function. */ +#undef HAVE_SRANDOM + /* Define if you have the `strdup' function. */ #undef HAVE_STRDUP @@ -118,4 +124,10 @@ #undef HAVE_SYS_TYPES_H +/* Define if you have the `time' function. */ +#undef HAVE_TIME + +/* Define if you have the <time.h> header file. */ +#undef HAVE_TIME_H + /* Define if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H @@ -123,10 +135,4 @@ /* Define if you have the `vprintf' function. */ #undef HAVE_VPRINTF - -/* Define if you have the `wcslen' function. */ -#undef HAVE_WCSLEN - -/* Define if you have the `wcstombs' function. */ -#undef HAVE_WCSTOMBS /* Define if you have the `write' function. */ Index: configure =================================================================== RCS file: /cvsroot/linux-ntfs/linux-ntfs/configure,v retrieving revision 1.3 retrieving revision 1.4 diff -U2 -r1.3 -r1.4 --- configure 2001/06/01 02:07:23 1.3 +++ configure 2001/06/05 10:33:02 1.4 @@ -5660,5 +5660,5 @@ for ac_header in fcntl.h unistd.h errno.h sys/stat.h sys/ioctl.h \ sys/types.h linux/types.h linux/bitops.h asm/byteorder.h asm/atomic.h \ - sys/time.h signal.h sched.h + sys/time.h signal.h sched.h time.h do ac_ac_Header=`echo "ac_cv_header_$ac_header" | $ac_tr_sh` @@ -5965,5 +5965,5 @@ for ac_func in memset strdup puts printf fprintf vprintf perror strerror \ malloc calloc free realloc open close read write lseek fdatasync \ - ioctl fflush wcslen wcstombs atexit exit sigaction setitimer + ioctl fflush atexit exit sigaction setitimer time srandom random do ac_ac_var=`echo "ac_cv_func_$ac_func" | $ac_tr_sh` Index: configure.in =================================================================== RCS file: /cvsroot/linux-ntfs/linux-ntfs/configure.in,v retrieving revision 1.3 retrieving revision 1.4 diff -U2 -r1.3 -r1.4 --- configure.in 2001/06/01 02:07:23 1.3 +++ configure.in 2001/06/05 10:33:02 1.4 @@ -64,5 +64,5 @@ AC_CHECK_HEADERS(fcntl.h unistd.h errno.h sys/stat.h sys/ioctl.h \ sys/types.h linux/types.h linux/bitops.h asm/byteorder.h asm/atomic.h \ - sys/time.h signal.h sched.h) + sys/time.h signal.h sched.h time.h) dnl Checks for typedefs, structures, and compiler characteristics. @@ -77,5 +77,5 @@ AC_CHECK_FUNCS(memset strdup puts printf fprintf vprintf perror strerror \ malloc calloc free realloc open close read write lseek fdatasync \ - ioctl fflush wcslen wcstombs atexit exit sigaction setitimer) + ioctl fflush atexit exit sigaction setitimer time srandom random) dnl Perform program name transformation. |
|
From: Anton A. <an...@us...> - 2001-06-05 10:33:05
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools
In directory usw-pr-cvs1:/tmp/cvs-serv18737/ntfstools
Modified Files:
mkntfs.c
Log Message:
Update automatic config/make process and mkntfs to use the cvs release tag for
version reporting.
Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/mkntfs.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -U2 -r1.10 -r1.11
--- mkntfs.c 2001/06/05 10:19:53 1.10
+++ mkntfs.c 2001/06/05 10:33:02 1.11
@@ -2058,5 +2058,5 @@
NTFS_BOOT_SECTOR *bs;
- EXEC_REVISION = strdup(EXEC_NAME); //strdup("$Revision$");
+ EXEC_REVISION = strdup("$Revision$");
EXEC_VERSION = EXEC_REVISION + 11;
EXEC_VERSION[strlen(EXEC_VERSION) - 2] = '\0';
|
|
From: Anton A. <an...@us...> - 2001-06-05 10:19:56
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools
In directory usw-pr-cvs1:/tmp/cvs-serv16733/ntfstools
Modified Files:
mkntfs.c
Log Message:
mkntfs update.
Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/mkntfs.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -U2 -r1.9 -r1.10
--- mkntfs.c 2001/06/04 23:38:55 1.9
+++ mkntfs.c 2001/06/05 10:19:53 1.10
@@ -1914,5 +1914,7 @@
/* Setup header. */
ia_val->magic = magic_INDX;
+ /* should be at 0x28 */
ia_val->usa_ofs = cpu_to_le16(sizeof(INDEX_ALLOCATION));
+ /* should be 9 */
if (index_block_size >= NTFS_SECTOR_SIZE)
ia_val->usa_count = cpu_to_le16(index_block_size /
@@ -1931,32 +1933,37 @@
ia_val->lsn = cpu_to_le64(0);
ia_val->index_block_vcn = cpu_to_le64(0);
- /* FIXME: Do we need alignment? */
- ia_val->index.entries_offset = cpu_to_le32(sizeof(INDEX_HEADER) +
- le16_to_cpu(ia_val->usa_count) * 2);
- /* FIXME: Does the size really include the USA?!? */
+ /* Align to 8-byte boundary. */
+ ia_val->index.entries_offset = cpu_to_le32((sizeof(INDEX_HEADER) +
+ le16_to_cpu(ia_val->usa_count) * 2) + 7 & ~7);
ia_val->index.allocated_size = cpu_to_le32(index_block_size -
(sizeof(INDEX_ALLOCATION) - sizeof(INDEX_HEADER)));
ae = (INDEX_ENTRY*)((char*)ia_val +
le32_to_cpu(ia_val->index.entries_offset));
- /* Move all entries. */
- do {
- /* FIXME: Is it that easy? If so we could walk the list only
- * and when we reach the end just copy the lot in one go! */
- memcpy(ae, re, le16_to_cpu(re->length));
+ /* Move one entry. */
+ memcpy(ae, re, le16_to_cpu(re->length));
+ /* If there are more entries move them all. */
+ while ((char*)re < re_end && !(re->flags & INDEX_ENTRY_END)) {
/* Next entry in index root. */
re = (INDEX_ENTRY*)((char*)re + le16_to_cpu(re->length));
/* Next entry in index allocation. */
ae = (INDEX_ENTRY*)((char*)ae + le16_to_cpu(ae->length));
- } while ((char*)re < re_end && !(re->flags & INDEX_ENTRY_END));
- /* TODO: Terminate the index allocation (how?). */
- // ae points to the position in the index allocation, where the
- // termination index entry has to go
+ /* Move the entry. */
+ memcpy(ae, re, le16_to_cpu(re->length));
+ }
ia_val->index.index_length = cpu_to_le32((char*)ae -
- (char*)&ia_val->index + sizeof(INDEX_ENTRY));
- /* TODO: Modify index root to be empty and just to point to the
- * index allocation: need to change the r->index.index_length and
- * .allocated_size and make the first entry to be a terminator with
- * vcn inside it which is 0LL. */
+ (char*)&ia_val->index + le16_to_cpu(ae->length));
+ /*
+ * Finished with setting up of index allocation. Now fixup index root
+ * to be empty and just to point to the index allocation VCN 0.
+ */
+ // Need to change the r->index.index_length and .allocated_size and
+ // make the first entry to be a terminator with vcn and vcn = 0LL.
// re at the moment points to the index root termination index entry
+ // Also, need to resize the index root attribute! Especially so if it
+ // was empty like it is in the mkntfs case as we are actualy making it
+ // bigger by 8 bytes for the VCN in the termination entry!!! We would
+ // overwrite the next attribute otherwise! BANG.
+ r->index.index_length = cpu_to_le32((char*)ae -
+ (char*)&ia_val->index + le16_to_cpu(ae->length));
err = add_attr_index_alloc(m, name, name_len, ic, upcase, upcase_len,
(char*)ia_val, index_block_size);
|
|
From: Anton A. <an...@us...> - 2001-06-05 00:53:20
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools
In directory usw-pr-cvs1:/tmp/cvs-serv8453/ntfstools
Modified Files:
Makefile.am Makefile.in mkntfs.c
Log Message:
Integrate ldm.c into automatic build process.
A bit more on mkntfs and make it compile (do _not_ run as it is - am working on
directory creation so chances are it will hang if you run it or something).
Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -U2 -r1.5 -r1.6
--- Makefile.am 2001/06/01 02:07:26 1.5
+++ Makefile.am 2001/06/04 23:38:55 1.6
@@ -6,5 +6,5 @@
endif
-bin_PROGRAMS = ntfsfix ntfsdump_logfile mkntfs
+bin_PROGRAMS = ntfsfix ntfsdump_logfile mkntfs ldm
linux_ntfsincludedir = -I$(top_srcdir)/include
@@ -24,3 +24,5 @@
mkntfs_LDADD = $(top_srcdir)/libntfs/libntfs.la
mkntfs_LDFLAGS = $(all_libraries)
+
+ldm_SOURCES = ldm.c
Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- Makefile.in 2001/06/01 02:07:26 1.4
+++ Makefile.in 2001/06/04 23:38:55 1.5
@@ -92,5 +92,5 @@
@DEBUG_FALSE@AM_CFLAGS = -D_FILE_OFFSET_BITS=64
-bin_PROGRAMS = ntfsfix ntfsdump_logfile mkntfs
+bin_PROGRAMS = ntfsfix ntfsdump_logfile mkntfs ldm
linux_ntfsincludedir = -I$(top_srcdir)/include
@@ -110,9 +110,11 @@
mkntfs_LDADD = $(top_srcdir)/libntfs/libntfs.la
mkntfs_LDFLAGS = $(all_libraries)
+
+ldm_SOURCES = ldm.c
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h
CONFIG_CLEAN_FILES =
bin_PROGRAMS = ntfsfix$(EXEEXT) ntfsdump_logfile$(EXEEXT) \
-mkntfs$(EXEEXT)
+mkntfs$(EXEEXT) ldm$(EXEEXT)
PROGRAMS = $(bin_PROGRAMS)
@@ -127,4 +129,8 @@
sd.$(OBJEXT) mkntfs.$(OBJEXT)
mkntfs_DEPENDENCIES = $(top_srcdir)/libntfs/libntfs.la
+ldm_OBJECTS = ldm.$(OBJEXT)
+ldm_LDADD = $(LDADD)
+ldm_DEPENDENCIES =
+ldm_LDFLAGS =
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
@@ -138,8 +144,8 @@
TAR = gtar
GZIP_ENV = --best
-DEP_FILES = .deps/attrdef.P .deps/boot.P .deps/mkntfs.P \
+DEP_FILES = .deps/attrdef.P .deps/boot.P .deps/ldm.P .deps/mkntfs.P \
.deps/ntfsdump_logfile.P .deps/ntfsfix.P .deps/sd.P .deps/upcase.P
-SOURCES = $(ntfsfix_SOURCES) $(ntfsdump_logfile_SOURCES) $(mkntfs_SOURCES)
-OBJECTS = $(ntfsfix_OBJECTS) $(ntfsdump_logfile_OBJECTS) $(mkntfs_OBJECTS)
+SOURCES = $(ntfsfix_SOURCES) $(ntfsdump_logfile_SOURCES) $(mkntfs_SOURCES) $(ldm_SOURCES)
+OBJECTS = $(ntfsfix_OBJECTS) $(ntfsdump_logfile_OBJECTS) $(mkntfs_OBJECTS) $(ldm_OBJECTS)
all: all-redirect
@@ -228,4 +234,8 @@
@rm -f mkntfs$(EXEEXT)
$(LINK) $(mkntfs_LDFLAGS) $(mkntfs_OBJECTS) $(mkntfs_LDADD) $(LIBS)
+
+ldm$(EXEEXT): $(ldm_OBJECTS) $(ldm_DEPENDENCIES)
+ @rm -f ldm$(EXEEXT)
+ $(LINK) $(ldm_LDFLAGS) $(ldm_OBJECTS) $(ldm_LDADD) $(LIBS)
tags: TAGS
Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/mkntfs.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -U2 -r1.8 -r1.9
--- mkntfs.c 2001/06/04 14:04:31 1.8
+++ mkntfs.c 2001/06/04 23:38:55 1.9
@@ -752,7 +752,7 @@
/* Aligned to 2-byte boundary. */
m->usa_ofs = cpu_to_le16(sizeof(MFT_RECORD) + 1 & ~1);
- if (opt.mft_record_size >= opt.sector_size)
+ if (opt.mft_record_size >= NTFS_SECTOR_SIZE)
m->usa_count = cpu_to_le16(opt.mft_record_size /
- opt.sector_size + 1);
+ NTFS_SECTOR_SIZE + 1);
else {
m->usa_count = cpu_to_le16(1);
@@ -1861,5 +1861,5 @@
*/
int upgrade_to_large_index(MFT_RECORD *m, const char *name,
- const __u32 name_len, const IGNORE_CASE_BOOL ic,
+ __u32 name_len, const IGNORE_CASE_BOOL ic,
const uchar_t *upcase, const __u32 upcase_len)
{
@@ -1890,5 +1890,5 @@
ctx.mrec = m;
err = find_first_attr($INDEX_ROOT, uname, name_len, ic, upcase,
- upcase_len, NULL, NULL, &ctx);
+ upcase_len, NULL, 0, &ctx);
if (uname)
free(uname);
@@ -1905,17 +1905,27 @@
ntfs_set_bit(&bmp, 0, 1);
/* Bitmap has to be at least 8 bytes in size. */
- err = add_attr_bitmap(m, uname, name_len, ic, upcase, upcase_len,
- &bmp, sizeof(bmp));
+ err = add_attr_bitmap(m, name, name_len, ic, upcase, upcase_len,
+ (char*)&bmp, sizeof(bmp));
if (err)
return err;
ia_val = calloc(1, index_block_size);
if (!ia_val)
- return = -errno;
+ return -errno;
/* Setup header. */
ia_val->magic = magic_INDX;
ia_val->usa_ofs = cpu_to_le16(sizeof(INDEX_ALLOCATION));
- ia_val->usa_count = cpu_to_le16();
+ if (index_block_size >= NTFS_SECTOR_SIZE)
+ ia_val->usa_count = cpu_to_le16(index_block_size /
+ NTFS_SECTOR_SIZE + 1);
+ else {
+ ia_val->usa_count = cpu_to_le16(1);
+ Qprintf("Sector size is bigger than index block size. Setting "
+ "usa_count to 1. If Windows\nchkdsk reports this as "
+ "corruption, please email lin...@li...\n"
+ "stating that you saw this message and that the file "
+ "system created was corrupt.\nThank you.");
+ }
/* Set USN to 1. */
- *(__u16)((char*)ia_val + le16_to_cpu(ia_val->usa_ofs)) =
+ *(__u16*)((char*)ia_val + le16_to_cpu(ia_val->usa_ofs)) =
cpu_to_le16(1);
ia_val->lsn = cpu_to_le64(0);
@@ -1949,6 +1959,6 @@
* vcn inside it which is 0LL. */
// re at the moment points to the index root termination index entry
- err = add_attr_index_alloc(m, uname, name_len, ic, upcase, upcase_len,
- /*TODO: ...*/);
+ err = add_attr_index_alloc(m, name, name_len, ic, upcase, upcase_len,
+ (char*)ia_val, index_block_size);
if (err) {
// TODO: Remove the added bitmap!
@@ -1960,5 +1970,5 @@
/* Return 0 on success or -errno on error. */
-int insert_file_link_in_dir(m, )
+int insert_file_link_in_dir(MFT_RECORD *m)
{
return -ENOTSUP;
@@ -1973,5 +1983,4 @@
opt.mft_record_size = 1024;
opt.index_block_size = 4096;
- opt.sector_size = 512;
opt.attr_defs = (ATTR_DEF*)&attrdef_ntfs12_array;
opt.attr_defs_len = sizeof(attrdef_ntfs12_array);
@@ -2116,9 +2125,11 @@
int _sect_size = 0;
err = ioctl(f, BLKSSZGET, &_sect_size);
- if (err == -1)
- err_exit("IOCTL BLKSSZGET failed for %s: %s\n",
+ if (err == -1) {
+ Eprintf("IOCTL BLKSSZGET failed for %s: %s\nAssuming "
+ "sector size is 512 bytes.\n",
opt.dev_name, strerror(errno));
- opt.sector_size = _sect_size;
- Dprintf("BLKSSZGET sector_size = %d\n", _sect_size);
+ opt.sector_size = 512;
+ } else
+ opt.sector_size = _sect_size;
}
/* Validate sector size. */
@@ -2465,5 +2476,5 @@
opt.index_block_size);
if (!err)
- err = insert_file_link_in_dir(m, );
+ err = insert_file_link_in_dir(m);
// add_attr_bitmap(m, );
// add_attr_index_alloc(m, );
|
|
From: Anton A. <an...@us...> - 2001-06-04 14:43:52
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv27223/include
Modified Files:
layout.h
Log Message:
More work on mkntfs dir stuff.
Index: layout.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/layout.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -U2 -r1.5 -r1.6
--- layout.h 2001/06/04 11:29:45 1.5
+++ layout.h 2001/06/04 14:04:30 1.6
@@ -1767,9 +1767,10 @@
*/
typedef struct {
- NTFS_RECORD; /* Magic is "INDX". */
- __s64 lsn; /* $LogFile sequence number of the last
+/* 0*/ NTFS_RECORD; /* Magic is "INDX". */
+/* 8*/ __s64 lsn; /* $LogFile sequence number of the last
modification of this index block. */
- VCN index_block_vcn; /* Virtual cluster number of the index block. */
- INDEX_HEADER index; /* Describes the following index entries. */
+/* 16*/ VCN index_block_vcn; /* Virtual cluster number of the index block. */
+/* 24*/ INDEX_HEADER index; /* Describes the following index entries. */
+/* sizeof()= 40 (0x28) bytes */
/*
* When creating the index block, we place the update sequence array at this
|
|
From: Anton A. <an...@us...> - 2001-06-04 14:39:27
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools
In directory usw-pr-cvs1:/tmp/cvs-serv27223/ntfstools
Modified Files:
mkntfs.c
Log Message:
More work on mkntfs dir stuff.
Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/mkntfs.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -U2 -r1.7 -r1.8
--- mkntfs.c 2001/06/04 11:29:45 1.7
+++ mkntfs.c 2001/06/04 14:04:31 1.8
@@ -1814,4 +1814,20 @@
/* Return 0 on success or -errno on error. */
+int add_attr_index_alloc(MFT_RECORD *m, const char *name, const __u32 name_len,
+ const IGNORE_CASE_BOOL ic, const uchar_t *upcase,
+ const __u32 upcase_len, const char *index_alloc_val,
+ const __u32 index_alloc_val_len)
+{
+ int err;
+
+ err = insert_non_resident_attr_in_mft_record(m, $INDEX_ALLOCATION, name,
+ name_len, ic, upcase, upcase_len, 0,
+ index_alloc_val, index_alloc_val_len);
+ if (err < 0)
+ Eprintf("add_attr_index_alloc failed: %s\n", strerror(-err));
+ return err;
+}
+
+/* Return 0 on success or -errno on error. */
int add_attr_bitmap(MFT_RECORD *m, const char *name, const __u32 name_len,
const IGNORE_CASE_BOOL ic, const uchar_t *upcase,
@@ -1851,8 +1867,9 @@
ATTR_RECORD *a;
INDEX_ROOT *r;
- INDEX_ENTRY *e, *e_end;
- INDEX_ALLOCATION *a;
+ INDEX_ENTRY *re, *ae;
+ INDEX_ALLOCATION *ia_val;
uchar_t *uname;
char bmp[8];
+ char *re_end;
int i, err, r_size, index_block_size;
@@ -1860,7 +1877,11 @@
i = (name_len + 1) * sizeof(uchar_t);
uname = (uchar_t*)calloc(1, i);
+ if (!uname)
+ return -errno;
name_len = stoucs(uname, name, i);
- if (name_len > 0xff)
+ if (name_len > 0xff) {
+ free(uname);
return -ENAMETOOLONG;
+ }
} else
uname = NULL;
@@ -1868,18 +1889,19 @@
memset(&ctx, 0, sizeof(ctx));
ctx.mrec = m;
- if (!find_first_attr($INDEX_ROOT, uname, name_len, ic, upcase,
- upcase_len, NULL, NULL, &ctx)) {
- if (uname)
- free(uname);
+ err = find_first_attr($INDEX_ROOT, uname, name_len, ic, upcase,
+ upcase_len, NULL, NULL, &ctx);
+ if (uname)
+ free(uname);
+ if (!err)
return -ENOTDIR;
- }
a = ctx.attr;
if (a->non_resident || a->flags)
return -EINVAL;
r = (INDEX_ROOT*)((char*)a + le16_to_cpu(a->value_offset));
- e_end = (INDEX_ENTRY*)((char)*r + le32_to_cpu(a->value_length));
- e = (INDEX_ENTRY*)((char*)&r->index + r->index.entries_offset);
+ re_end = (char*)r + le32_to_cpu(a->value_length);
+ re = (INDEX_ENTRY*)((char*)&r->index + r->index.entries_offset);
index_block_size = le32_to_cpu(r->index_block_size);
memset(bmp, 0, sizeof(bmp));
+ ntfs_set_bit(&bmp, 0, 1);
/* Bitmap has to be at least 8 bytes in size. */
err = add_attr_bitmap(m, uname, name_len, ic, upcase, upcase_len,
@@ -1887,4 +1909,44 @@
if (err)
return err;
+ ia_val = calloc(1, index_block_size);
+ if (!ia_val)
+ return = -errno;
+ /* Setup header. */
+ ia_val->magic = magic_INDX;
+ ia_val->usa_ofs = cpu_to_le16(sizeof(INDEX_ALLOCATION));
+ ia_val->usa_count = cpu_to_le16();
+ /* Set USN to 1. */
+ *(__u16)((char*)ia_val + le16_to_cpu(ia_val->usa_ofs)) =
+ cpu_to_le16(1);
+ ia_val->lsn = cpu_to_le64(0);
+ ia_val->index_block_vcn = cpu_to_le64(0);
+ /* FIXME: Do we need alignment? */
+ ia_val->index.entries_offset = cpu_to_le32(sizeof(INDEX_HEADER) +
+ le16_to_cpu(ia_val->usa_count) * 2);
+ /* FIXME: Does the size really include the USA?!? */
+ ia_val->index.allocated_size = cpu_to_le32(index_block_size -
+ (sizeof(INDEX_ALLOCATION) - sizeof(INDEX_HEADER)));
+ ae = (INDEX_ENTRY*)((char*)ia_val +
+ le32_to_cpu(ia_val->index.entries_offset));
+ /* Move all entries. */
+ do {
+ /* FIXME: Is it that easy? If so we could walk the list only
+ * and when we reach the end just copy the lot in one go! */
+ memcpy(ae, re, le16_to_cpu(re->length));
+ /* Next entry in index root. */
+ re = (INDEX_ENTRY*)((char*)re + le16_to_cpu(re->length));
+ /* Next entry in index allocation. */
+ ae = (INDEX_ENTRY*)((char*)ae + le16_to_cpu(ae->length));
+ } while ((char*)re < re_end && !(re->flags & INDEX_ENTRY_END));
+ /* TODO: Terminate the index allocation (how?). */
+ // ae points to the position in the index allocation, where the
+ // termination index entry has to go
+ ia_val->index.index_length = cpu_to_le32((char*)ae -
+ (char*)&ia_val->index + sizeof(INDEX_ENTRY));
+ /* TODO: Modify index root to be empty and just to point to the
+ * index allocation: need to change the r->index.index_length and
+ * .allocated_size and make the first entry to be a terminator with
+ * vcn inside it which is 0LL. */
+ // re at the moment points to the index root termination index entry
err = add_attr_index_alloc(m, uname, name_len, ic, upcase, upcase_len,
/*TODO: ...*/);
|
|
From: Anton A. <an...@us...> - 2001-06-04 11:48:58
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools
In directory usw-pr-cvs1:/tmp/cvs-serv3795/ntfstools
Modified Files:
mkntfs.c
Log Message:
Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/mkntfs.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -U2 -r1.6 -r1.7
--- mkntfs.c 2001/06/03 12:04:30 1.6
+++ mkntfs.c 2001/06/04 11:29:45 1.7
@@ -1838,6 +1838,7 @@
/*
- * Create bitmap and index allocation attributes and modify index root
- * attribute accordingly.
+ * Create bitmap and index allocation attributes, modify index root
+ * attribute accordingly and move all of the index entries from the index root
+ * into the index allocation.
*
* Return 0 on success or -errno on error.
@@ -1853,5 +1854,5 @@
INDEX_ALLOCATION *a;
uchar_t *uname;
- char *bmp;
+ char bmp[8];
int i, err, r_size, index_block_size;
@@ -1880,7 +1881,16 @@
e = (INDEX_ENTRY*)((char*)&r->index + r->index.entries_offset);
index_block_size = le32_to_cpu(r->index_block_size);
- // add_attr_bitmap(m, );
- // add_attr_index_alloc(m, );
-
+ memset(bmp, 0, sizeof(bmp));
+ /* Bitmap has to be at least 8 bytes in size. */
+ err = add_attr_bitmap(m, uname, name_len, ic, upcase, upcase_len,
+ &bmp, sizeof(bmp));
+ if (err)
+ return err;
+ err = add_attr_index_alloc(m, uname, name_len, ic, upcase, upcase_len,
+ /*TODO: ...*/);
+ if (err) {
+ // TODO: Remove the added bitmap!
+ return err;
+ }
err = -ENOTSUP;
return err;
|
|
From: Anton A. <an...@us...> - 2001-06-04 11:48:58
|
Changes by: antona Update of /cvsroot/linux-ntfs/linux-ntfs/include In directory usw-pr-cvs1:/tmp/cvs-serv3795/include Modified Files: layout.h Log Message: Index: layout.h =================================================================== RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/layout.h,v retrieving revision 1.4 retrieving revision 1.5 diff -U2 -r1.4 -r1.5 --- layout.h 2001/06/03 02:09:08 1.4 +++ layout.h 2001/06/04 11:29:45 1.5 @@ -1783,4 +1783,6 @@ } __attribute__ ((__packed__)) INDEX_BLOCK; +typedef INDEX_BLOCK INDEX_ALLOCATION; + /* * The system file FILE_$Extend/$Reparse contains an index named $R listing |
|
From: Richard R. <fl...@us...> - 2001-06-03 18:41:19
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools In directory usw-pr-cvs1:/tmp/cvs-serv24421 Removed Files: efs.c indx.c sdh.c sds.c sii.c stdinfo.c upcase2.c usnjrnl.c Log Message: removed test progs -- moved to flatcap module --- efs.c DELETED --- --- indx.c DELETED --- --- sdh.c DELETED --- --- sds.c DELETED --- --- sii.c DELETED --- --- stdinfo.c DELETED --- --- upcase2.c DELETED --- --- usnjrnl.c DELETED --- |
|
From: Richard R. <fl...@us...> - 2001-06-03 17:05:00
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools In directory usw-pr-cvs1:/tmp/cvs-serv24680 Removed Files: ldm.c Log Message: restored file I shouldn't have deleted --- ldm.c DELETED --- |
|
From: Richard R. <fl...@us...> - 2001-06-03 17:02:50
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools In directory usw-pr-cvs1:/tmp/cvs-serv25076 Added Files: ldm.c Log Message: back again |
|
From: Anton A. <an...@us...> - 2001-06-03 12:04:45
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools
In directory usw-pr-cvs1:/tmp/cvs-serv607
Modified Files:
mkntfs.c
Log Message:
More directory work in mkntfs
Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/mkntfs.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -U2 -r1.5 -r1.6
--- mkntfs.c 2001/06/03 02:09:08 1.5
+++ mkntfs.c 2001/06/03 12:04:30 1.6
@@ -1837,4 +1837,60 @@
}
+/*
+ * Create bitmap and index allocation attributes and modify index root
+ * attribute accordingly.
+ *
+ * Return 0 on success or -errno on error.
+ */
+int upgrade_to_large_index(MFT_RECORD *m, const char *name,
+ const __u32 name_len, const IGNORE_CASE_BOOL ic,
+ const uchar_t *upcase, const __u32 upcase_len)
+{
+ attr_search_context ctx;
+ ATTR_RECORD *a;
+ INDEX_ROOT *r;
+ INDEX_ENTRY *e, *e_end;
+ INDEX_ALLOCATION *a;
+ uchar_t *uname;
+ char *bmp;
+ int i, err, r_size, index_block_size;
+
+ if (name_len) {
+ i = (name_len + 1) * sizeof(uchar_t);
+ uname = (uchar_t*)calloc(1, i);
+ name_len = stoucs(uname, name, i);
+ if (name_len > 0xff)
+ return -ENAMETOOLONG;
+ } else
+ uname = NULL;
+ /* Find the index root attribute. */
+ memset(&ctx, 0, sizeof(ctx));
+ ctx.mrec = m;
+ if (!find_first_attr($INDEX_ROOT, uname, name_len, ic, upcase,
+ upcase_len, NULL, NULL, &ctx)) {
+ if (uname)
+ free(uname);
+ return -ENOTDIR;
+ }
+ a = ctx.attr;
+ if (a->non_resident || a->flags)
+ return -EINVAL;
+ r = (INDEX_ROOT*)((char*)a + le16_to_cpu(a->value_offset));
+ e_end = (INDEX_ENTRY*)((char)*r + le32_to_cpu(a->value_length));
+ e = (INDEX_ENTRY*)((char*)&r->index + r->index.entries_offset);
+ index_block_size = le32_to_cpu(r->index_block_size);
+ // add_attr_bitmap(m, );
+ // add_attr_index_alloc(m, );
+
+ err = -ENOTSUP;
+ return err;
+}
+
+/* Return 0 on success or -errno on error. */
+int insert_file_link_in_dir(m, )
+{
+ return -ENOTSUP;
+}
+
void init_options(void)
{
@@ -2320,4 +2376,28 @@
/* The root directory mft reference. */
root_ref = cpu_to_le64((__u64)FILE_$root << 48 | FILE_$root);
+ Dprintf("Creating root directory (mft record 5)\n");
+ m = (MFT_RECORD*)(buf + 5 * opt.mft_record_size);
+ m->flags |= MFT_RECORD_IS_DIRECTORY;
+ if (!err)
+ 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);
+ if (!err) {
+ init_system_file_sd(FILE_$root, &sd, &i);
+ err = add_attr_sd(m, sd, i);
+ }
+ if (!err)
+ err = add_attr_index_root(m, "$I30", 4, IGNORE_CASE, opt.upcase,
+ opt.upcase_len, $FILE_NAME, COLLATION_FILE_NAME,
+ opt.index_block_size);
+ if (!err)
+ err = insert_file_link_in_dir(m, );
+ // add_attr_bitmap(m, );
+ // add_attr_index_alloc(m, );
+ if (err < 0)
+ err_exit("Couldn't create root directory: %s\n",
+ strerror(-err));
+ dump_mft_record(m);
/* Add all other attributes, on a per-file basis for clarity. */
Dprintf("Creating $MFT (mft record 0)\n");
@@ -2597,26 +2677,4 @@
//dump_mft_record(m);
}
- Dprintf("Creating root directory (mft record 5)\n");
- m = (MFT_RECORD*)(buf + 5 * opt.mft_record_size);
- m->flags |= MFT_RECORD_IS_DIRECTORY;
- if (!err)
- 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);
- if (!err) {
- init_system_file_sd(FILE_$root, &sd, &i);
- err = add_attr_sd(m, sd, i);
- }
- if (!err)
- err = add_attr_index_root(m, "$I30", 4, IGNORE_CASE, opt.upcase,
- opt.upcase_len, $FILE_NAME, COLLATION_FILE_NAME,
- opt.index_block_size);
- if (err < 0)
- err_exit("Couldn't create root directory: %s\n",
- strerror(-err));
- // add_attr_bitmap(m, );
- // add_attr_index_alloc(m, );
- dump_mft_record(m);
// - Do not step onto bad blocks!!!
// - If any bad blocks were specified or found, modify $BadClus, allocating the
|
|
From: Anton A. <an...@us...> - 2001-06-03 02:28:52
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv1569/include
Modified Files:
layout.h
Log Message:
Fix/expand dircetory info in layout.h and add creation of index root attribute
to mkntfs.c.
Index: layout.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/layout.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -U2 -r1.3 -r1.4
--- layout.h 2001/06/01 19:04:08 1.3
+++ layout.h 2001/06/03 02:09:08 1.4
@@ -1675,15 +1675,19 @@
*/
typedef enum {
- /* When index header is in an index root attribute. */
- NO_INDEX_NODE = 0, /* Small index, i.e. the whole index fits inside
- the index root attribute and hence there is no
- index allocation attribute. */
- HAS_INDEX_NODE = 1, /* Large index, i.e. it doesn't fit in the index
- root attribute and hence an index allocation
+ /* When index header is in an index root attribute: */
+ SMALL_INDEX = 0, /* The index is small enough to fit inside the
+ index root attribute and there is no index
+ allocation attribute present. */
+ LARGE_INDEX = 1, /* The index is too large to fit in the index
+ root attribute and/or an index allocation
attribute is present. */
- /* When index header is in an index block, i.e. is part of index
- allocation attribute. */
- IS_LEAF_NODE = 0, /* */
- NOT_LEAF_NODE = 1, /* */
+ /*
+ * When index header is in an index block, i.e. is part of index
+ * allocation attribute:
+ */
+ LEAF_NODE = 0, /* This is a leaf node, i.e. there are no more
+ nodes branching off it. */
+ INDEX_NODE = 1, /* This node indexes other nodes, i.e. is not a
+ leaf node. */
} __attribute__ ((__packed__)) INDEX_HEADER_FLAGS;
@@ -1693,13 +1697,14 @@
* make up a complete index.
*
- * NOTE: Offsets/sizes are counted relative to the start of the index header
- * structure.
+ * IMPORTANT NOTE: The offset, length and size structure members are counted
+ * relative to the start of the index header structure and not relative to the
+ * start of the index root or index allocation structures themselves.
*/
typedef struct {
__u32 entries_offset; /* Byte offset to first INDEX_ENTRY. */
- __u32 index_block_length; /* Data size of the index in bytes,
+ __u32 index_length; /* Data size of the index in bytes,
i.e. bytes used from allocated
size. */
- __u32 allocated_size; /* Byte size of the index block. */
+ __u32 allocated_size; /* Byte size of this index (block). */
/* NOTE: For the index root attribute, the above two numbers are always
equal, as the attribute is resident and it is resized as needed. In
@@ -1726,5 +1731,6 @@
* index block.
*
- * NOTE: The root directory (FILE_$root) contains an entry for itself.
+ * NOTE: The root directory (FILE_$root) contains an entry for itself. Other
+ * dircetories do not contain entries for themselves, though.
*/
typedef struct {
@@ -1736,5 +1742,5 @@
index entries. If type is $FILE_NAME,
this must be COLLATION_FILE_NAME. */
- __u32 bytes_per_index_block; /* Byte size of each index block (in
+ __u32 index_block_size; /* Size of each index block in bytes (in
the index allocation attribute). */
__u8 clusters_per_index_block; /* Cluster size of each index block (in
@@ -1875,12 +1881,8 @@
/*
- * This is an index entry. A sequence of such entries follows each INDEX_HEADER
- * structure. Together they make up a complete index. The index follows either
- * an index root attribute or an index allocation attribute.
- *
- * NOTE: Before NTFS 3.0 only filename attributes were indexed.
+ * This the index entry header (see below).
*/
typedef struct {
- union { /* Only valid when INDEX_ENTRY_END is not set. */
+/* 0*/ union { /* Only valid when INDEX_ENTRY_END is not set. */
MFT_REF indexed_file; /* The mft reference of the file
described by this index
@@ -1895,10 +1897,22 @@
} __attribute__ ((__packed__));
} __attribute__ ((__packed__));
- __u16 length; /* Byte size of this index entry. */
- __u16 key_length; /* Byte size of the key value, which is in the
+/* 8*/ __u16 length; /* Byte size of this index entry. */
+/* 10*/ __u16 key_length; /* Byte size of the key value, which is in the
index entry. It follows field reserved. */
- INDEX_ENTRY_FLAGS flags; /* Bit field of INDEX_ENTRY_* flags. */
- __u16 reserved; /* Reserved/align to 8-byte boundary. */
- union { /* The key of the indexed attribute. NOTE: Only present
+/* 12*/ INDEX_ENTRY_FLAGS flags; /* Bit field of INDEX_ENTRY_* flags. */
+/* 14*/ __u16 reserved; /* Reserved/align to 8-byte boundary. */
+/* sizeof() = 16 bytes */
+} __attribute__ ((__packed__)) INDEX_ENTRY_HEADER;
+
+/*
+ * This is an index entry. A sequence of such entries follows each INDEX_HEADER
+ * structure. Together they make up a complete index. The index follows either
+ * an index root attribute or an index allocation attribute.
+ *
+ * NOTE: Before NTFS 3.0 only filename attributes were indexed.
+ */
+typedef struct {
+/* 0*/ INDEX_ENTRY_HEADER; /* The index entry header (see above). */
+/* 16*/ union { /* The key of the indexed attribute. NOTE: Only present
if INDEX_ENTRY_END bit in flags is not set. NOTE: On
NTFS versions before 3.0 the only valid key is the
@@ -1932,4 +1946,9 @@
*
* Contains an array of bits (aka a bitfield).
+ *
+ * When used in conjunction with the index allocation attribute, each bit
+ * corresponds to one index block within the index allocation attribute. Thus
+ * the number of bits in the bitmap * index block size / cluster size is the
+ * number of clusters in the index allocation attribute.
*/
typedef struct {
|
|
From: Anton A. <an...@us...> - 2001-06-03 02:17:46
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools
In directory usw-pr-cvs1:/tmp/cvs-serv1569/ntfstools
Modified Files:
mkntfs.c
Log Message:
Fix/expand dircetory info in layout.h and add creation of index root attribute
to mkntfs.c.
Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/mkntfs.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -U2 -r1.4 -r1.5
--- mkntfs.c 2001/06/01 19:04:08 1.4
+++ mkntfs.c 2001/06/03 02:09:08 1.5
@@ -1737,4 +1737,81 @@
/* Return 0 on success or -errno on error. */
+int add_attr_index_root(MFT_RECORD *m, const char *name, const __u32 name_len,
+ const IGNORE_CASE_BOOL ic, const uchar_t *upcase,
+ const __u32 upcase_len, const ATTR_TYPES indexed_attr_type,
+ const COLLATION_RULES collation_rule,
+ const __u32 index_block_size)
+{
+ INDEX_ROOT *r;
+ INDEX_ENTRY_HEADER *e;
+ int i, err, val_len;
+
+ val_len = sizeof(INDEX_ROOT) + sizeof(INDEX_ENTRY_HEADER);
+ r = (INDEX_ROOT*)malloc(val_len);
+ if (!r)
+ return -errno;
+ r->type = indexed_attr_type == $FILE_NAME ? $FILE_NAME : 0;
+ if (indexed_attr_type == $FILE_NAME &&
+ collation_rule != COLLATION_FILE_NAME) {
+ free(r);
+ Eprintf("add_attr_index_root: indexed attribute is $FILE_NAME "
+ "but collation rule is not COLLATION_FILE_NAME.\n");
+ return -EINVAL;
+ }
+ r->collation_rule = collation_rule;
+ r->index_block_size = cpu_to_le32(index_block_size);
+ if (index_block_size >= opt.cluster_size) {
+ if (index_block_size % opt.cluster_size) {
+ Eprintf("add_attr_index_root: index block size is not "
+ "a multiple of the vluster size.\n");
+ free(r);
+ return -EINVAL;
+ }
+ r->clusters_per_index_block = index_block_size /
+ opt.cluster_size;
+ } else {
+ if (index_block_size & index_block_size - 1) {
+ Eprintf("add_attr_index_root: index block size is not "
+ "a power of 2.\n");
+ free(r);
+ return -EINVAL;
+ }
+ r->clusters_per_index_block = -(1 << (ffs(opt.index_block_size)
+ - 1));
+ if ((1 << -r->clusters_per_index_block) !=
+ opt.index_block_size)
+ err_exit("BUG: calculated clusters_per_index_block "
+ "is wrong (= 0x%x)\n",
+ r->clusters_per_index_block);
+ }
+ memset(&r->reserved, 0, sizeof(r->reserved));
+ r->index.entries_offset = cpu_to_le32(sizeof(INDEX_HEADER));
+ r->index.index_length = cpu_to_le32(sizeof(INDEX_HEADER) +
+ sizeof(INDEX_ENTRY_HEADER));
+ r->index.allocated_size = r->index.index_length;
+ r->index.flags = SMALL_INDEX;
+ memset(&r->index.reserved, 0, sizeof(r->index.reserved));
+ e = (INDEX_ENTRY_HEADER*)((char*)&r->index +
+ le32_to_cpu(r->index.entries_offset));
+ /*
+ * No matter whether this is a file index or a view as this is a
+ * termination entry, hence no key value / data is associated with it
+ * at all. Thus, we just need the union to be all zero.
+ */
+ e->indexed_file = cpu_to_le64(0LL);
+ e->length = cpu_to_le16(sizeof(INDEX_ENTRY_HEADER));
+ e->key_length = cpu_to_le16(0);
+ e->flags = INDEX_ENTRY_END;
+ e->reserved = cpu_to_le16(0);
+ err = insert_resident_attr_in_mft_record(m, $INDEX_ROOT, name,
+ name_len, ic, upcase, upcase_len,
+ 0, 0, (char*)r, val_len);
+ free(r);
+ if (err < 0)
+ Eprintf("add_attr_index_root failed: %s\n", strerror(-err));
+ return err;
+}
+
+/* Return 0 on success or -errno on error. */
int add_attr_bitmap(MFT_RECORD *m, const char *name, const __u32 name_len,
const IGNORE_CASE_BOOL ic, const uchar_t *upcase,
@@ -2406,5 +2483,5 @@
err_exit("BUG: calculated clusters_per_mft_record "
"is wrong (= 0x%x)\n",
- opt.mft_record_size);
+ bs->clusters_per_mft_record);
}
Dprintf("Clusters per mft record = %i (0x%x)\n",
@@ -2421,5 +2498,5 @@
err_exit("BUG: calculated clusters_per_index_block "
"is wrong (= 0x%x)\n",
- opt.index_block_size);
+ bs->clusters_per_index_block);
}
Dprintf("Clusters per index block = %i (0x%x)\n",
@@ -2522,4 +2599,5 @@
Dprintf("Creating root directory (mft record 5)\n");
m = (MFT_RECORD*)(buf + 5 * opt.mft_record_size);
+ m->flags |= MFT_RECORD_IS_DIRECTORY;
if (!err)
err = add_attr_file_name(m, root_ref, 0LL, 0LL,
@@ -2531,8 +2609,11 @@
err = add_attr_sd(m, sd, i);
}
+ if (!err)
+ err = add_attr_index_root(m, "$I30", 4, IGNORE_CASE, opt.upcase,
+ opt.upcase_len, $FILE_NAME, COLLATION_FILE_NAME,
+ opt.index_block_size);
if (err < 0)
err_exit("Couldn't create root directory: %s\n",
strerror(-err));
- // add_attr_index_root(m, );
// add_attr_bitmap(m, );
// add_attr_index_alloc(m, );
|
|
From: Richard R. <fl...@us...> - 2001-06-03 01:16:35
|
Changes by: flatcap
Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools
In directory usw-pr-cvs1:/tmp/cvs-serv18829
Added Files:
efs.c indx.c sdh.c sds.c sii.c stdinfo.c upcase2.c usnjrnl.c
Log Message:
Crude tools for examining an NTFS Volume
--- NEW FILE ---
/*
* $Id: efs.c,v 1.1 2001/06/03 00:53:07 flatcap Exp $
*
* EFS - Part of the Linux-NTFS project.
*
* Copyright (c) 2001 Richard Russon.
*
* Dump EFS data
*
* Richard Russon <nt...@fl...>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation; either version 2 of the License, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program (in the main directory of the Linux-NTFS source
* in the file COPYING); if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <stdio.h>
long display_sid (unsigned char *sid)
{
int revision;
int subauth_count;
int i;
unsigned long long ident_auth = 0;
revision = *sid; /* Should always be 1 */
sid++;
subauth_count = *sid; /* Number of Sub-authorities */
sid++;
for (i = 0; i < 6; i ++) /* This number is a 48 bit BIG-endian */
{
ident_auth <<= 8;
ident_auth += *sid;
sid++;
}
printf ("S-%d-%Lu", revision, ident_auth);
for (i = 0; i < subauth_count; i++)
{
printf ("-%u", *((unsigned long*) sid));
sid += 4;
}
return 8 + (subauth_count * 4);
}
int print_unicode (unsigned short *string)
{
unsigned char c = 0;
int length = 0;
if (!string)
{
return;
}
for (; c = *string; string++, length++)
{
printf ("%c", isprint (c) ? c : '.');
}
return length;
}
/* 0 = end
* n = size
* -n = size (buffer end)
*/
int dump_efs_entry (unsigned char *buffer, int offset, int bufsize, int absoff)
{
int size = 0;
unsigned char *block = NULL;
unsigned long tmp = 0;
unsigned long length = 0;
if (!buffer)
return 0;
size = *((unsigned short*) (buffer + offset + 4));
if (size == 0)
{
return 0;
}
if ((offset + size) > bufsize)
{
printf ("ERROR\n");
return 0;
}
absoff += offset;
block = buffer + offset;
printf ("%06x 4 %02x %02x %02x %02x (version?)\n", absoff + 0, block[0], block[1], block[2], block[3]);
printf ("\n");
printf ("%06x 4 %02x %02x %02x %02x size of entry\n", absoff + 4, block[4], block[5], block[6], block[7]);
printf ("%06x 4 %02x %02x %02x %02x don't know?\n", absoff + 8, block[8], block[9], block[10], block[11]);
printf ("%06x 4 %02x %02x %02x %02x key length?\n", absoff + 12, block[12], block[13], block[14], block[15]);
printf ("%06x 4 %02x %02x %02x %02x offset to key?\n", absoff + 16, block[16], block[17], block[18], block[19]);
printf ("%06x 4 %02x %02x %02x %02x offset to final block?\n", absoff + 20, block[20], block[21], block[22], block[23]);
printf ("\n");
printf ("%06x 4 %02x %02x %02x %02x don't know?\n", absoff + 24, block[24], block[25], block[26], block[27]);
printf ("%06x 4 %02x %02x %02x %02x don't know?\n", absoff + 28, block[28], block[29], block[30], block[31]);
printf ("%06x 4 %02x %02x %02x %02x don't know?\n", absoff + 32, block[32], block[33], block[34], block[35]);
printf ("%06x 4 %02x %02x %02x %02x don't know?\n", absoff + 36, block[36], block[37], block[38], block[39]);
printf ("%06x 4 %02x %02x %02x %02x don't know?\n", absoff + 40, block[40], block[41], block[42], block[43]);
printf ("%06x 4 %02x %02x %02x %02x don't know?\n", absoff + 44, block[44], block[45], block[46], block[47]);
printf ("%06x 4 %02x %02x %02x %02x don't know?\n", absoff + 48, block[48], block[49], block[50], block[51]);
printf ("\n");
printf ("%06x V ", absoff + 52);
length = display_sid (buffer + offset + 52);
printf ("\n");
printf ("\n");
block = buffer + offset + 52 + length;
printf ("%06x 4 %02x %02x %02x %02x offset to key?\n", absoff + 80, block[0], block[1], block[2], block[3]);
printf ("%06x 4 %02x %02x %02x %02x size of key?\n", absoff + 84, block[4], block[5], block[6], block[7]);
printf ("%06x 4 %02x %02x %02x %02x offset to string 1\n", absoff + 88, block[8], block[9], block[10], block[11]);
printf ("%06x 4 %02x %02x %02x %02x offset to string 2\n", absoff + 92, block[12], block[13], block[14], block[15]);
printf ("%06x 4 %02x %02x %02x %02x offset to string 3\n", absoff + 96, block[16], block[17], block[18], block[19]);
printf ("\n");
printf ("160 bits\n");
printf ("%06x 4 %02x %02x %02x %02x key?\n", absoff + 100, block[20], block[21], block[22], block[23]);
printf ("%06x 4 %02x %02x %02x %02x key?\n", absoff + 104, block[24], block[25], block[26], block[27]);
printf ("%06x 4 %02x %02x %02x %02x key?\n", absoff + 108, block[28], block[29], block[30], block[31]);
printf ("%06x 4 %02x %02x %02x %02x key?\n", absoff + 112, block[32], block[33], block[34], block[35]);
printf ("%06x 4 %02x %02x %02x %02x key?\n", absoff + 116, block[36], block[37], block[38], block[39]);
printf ("\n");
length = 0;
tmp = *((unsigned long*) (block + 8));
if (tmp)
{
printf ("%06x V \"", absoff + 80 + tmp);
length += 2 * (print_unicode ((unsigned short*)(block + tmp)) + 1);
printf ("\"\n");
}
tmp = *((unsigned long*) (block + 12));
if (tmp)
{
printf ("%06x V \"", absoff + 80 + tmp);
length += 2 * (print_unicode ((unsigned short*)(block + tmp)) + 1);
printf ("\"\n");
}
tmp = *((unsigned long*) (block + 16));
if (tmp)
{
printf ("%06x V \"", absoff + 80 + tmp);
length += 2 * (print_unicode ((unsigned short*)(block + tmp)) + 1);
printf ("\"\n");
}
printf ("\n");
absoff += length;
block += length + 40;
printf ("1024 bits\n");
printf ("%06x 16 %02x %02x %02x %02x %02x %02x %02x %02x - %02x %02x %02x %02x %02x %02x %02x %02x\n", absoff + 120, block[0], block[1], block[2], block[3], block[4], block[5], block[6], block[7], block[8], block[9], block[10], block[11], block[12], block[13], block[14], block[15]);
printf ("%06x 16 %02x %02x %02x %02x %02x %02x %02x %02x - %02x %02x %02x %02x %02x %02x %02x %02x\n", absoff + 136, block[16], block[17], block[18], block[19], block[20], block[21], block[22], block[23], block[24], block[25], block[26], block[27], block[28], block[29], block[30], block[31]);
printf ("%06x 16 %02x %02x %02x %02x %02x %02x %02x %02x - %02x %02x %02x %02x %02x %02x %02x %02x\n", absoff + 152, block[32], block[33], block[34], block[35], block[36], block[37], block[38], block[39], block[40], block[41], block[42], block[43], block[44], block[45], block[46], block[47]);
printf ("%06x 16 %02x %02x %02x %02x %02x %02x %02x %02x - %02x %02x %02x %02x %02x %02x %02x %02x\n", absoff + 168, block[48], block[49], block[50], block[51], block[52], block[53], block[54], block[55], block[56], block[57], block[58], block[59], block[60], block[61], block[62], block[63]);
printf ("%06x 16 %02x %02x %02x %02x %02x %02x %02x %02x - %02x %02x %02x %02x %02x %02x %02x %02x\n", absoff + 184, block[64], block[65], block[66], block[67], block[68], block[69], block[70], block[71], block[72], block[73], block[74], block[75], block[76], block[77], block[78], block[79]);
printf ("%06x 16 %02x %02x %02x %02x %02x %02x %02x %02x - %02x %02x %02x %02x %02x %02x %02x %02x\n", absoff + 200, block[80], block[81], block[82], block[83], block[84], block[85], block[86], block[87], block[88], block[89], block[90], block[91], block[92], block[93], block[94], block[95]);
printf ("%06x 16 %02x %02x %02x %02x %02x %02x %02x %02x - %02x %02x %02x %02x %02x %02x %02x %02x\n", absoff + 216, block[96], block[97], block[98], block[99], block[100], block[101], block[102], block[103], block[104], block[105], block[106], block[107], block[108], block[109], block[110], block[111]);
printf ("%06x 16 %02x %02x %02x %02x %02x %02x %02x %02x - %02x %02x %02x %02x %02x %02x %02x %02x\n", absoff + 232, block[112], block[113], block[114], block[115], block[116], block[117], block[118], block[119], block[120], block[121], block[122], block[123], block[124], block[125], block[126], block[127]);
printf ("\n");
block += 128;
printf ("final block\n");
printf ("%06x 4 %02x %02x %02x %02x don't know\n", absoff + 248, block[0], block[1], block[2], block[3]);
printf ("%06x 4 %02x %02x %02x %02x don't know\n", absoff + 252, block[4], block[5], block[6], block[7]);
printf ("%06x 4 %02x %02x %02x %02x don't know\n", absoff + 256, block[8], block[9], block[10], block[11]);
printf ("%06x 4 %02x %02x %02x %02x don't know\n", absoff + 260, block[12], block[13], block[14], block[15]);
printf ("%06x 4 %02x %02x %02x %02x don't know\n", absoff + 264, block[16], block[17], block[18], block[19]);
printf ("\n");
return size;
}
int dump_efs (unsigned char *buffer, int offset, int bufsize, int absoff)
{
int size = 0;
int i = 0;
unsigned char *block = NULL;
if (!buffer)
return 0;
size = *((unsigned short*) (buffer + offset));
if (size == 0)
{
return 0;
}
if ((offset + size) > bufsize)
{
printf ("ERROR\n");
return 0;
}
absoff += offset;
block = buffer + offset;
printf ("%06x 8 %02x %02x %02x %02x %02x %02x %02x %02x size of record\n", absoff + 0, block[0], block[1], block[2], block[3], block[4], block[5], block[6], block[7]);
printf ("%06x 8 %02x %02x %02x %02x %02x %02x %02x %02x don't know\n", absoff + 8, block[8], block[9], block[10], block[11], block[12], block[13], block[14], block[15]);
printf ("\n");
printf ("256 bits\n");
printf ("%06x 8 %02x %02x %02x %02x %02x %02x %02x %02x\n", absoff + 16, block[16], block[17], block[18], block[19], block[20], block[21], block[22], block[23]);
printf ("%06x 8 %02x %02x %02x %02x %02x %02x %02x %02x\n", absoff + 24, block[24], block[25], block[26], block[27], block[28], block[29], block[30], block[31]);
printf ("%06x 8 %02x %02x %02x %02x %02x %02x %02x %02x\n", absoff + 32, block[32], block[33], block[34], block[35], block[36], block[37], block[38], block[39]);
printf ("%06x 8 %02x %02x %02x %02x %02x %02x %02x %02x\n", absoff + 40, block[40], block[41], block[42], block[43], block[44], block[45], block[46], block[47]);
printf ("\n");
printf ("%06x 8 %02x %02x %02x %02x %02x %02x %02x %02x\n", absoff + 48, block[48], block[49], block[50], block[51], block[52], block[53], block[54], block[55]);
printf ("%06x 8 %02x %02x %02x %02x %02x %02x %02x %02x\n", absoff + 56, block[56], block[57], block[58], block[59], block[60], block[61], block[62], block[63]);
printf ("\n");
printf ("%06x 4 %02x %02x %02x %02x offset to entry 1\n", absoff + 64, block[64], block[65], block[66], block[67]);
printf ("%06x 4 %02x %02x %02x %02x offset to entry 2\n", absoff + 68, block[68], block[69], block[70], block[71]);
printf ("%06x 4 %02x %02x %02x %02x don't know\n", absoff + 72, block[72], block[73], block[74], block[75]);
printf ("%06x 4 %02x %02x %02x %02x don't know\n", absoff + 76, block[76], block[77], block[78], block[79]);
printf ("%06x 4 %02x %02x %02x %02x don't know\n", absoff + 80, block[80], block[81], block[82], block[83]);
printf ("\n");
for (i = 0; i < 2; i++)
{
offset = *((unsigned long*) (block + 64 + 4*i));
if (!offset)
break;
printf ("Entry %d\n", i+1);
dump_efs_entry (buffer, offset, bufsize, absoff);
}
return 0;
}
int main (int argc, char *argv[])
{
FILE *f = NULL;
unsigned char buffer[4096];
int absoff = 0;
int offset = 0;
int ret = 0;
int skip = 0;
if (argc != 2)
{
printf ("args\n");
return 1;
}
f = fopen (argv[1], "r");
if (!f)
{
printf ("fopen");
return 1;
}
memset (buffer, 0, sizeof (buffer));
while (fread (buffer + skip, sizeof (buffer) - skip, 1, f) == 1)
{
skip = 0;
offset = 0;
do
{
ret = dump_efs (buffer, offset, sizeof (buffer), absoff);
offset += ret;
}
while (ret > 0);
absoff += sizeof (buffer);
}
fclose (f);
return 0;
}
--- NEW FILE ---
/*
* $Id: indx.c,v 1.1 2001/06/03 00:53:07 flatcap Exp $
*
* Indx - Part of the Linux-NTFS project.
*
* Copyright (c) 2001 Richard Russon.
*
* Dump and INDX Record
*
* Richard Russon <nt...@fl...>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation; either version 2 of the License, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program (in the main directory of the Linux-NTFS source
* in the file COPYING); if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <stdio.h>
void unfixup (unsigned char *buffer, int bufsize)
{
int num = bufsize / 512;
int off = *((unsigned short*) (buffer + 4));
int size = *((unsigned short*) (buffer + 6));
unsigned short fixup = 0;
int i;
if ((num + 1) != size)
{
printf ("fixup error\n");
return;
}
for (i = 1; i <= num; i++)
{
fixup = *((unsigned short*) (buffer + off + 2*i));
//printf ("f %04x @ %04x\n", fixup, 512*i - 2);
*((unsigned short*) (buffer + 512*i - 2)) = fixup;
}
}
int bitcount (unsigned long l)
{
int count = 0;
while (l)
{
if (l & 1)
count++;
l>>=1;
}
return count;
}
/* 0 = end
* n = size
* -n = size (buffer end)
*/
int dump_indx (unsigned char *buffer, int offset, int bufsize, int absoff)
{
int indexflags = 0;
int size = 0;
int fs = 0;
int i;
if (!buffer)
return 0;
size = *((unsigned short*) (buffer + offset + 8));
if (size == 0)
{
return 0;
}
if ((offset + size) > bufsize)
{
printf ("ERROR\n");
return 0;
}
indexflags = *((unsigned short*) (buffer + offset + 12));
if (indexflags & 2)
{
printf ("END MARKER\n");
size = 0;
}
else
{
printf ("%06x mft reference of file 0x%016llx\n", absoff + offset + 0, *((unsigned long long*) (buffer + offset + 0)));
printf ("%06x size of index entry 0x%04x\n", absoff + offset + 8, *((unsigned short*) (buffer + offset + 8)));
printf ("%06x offset to filename 0x%04x\n", absoff + offset + 10, *((unsigned long long*) (buffer + offset + 10)));
printf ("%06x index flags %02x %02x (%d bits)\n", absoff + offset + 12, buffer[offset+12], buffer[offset+13], bitcount (*((unsigned short*) (buffer + offset + 12))));
printf ("%06x padding %02x %02x\n", absoff + offset + 14, buffer[offset+14], buffer[offset+15]);
printf ("%06x mft reference of parent 0x%016llx\n",absoff + offset + 16, *((unsigned long long*) (buffer + offset + 16)));
printf ("%06x c time 0x%016llx\n", absoff + offset + 24, *((unsigned long long*) (buffer + offset + 24)));
printf ("%06x a time 0x%016llx\n", absoff + offset + 32, *((unsigned long long*) (buffer + offset + 32)));
printf ("%06x m time 0x%016llx\n", absoff + offset + 40, *((unsigned long long*) (buffer + offset + 40)));
printf ("%06x r time 0x%016llx\n", absoff + offset + 48, *((unsigned long long*) (buffer + offset + 48)));
printf ("%06x alloc size 0x%016llx\n", absoff + offset + 56, *((unsigned long long*) (buffer + offset + 56)));
printf ("%06x real size 0x%016llx\n", absoff + offset + 64, *((unsigned long long*) (buffer + offset + 64)));
printf ("%06x file flags %02x %02x %02x %02x %02x %02x %02x %02x (%d bits)\n",absoff + offset + 72, buffer[offset+72], buffer[offset+73], buffer[offset+74], buffer[offset+75], buffer[offset+76], buffer[offset+77], buffer[offset+78], buffer[offset+79], bitcount (*((unsigned long*) (buffer + offset + 72))) + bitcount (*((unsigned long*) (buffer + offset + 76))));
printf ("%06x length of filename %d\n", absoff + offset + 80, buffer[offset+80]);
printf ("%06x filename space %d\n", absoff + offset + 81, buffer[offset+81]);
printf ("%06x filename \"", absoff + offset + 82);
fs = *((unsigned char*) (buffer + offset + 80)) * 2;
for (i = 0; i < fs; i += 2)
{
printf ("%c", buffer[offset + 82 + i]);
}
printf ("\"\n");
if (indexflags & 1) // mutually exclusive to 2
{
printf ("%06x VCN of index buffer with subnode 0x%016llx\n", absoff + offset + size - 8, *((unsigned long long*) (buffer + offset + size -8)));
}
}
printf ("\n");
return size;
}
int main (int argc, char *argv[])
{
FILE *f = NULL;
unsigned char buffer[4096];
int absoff = 0;
int offset = 0;
int ret = 0;
int skip = 0;
if (argc != 2)
{
printf ("args\n");
return 1;
}
f = fopen (argv[1], "r");
if (!f)
{
printf ("fopen");
return 1;
}
memset (buffer, 0, sizeof (buffer));
while (fread (buffer + skip, sizeof (buffer) - skip, 1, f) == 1)
{
unfixup (buffer, sizeof (buffer));
skip = 0;
offset = 0x40;/*4KB cluster, skip INDX header*/
do
{
ret = dump_indx (buffer, offset, sizeof (buffer), absoff);
offset += ret;
}
while (ret > 0);
absoff += sizeof (buffer);
}
fclose (f);
return 0;
}
--- NEW FILE ---
/*
* $Id: sdh.c,v 1.1 2001/06/03 00:53:07 flatcap Exp $
*
* SDH - Part of the Linux-NTFS project.
*
* Copyright (c) 2001 Richard Russon.
*
* Dump the $SDH Index
*
* Richard Russon <nt...@fl...>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation; either version 2 of the License, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program (in the main directory of the Linux-NTFS source
* in the file COPYING); if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <stdio.h>
/* 0 = end
* n = size
* -n = size (buffer end)
*/
int dump_sdh (unsigned char *buffer, int offset, int bufsize, int absoff)
{
int size = 0;
if (!buffer)
return 0;
if ((bufsize - offset) < 20) // needed to read the size
{
printf ("overflow1\n");
return offset - bufsize;
}
size = *((unsigned short*) (buffer + offset + 8));
if (size == 0)
{
printf ("zero size\n");
return 0;
}
if ((offset + size) > bufsize)
{
printf ("overflow2\n");
return offset - bufsize;
}
printf ("%06x 0x%04x offset to data\n", absoff + offset + 0, *((unsigned short*) (buffer + offset + 0)));
printf ("%06x 0x%04x size of data\n", absoff + offset + 2, *((unsigned short*) (buffer + offset + 2)));
printf ("%06x 0x%08lx padding\n", absoff + offset + 4, *((unsigned long*) (buffer + offset + 4)));
printf ("%06x 0x%04x size of index entry\n", absoff + offset + 8, *((unsigned short*) (buffer + offset + 8)));
printf ("%06x 0x%04x size of index key\n", absoff + offset + 10, *((unsigned short*) (buffer + offset + 10)));
printf ("%06x 0x%04x flags\n", absoff + offset + 12, *((unsigned short*) (buffer + offset + 12)));
printf ("%06x 0x%04x padding\n", absoff + offset + 14, *((unsigned short*) (buffer + offset + 14)));
printf ("%06x %02x %02x %02x %02x %02x %02x %02x %02x key\n", absoff + offset + 16, buffer[offset+16], buffer[offset+17], buffer[offset+18], buffer[offset+19], buffer[offset+20], buffer[offset+21], buffer[offset+22], buffer[offset+23]);
printf ("%06x %02x %02x %02x %02x data\n", absoff + offset + 24, buffer[offset+24], buffer[offset+25], buffer[offset+26], buffer[offset+27]);
printf ("%06x %02x %02x %02x %02x data\n", absoff + offset + 28, buffer[offset+28], buffer[offset+29], buffer[offset+30], buffer[offset+31]);
printf ("%06x %02x %02x %02x %02x data\n", absoff + offset + 32, buffer[offset+32], buffer[offset+33], buffer[offset+34], buffer[offset+35]);
printf ("%06x %02x %02x %02x %02x data\n", absoff + offset + 36, buffer[offset+36], buffer[offset+37], buffer[offset+38], buffer[offset+39]);
printf ("%06x %02x %02x %02x %02x data\n", absoff + offset + 40, buffer[offset+40], buffer[offset+41], buffer[offset+42], buffer[offset+43]);
printf ("%06x 0x%08x padding\n", absoff + offset + 0, *((unsigned long*) (buffer + offset + 44)));
printf ("\n");
return size;
}
int main (int argc, char *argv[])
{
FILE *f = NULL;
unsigned char buffer[4096];
int absoff = 0;
int offset = 0;
int ret = 0;
int skip = 0;
if (argc != 2)
{
printf ("args\n");
return 1;
}
f = fopen (argv[1], "r");
if (!f)
{
printf ("fopen");
return 1;
}
memset (buffer, 0, sizeof (buffer));
while (fread (buffer + skip, sizeof (buffer) - skip, 1, f) == 1)
{
skip = 0;
offset = 0x40; // Skip INDX header
do
{
ret = dump_sdh (buffer, offset, sizeof (buffer), absoff);
offset += ret;
}
while (ret > 0);
if (ret == 0)
{
printf ("end\n");
break;
}
printf ("ret = %d\n", ret);
skip = -ret;
memmove (buffer, buffer + sizeof (buffer) - skip, skip);
absoff += sizeof (buffer) - skip;
}
fclose (f);
return 0;
}
--- NEW FILE ---
/*
* $Id: sds.c,v 1.1 2001/06/03 00:53:07 flatcap Exp $
*
* SDS - Part of the Linux-NTFS project.
*
* Copyright (c) 2001 Richard Russon.
*
* Dump the $SDS Data Attribute
*
* Richard Russon <nt...@fl...>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation; either version 2 of the License, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program (in the main directory of the Linux-NTFS source
* in the file COPYING); if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <stdio.h>
/* 0 = end
* n = size
* -n = size (buffer end)
*/
int dump_sds (unsigned char *buffer, int offset, int bufsize, int absoff)
{
int size = 0;
int fs = 0;
int i;
int entry = 0;
int hash = 0;
if (!buffer)
return 0;
if ((bufsize - offset) < 20) // needed to read the size
{
printf ("overflow1\n");
return offset - bufsize;
}
size = *((unsigned long*) (buffer + offset + 16));
if (size == 0)
{
printf ("zero size\n");
return 0;
}
size += 15;
size &= ~15; // Align to a 16 byte boundary
if ((offset + size) > bufsize)
{
printf ("overflow2\n");
return offset - bufsize;
}
hash = *((int*) (buffer + offset + 0));
entry = *((int*) (buffer + offset + 8));
if (hash)
{
if (entry != (absoff + offset))
{
printf ("entry didn't match (%d,%d)\n", entry, absoff+offset);
return 0;
}
}
printf ("%06x 0x%08lx hash\n", absoff + offset + 0, *((unsigned long*) (buffer + offset + 0)));
printf ("%06x 0x%04x security id\n", absoff + offset + 4, *((unsigned long*) (buffer + offset + 4)));
printf ("%06x 0x%08llx offset of this entry\n", absoff + offset + 8, *((unsigned long long*) (buffer + offset + 8)));
printf ("%06x 0x%x (0x%x) size (aligned)\n", absoff + offset + 16, *((unsigned long*) (buffer + offset + 16)), size);
printf ("\n");
return size;
}
int main (int argc, char *argv[])
{
FILE *f = NULL;
unsigned char buffer[4096];
int absoff = 0;
int offset = 0;
int ret = 0;
int skip = 0;
if (argc != 2)
{
printf ("args\n");
return 1;
}
f = fopen (argv[1], "r");
if (!f)
{
printf ("fopen");
return 1;
}
memset (buffer, 0, sizeof (buffer));
while (fread (buffer + skip, sizeof (buffer) - skip, 1, f) == 1)
{
skip = 0;
offset = 0;
do
{
ret = dump_sds (buffer, offset, sizeof (buffer), absoff);
offset += ret;
}
while (ret > 0);
if (ret == 0)
{
printf ("end\n");
break;
}
printf ("ret = %d\n", ret);
skip = -ret;
memmove (buffer, buffer + sizeof (buffer) - skip, skip);
absoff += sizeof (buffer) - skip;
}
fclose (f);
return 0;
}
--- NEW FILE ---
/*
* $Id: sii.c,v 1.1 2001/06/03 00:53:07 flatcap Exp $
*
* SII - Part of the Linux-NTFS project.
*
* Copyright (c) 2001 Richard Russon.
*
* Dump the $SII Index
*
* Richard Russon <nt...@fl...>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation; either version 2 of the License, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program (in the main directory of the Linux-NTFS source
* in the file COPYING); if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <stdio.h>
/* 0 = end
* n = size
* -n = size (buffer end)
*/
int dump_sii (unsigned char *buffer, int offset, int bufsize, int absoff)
{
int size = 0;
if (!buffer)
return 0;
if ((bufsize - offset) < 20) // needed to read the size
{
printf ("overflow1\n");
return offset - bufsize;
}
size = *((unsigned short*) (buffer + offset + 8));
if (size == 0)
{
printf ("zero size\n");
return 0;
}
if ((offset + size) > bufsize)
{
printf ("overflow2\n");
return offset - bufsize;
}
printf ("%06x 0x%04x offset to data\n", absoff + offset + 0, *((unsigned short*) (buffer + offset + 0)));
printf ("%06x 0x%04x size of data\n", absoff + offset + 2, *((unsigned short*) (buffer + offset + 2)));
printf ("%06x 0x%08lx padding\n", absoff + offset + 4, *((unsigned long*) (buffer + offset + 4)));
printf ("%06x 0x%04x size of index entry\n", absoff + offset + 8, *((unsigned short*) (buffer + offset + 8)));
printf ("%06x 0x%04x size of index key\n", absoff + offset + 10, *((unsigned short*) (buffer + offset + 10)));
printf ("%06x 0x%04x flags\n", absoff + offset + 12, *((unsigned short*) (buffer + offset + 12)));
printf ("%06x 0x%04x padding\n", absoff + offset + 14, *((unsigned short*) (buffer + offset + 14)));
printf ("%06x %02x %02x %02x %02x key\n", absoff + offset + 16, buffer[offset+16], buffer[offset+17], buffer[offset+18], buffer[offset+19]);
printf ("%06x %02x %02x %02x %02x data\n", absoff + offset + 20, buffer[offset+20], buffer[offset+21], buffer[offset+22], buffer[offset+23]);
printf ("%06x %02x %02x %02x %02x data\n", absoff + offset + 24, buffer[offset+24], buffer[offset+25], buffer[offset+26], buffer[offset+27]);
printf ("%06x %02x %02x %02x %02x data\n", absoff + offset + 28, buffer[offset+28], buffer[offset+29], buffer[offset+30], buffer[offset+31]);
printf ("%06x %02x %02x %02x %02x data\n", absoff + offset + 32, buffer[offset+32], buffer[offset+33], buffer[offset+34], buffer[offset+35]);
printf ("%06x %02x %02x %02x %02x data\n", absoff + offset + 36, buffer[offset+36], buffer[offset+37], buffer[offset+38], buffer[offset+39]);
printf ("%06x 0x%08x padding\n", absoff + offset + 0, *((unsigned long*) (buffer + offset + 44)));
printf ("\n");
return size;
}
int main (int argc, char *argv[])
{
FILE *f = NULL;
unsigned char buffer[4096];
int absoff = 0;
int offset = 0;
int ret = 0;
int skip = 0;
if (argc != 2)
{
printf ("args\n");
return 1;
}
f = fopen (argv[1], "r");
if (!f)
{
printf ("fopen");
return 1;
}
memset (buffer, 0, sizeof (buffer));
while (fread (buffer + skip, sizeof (buffer) - skip, 1, f) == 1)
{
skip = 0;
offset = 0x40; // Skip INDX header
do
{
ret = dump_sii (buffer, offset, sizeof (buffer), absoff);
offset += ret;
}
while (ret > 0);
if (ret == 0)
{
printf ("end\n");
break;
}
printf ("ret = %d\n", ret);
skip = -ret;
memmove (buffer, buffer + sizeof (buffer) - skip, skip);
absoff += sizeof (buffer) - skip;
}
fclose (f);
return 0;
}
--- NEW FILE ---
/*
* $Id: stdinfo.c,v 1.1 2001/06/03 00:53:07 flatcap Exp $
*
* StdInfo - Part of the Linux-NTFS project.
*
* Copyright (c) 2001 Richard Russon.
*
* Dump the $STANDARD_INFORMATION Attribute
*
* Richard Russon <nt...@fl...>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation; either version 2 of the License, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program (in the main directory of the Linux-NTFS source
* in the file COPYING); if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <stdio.h>
void unfixup (unsigned char *buffer, int bufsize)
{
int num = bufsize / 512;
int off = *((unsigned short*) (buffer + 4));
int size = *((unsigned short*) (buffer + 6));
unsigned short fixup = 0;
int i;
if ((num + 1) != size)
{
printf ("fixup error\n");
return;
}
for (i = 1; i <= num; i++)
{
fixup = *((unsigned short*) (buffer + off + 2*i));
//printf ("f %04x @ %04x\n", fixup, 512*i - 2);
*((unsigned short*) (buffer + 512*i - 2)) = fixup;
}
}
int bitcount (unsigned long l)
{
int count = 0;
while (l)
{
if (l & 1)
count++;
l>>=1;
}
return count;
}
void dump_stdinfo (unsigned char *buffer, int bufsize, int absoff)
{
int size = 0;
if (!buffer)
return;
if (0x10 != *((unsigned short*) (buffer + 0x30)))
{
printf ("%06x ERROR\n", absoff); // prob an extension record
return;
}
size = *((unsigned short*) (buffer + 0x34));
if (size != 0x60)
{
printf ("%06x Size = %x\n", absoff, size);
return;
}
printf ("Inode %d\n", absoff / 1024);
printf ("%06x Max Ver 0x%08lx\n", 0x24, *((unsigned long*) (buffer + 0x48 + 0x24)));
printf ("%06x Ver No 0x%08lx\n", 0x28, *((unsigned long*) (buffer + 0x48 + 0x28)));
printf ("%06x Cls Id 0x%08lx\n", 0x2c, *((unsigned long*) (buffer + 0x48 + 0x2c)));
printf ("%06x Own Id 0x%08lx\n", 0x30, *((unsigned long*) (buffer + 0x48 + 0x30)));
printf ("%06x Sec Id 0x%08lx\n", 0x34, *((unsigned long*) (buffer + 0x48 + 0x34)));
printf ("\n");
}
int main (int argc, char *argv[])
{
FILE *f = NULL;
unsigned char buffer[1024];
int absoff = 0;
if (argc != 2)
{
printf ("args\n");
return 1;
}
f = fopen (argv[1], "r");
if (!f)
{
printf ("fopen");
return 1;
}
memset (buffer, 0, sizeof (buffer));
while (fread (buffer, sizeof (buffer), 1, f) == 1)
{
unfixup (buffer, sizeof (buffer));
dump_stdinfo (buffer, sizeof (buffer), absoff);
absoff += sizeof (buffer);
}
fclose (f);
return 0;
}
--- NEW FILE ---
/*
* $Id: upcase2.c,v 1.1 2001/06/03 00:53:07 flatcap Exp $
*
* UpCase - Part of the Linux-NTFS project.
*
* Copyright (c) 2001 Richard Russon.
*
* This utility will create an UpCase file, identical to the Metadata file.
*
* Richard Russon <nt...@fl...>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation; either version 2 of the License, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program (in the main directory of the Linux-NTFS source
* in the file COPYING); if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <stdio.h>
#include <string.h>
int main (void)
{
static int run[][3] = { /* Start, End, Add */
{ 0x0061, 0x007B, -32 }, { 0x0451, 0x045D, -80 }, { 0x1F70, 0x1F72, 74 },
{ 0x00E0, 0x00F7, -32 }, { 0x045E, 0x0460, -80 }, { 0x1F72, 0x1F76, 86 },
{ 0x00F8, 0x00FF, -32 }, { 0x0561, 0x0587, -48 }, { 0x1F76, 0x1F78, 100 },
{ 0x0256, 0x0258, -205 }, { 0x1F00, 0x1F08, 8 }, { 0x1F78, 0x1F7A, 128 },
{ 0x028A, 0x028C, -217 }, { 0x1F10, 0x1F16, 8 }, { 0x1F7A, 0x1F7C, 112 },
{ 0x03AC, 0x03AD, -38 }, { 0x1F20, 0x1F28, 8 }, { 0x1F7C, 0x1F7E, 126 },
{ 0x03AD, 0x03B0, -37 }, { 0x1F30, 0x1F38, 8 }, { 0x1FB0, 0x1FB2, 8 },
{ 0x03B1, 0x03C2, -32 }, { 0x1F40, 0x1F46, 8 }, { 0x1FD0, 0x1FD2, 8 },
{ 0x03C2, 0x03C3, -31 }, { 0x1F51, 0x1F52, 8 }, { 0x1FE0, 0x1FE2, 8 },
{ 0x03C3, 0x03CC, -32 }, { 0x1F53, 0x1F54, 8 }, { 0x1FE5, 0x1FE6, 7 },
{ 0x03CC, 0x03CD, -64 }, { 0x1F55, 0x1F56, 8 }, { 0x2170, 0x2180, -16 },
{ 0x03CD, 0x03CF, -63 }, { 0x1F57, 0x1F58, 8 }, { 0x24D0, 0x24EA, -26 },
{ 0x0430, 0x0450, -32 }, { 0x1F60, 0x1F68, 8 }, { 0xFF41, 0xFF5B, -32 },
{ 0 }
};
static int dup[][2] = { /* Start, End */
{ 0x0100, 0x012F }, { 0x01A0, 0x01A6 }, { 0x03E2, 0x03EF }, { 0x04CB, 0x04CC },
{ 0x0132, 0x0137 }, { 0x01B3, 0x01B7 }, { 0x0460, 0x0481 }, { 0x04D0, 0x04EB },
{ 0x0139, 0x0149 }, { 0x01CD, 0x01DD }, { 0x0490, 0x04BF }, { 0x04EE, 0x04F5 },
{ 0x014A, 0x0178 }, { 0x01DE, 0x01EF }, { 0x04BF, 0x04BF }, { 0x04F8, 0x04F9 },
{ 0x0179, 0x017E }, { 0x01F4, 0x01F5 }, { 0x04C1, 0x04C4 }, { 0x1E00, 0x1E95 },
{ 0x018B, 0x018B }, { 0x01FA, 0x0218 }, { 0x04C7, 0x04C8 }, { 0x1EA0, 0x1EF9 },
{ 0 }
};
static int byte[][2] = { /* Offset, Value */
{ 0x00FF, 0x0178 }, { 0x01AD, 0x01AC }, { 0x01F3, 0x01F1 }, { 0x0269, 0x0196 },
{ 0x0183, 0x0182 }, { 0x01B0, 0x01AF }, { 0x0253, 0x0181 }, { 0x026F, 0x019C },
{ 0x0185, 0x0184 }, { 0x01B9, 0x01B8 }, { 0x0254, 0x0186 }, { 0x0272, 0x019D },
{ 0x0188, 0x0187 }, { 0x01BD, 0x01BC }, { 0x0259, 0x018F }, { 0x0275, 0x019F },
{ 0x018C, 0x018B }, { 0x01C6, 0x01C4 }, { 0x025B, 0x0190 }, { 0x0283, 0x01A9 },
{ 0x0192, 0x0191 }, { 0x01C9, 0x01C7 }, { 0x0260, 0x0193 }, { 0x0288, 0x01AE },
{ 0x0199, 0x0198 }, { 0x01CC, 0x01CA }, { 0x0263, 0x0194 }, { 0x0292, 0x01B7 },
{ 0x01A8, 0x01A7 }, { 0x01DD, 0x018E }, { 0x0268, 0x0197 },
{ 0 }
};
unsigned short buffer[65536];
FILE *f;
int r;
int i;
int ret = 1;
memset (buffer, 0, sizeof (buffer));
f = fopen ("upcase", "w+");
if (!f)
{
printf ("fopen\n");
goto end;
}
for (i = 0; i < sizeof (buffer) / 2; i++)
{
buffer[i] = i;
}
for (r = 0; run[r][0]; r++)
{
for (i = run[r][0]; i < run[r][1]; i++)
{
buffer[i] += run[r][2];
}
}
for (r = 0; dup[r][0]; r++)
{
for (i = dup[r][0]; i < dup[r][1]; i+=2)
{
buffer[i+1] -= 1;
}
}
for (r = 0; byte[r][0]; r++)
{
buffer[byte[r][0]] = byte[r][1];
}
if (fwrite (buffer, sizeof (buffer), 1, f) != 1)
{
printf ("fwrite\n");
goto close;
}
ret = 0;
close:
fclose (f);
end:
return ret;
}
--- NEW FILE ---
/*
* $Id: usnjrnl.c,v 1.1 2001/06/03 00:53:07 flatcap Exp $
*
* UsnJrnl - Part of the Linux-NTFS project.
*
* Copyright (c) 2001 Richard Russon.
*
* Dump $UsnJrnl data
*
* Richard Russon <nt...@fl...>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation; either version 2 of the License, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program (in the main directory of the Linux-NTFS source
* in the file COPYING); if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <stdio.h>
int bitcount (unsigned long l)
{
int count = 0;
while (l)
{
if (l & 1)
count++;
l>>=1;
}
return count;
}
/* 0 = end
* n = size
* -n = size (buffer end)
*/
int dump_usnjrnl (unsigned char *buffer, int offset, int bufsize, int absoff)
{
int size = 0;
int fs = 0;
int i;
if (!buffer)
return 0;
size = *((unsigned long*) (buffer + offset));
if (size == 0)
{
return 0;
}
if ((offset + size) > bufsize)
{
printf ("ERROR\n");
return 0;
}
printf ("%06x size 0x%x\n", absoff + offset + 0, *((unsigned long*) (buffer + offset + 0)));
printf ("%06x unknown1 %02x %02x %02x %02x\n", absoff + offset + 4, buffer[offset+4], buffer[offset+5], buffer[offset+6], buffer[offset+7]);
printf ("%06x mft reference 0x%016llx\n", absoff + offset + 8, *((unsigned long long*) (buffer + offset + 8)));
printf ("%06x mft reference 0x%016llx\n", absoff + offset + 16, *((unsigned long long*) (buffer + offset + 16)));
printf ("%06x offset in this file 0x%016llx\n", absoff + offset + 24, *((unsigned long long*) (buffer + offset + 24)));
printf ("%06x time 0x%016llx\n", absoff + offset + 32, *((unsigned long long*) (buffer + offset + 32)));
printf ("%06x unknown4 %02x %02x %02x %02x (%d bits)\n", absoff + offset + 40, buffer[offset+40], buffer[offset+41], buffer[offset+42], buffer[offset+43], bitcount (*((unsigned long*) (buffer + offset + 40))));
printf ("%06x unknown5 %02x %02x %02x %02x\n", absoff + offset + 44, buffer[offset+44], buffer[offset+45], buffer[offset+46], buffer[offset+47]);
printf ("%06x unknown6 %02x %02x %02x %02x (%d bits)\n", absoff + offset + 48, buffer[offset+48], buffer[offset+49], buffer[offset+50], buffer[offset+51], bitcount (*((unsigned long*) (buffer + offset + 48))));
printf ("%06x unknown7 %02x %02x %02x %02x (%d bits)\n", absoff + offset + 52, buffer[offset+52], buffer[offset+53], buffer[offset+54], buffer[offset+55], bitcount (*((unsigned long*) (buffer + offset + 52))));
printf ("%06x filename \"", absoff + offset + 56);
fs = *((unsigned short*) (buffer + offset + 56));
for (i = 0; i < fs; i += 2)
{
printf ("%c", buffer[offset + 56 + i + 4]);
}
printf ("\"\n\n");
if (offset + size >= bufsize)
size = 0;
return size;
}
int main (int argc, char *argv[])
{
FILE *f = NULL;
unsigned char buffer[4096];
int absoff = 0;
int offset = 0;
int ret = 0;
int skip = 0;
if (argc != 2)
{
printf ("args\n");
return 1;
}
f = fopen (argv[1], "r");
if (!f)
{
printf ("fopen");
return 1;
}
memset (buffer, 0, sizeof (buffer));
while (fread (buffer + skip, sizeof (buffer) - skip, 1, f) == 1)
{
skip = 0;
offset = 0;
do
{
ret = dump_usnjrnl (buffer, offset, sizeof (buffer), absoff);
offset += ret;
}
while (ret > 0);
absoff += sizeof (buffer);
}
fclose (f);
return 0;
}
|
|
From: Richard R. <fl...@us...> - 2001-06-03 00:28:22
|
Changes by: flatcap
Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools
In directory usw-pr-cvs1:/tmp/cvs-serv7335
Added Files:
ldm.c
Log Message:
Dump the LDM (Logical Disk Manager) Database
--- NEW FILE ---
/*
* $Id: ldm.c,v 1.1 2001/06/03 00:21:06 flatcap Exp $
*
* ldm - Part of the Linux-NTFS project.
*
* Copyright (c) 2001 Richard Russon.
*
* This utility will interpret the Logical Disk Manager Database and
* display the results on stdout.
*
* Richard Russon <nt...@fl...>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
* Software Foundation; either version 2 of the License, or (at your option)
* any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program (in the main directory of the Linux-NTFS source
* in the file COPYING); if not, write to the Free Software Foundation,
* Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
//#define _FILE_OFFSET_BITS 64
#include <stdio.h>
#include <stdlib.h>
#include <asm/byteorder.h>
#include <time.h>
#include <string.h>
#define __u64 unsigned long long
#define __u32 unsigned long
#define __u16 unsigned short
#define __u8 unsigned char
#define SWAB16(x) (__u16) __arch__swab16 (*((__u16 *) (x)))
#define SWAB32(x) (__u32) __arch__swab32 (*((__u32 *) (x)))
#define SWAB64(x) (__u64) __arch__swab64 (*((__u64 *) (x)))
#define MAGIC_VMDB 0x42444d56 /* "VMDB" */
#define MAGIC_VBLK 0x4b4c4256 /* "VBLK" */
#define MAGIC_PRIVHEAD 0x4441454856495250 /* "PRIVHEAD" */
#define MAGIC_TOCBLOCK 0x4b434f4c42434f54 /* "TOCBLOCK" */
#define VBLK_COMP 0x32 /* Component */
#define VBLK_PART 0x33 /* Partition */
#define VBLK_DISK 0x34 /* Disk */
#define VBLK_DGRP 0x45 /* Disk Group */
#define VBLK_VOLU 0x51 /* Volume */
char * print_guid (__u8 *block)
{
static char buffer[40];
memset (buffer, 0, sizeof (buffer));
if (block)
{
sprintf (buffer, "%02X%02X%02X%02X-%02X%02X-%02X%02X-%02X%02X-%02X%02X%02X%02X%02X%02X",
block[0], block[1], block[2], block[3], block[4], block[5], block[6], block[7],
block[8], block[9], block[10], block[11], block[12], block[13], block[14], block[15]);
}
return buffer;
}
char * print_time (__u64 t)
{
static char buffer[32];
__u32 unix_utc;
struct tm *time;
t /= 10000000;
unix_utc = t - ((__u64) 369*365+89)*24*3600;
time = localtime(&unix_utc);
sprintf (buffer, "%02d/%02d/%04d %02d:%02d", time->tm_mday, time->tm_mon+1, time->tm_year+1900, time->tm_hour, time->tm_min);
return buffer;
}
/* Get a variable-width number
* The width is stored in a byte before the number
*/
__u64 get_vnum (__u8 *block)
{
__u64 value = 0;
int length = 0;
int i;
if (!block)
return 0;
length = block[0];
if (length > 8)
return 0;
for (i = 1; i <= length; i++)
{
value <<= 8;
value += block[i];
}
return value;
}
/* Extract a non-null-terminated ASCII string.
* The length is stored in a byte before the string
*/
__u8 * get_vstr (__u8 *block)
{
static __u8 buffer[256];
int length = 0;
memset (buffer, 0, sizeof (buffer));
if (block)
{
length = block[0];
memcpy (buffer, block+1, length);
}
return buffer;
}
void dump_component (__u8 *block, int size)
{
int rel_objid;
int rel_name;
int rel_vstate;
int rel_parent;
if (!block)
return;
/* Calculate relative offsets */
rel_objid = 1 + block[0x18];
rel_name = 1 + block[0x18+rel_objid] + rel_objid;
rel_vstate = 1 + block[0x18+rel_name] + rel_name;
rel_parent = 1 + block[0x18+rel_vstate] + rel_vstate;
printf ("0x%06lX: [%06lX] <Component>\n", SWAB32 (block+0x04), SWAB32 (block+0x08));
printf (" Name : %s\n", get_vstr (block+0x18+rel_objid));
printf (" Object Id : 0x%04llx\n", get_vnum (block+0x18));
printf (" Parent Id : 0x%04llx\n", get_vnum (block+0x2F+rel_vstate));
}
void dump_partition (__u8 *block, int size)
{
__u64 temp;
int rel_objid;
int rel_name;
int rel_size;
int rel_parent;
int rel_diskid;
if (!block)
return;
/* Calculate relative offsets */
rel_objid = 1 + block[0x18];
rel_name = 1 + block[0x18+rel_objid] + rel_objid;
rel_size = 1 + block[0x34+rel_name] + rel_name;
rel_parent = 1 + block[0x34+rel_size] + rel_size;
rel_diskid = 1 + block[0x34+rel_parent] + rel_parent;
printf ("0x%06lX: [%06lX] <Partition>\n", SWAB32 (block+0x04), SWAB32 (block+0x08));
printf (" Name : %s\n", get_vstr (block+0x18+rel_objid));
printf (" Object Id : 0x%04llx\n", get_vnum (block+0x18));
printf (" Parent Id : 0x%04llx\n", get_vnum (block+0x34+rel_size));
printf (" Disk Id : 0x%04llx\n", get_vnum (block+0x34+rel_parent));
printf (" Start : 0x%llX\n", SWAB64 (block+0x24+rel_name));
temp = get_vnum (block+0x34+rel_name);
printf (" Size : 0x%llX (%lld MB)\n", temp, temp >> 11);
temp = SWAB64 (block+0x2C+rel_name);
printf (" Volume Off : 0x%llX (%llu MB)\n", temp, temp >> 11);
}
void dump_disk (__u8 *block, int size)
{
int rel_objid;
int rel_name;
int rel_diskid;
if (!block)
return;
/* Calculate relative offsets */
rel_objid = 1 + block[0x18];
rel_name = 1 + block[0x18+rel_objid] + rel_objid;
rel_diskid = 1 + block[0x18+rel_name] + rel_name;
printf ("0x%06lX: [%06lX] <Disk>\n", SWAB32 (block+0x04), SWAB32 (block+0x08));
printf (" Name : %s\n", get_vstr (block+0x18+rel_objid));
printf (" Object Id : 0x%04llx\n", get_vnum (block+0x18));
printf (" Disk Id : %s\n", get_vstr (block+0x18+rel_name));
/* need another example to test
if (block[0x18+rel_name])
{
printf (" AltName : %s\n", get_vstr (block+29));
}
*/
}
void dump_diskgroup (__u8 *block, int size)
{
int rel_objid;
int rel_name;
int rel_diskid;
if (!block)
return;
/* Calculate relative offsets */
rel_objid = 1 + block[0x18];
rel_name = 1 + block[0x18+rel_objid] + rel_objid;
rel_diskid = 1 + block[0x18+rel_name] + rel_name;
printf ("0x%06lX: [%06lX] <DiskGroup>\n", SWAB32 (block+0x04), SWAB32 (block+0x08));
printf (" Name : %s\n", get_vstr (block+0x18+rel_objid));
printf (" Object Id : 0x%04llx\n", get_vnum (block+0x18));
printf (" GUID : %s\n", print_guid (block+0x18+rel_name));
}
void dump_volume (__u8 *block, int size)
{
__u64 temp;
int rel_objid;
int rel_name;
int rel_vtype;
int rel_size;
int rel_drive;
if (!block)
return;
/* Calculate relative offsets */
rel_objid = 1 + block[0x18];
rel_name = 1 + block[0x18+rel_objid] + rel_objid;
rel_vtype = 1 + block[0x18+rel_name] + rel_name;
rel_size = 1 + block[0x40+rel_vtype] + rel_vtype;
rel_drive = 1 + block[0x55+rel_size] + rel_size;
printf ("0x%06lX: [%06lX] <Volume>\n", SWAB32 (block+0x04), SWAB32 (block+0x08));
printf (" Name : %s\n", get_vstr (block+0x18+rel_objid));
printf (" Object Id : 0x%04llx\n", get_vnum (block+0x18));
printf (" Volume state: %s\n", block+0x19+rel_vtype);
temp = get_vnum (block+0x40+rel_vtype);
printf (" Size : 0x%08llX (%lld MB)\n", temp, temp >> 11);
printf (" GUID : %s\n", print_guid (block+0x45+rel_size));
/* GUID (Reg) Order F,E,D,C,B,A,9,8,6,7,4,5,3,2,1,0 (8-2-2-4) WHY??? */
printf (" GUID (Reg) : %02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X\n",
block[rel_size+0x54], block[rel_size+0x53], block[rel_size+0x52], block[rel_size+0x51], block[rel_size+0x50], block[rel_size+0x4F], block[rel_size+0x4E], block[rel_size+0x4D],
block[rel_size+0x4B], block[rel_size+0x4C], block[rel_size+0x49], block[rel_size+0x4A], block[rel_size+0x45], block[rel_size+0x46], block[rel_size+0x47], block[rel_size+0x48]);
if (block[0x55+rel_size] != 0)
{
printf (" Drive Hint : %s\n", get_vstr (block+0x55+rel_size));
}
}
int dump_vmdb (__u8 *block)
{
__u32 temp = 0;
int vblocks = 0;
int vbsize = 0;
int hsize = 0;
int recsize = 0;
int i;
if (!block)
return 1;
temp = *((__u32*) block);
if (MAGIC_VMDB != temp)
{
printf ("not a VMDB\n");
return 1;
}
printf ("VMDB DATABASE HEADER:\n");
vblocks = SWAB32 (block+4);
vbsize = SWAB32 (block+8);
hsize = SWAB32 (block+12);
printf ("Signature : %c%c%c%c\n", block[0], block[1], block[2], block[3]);
printf ("Flags : 0x%X\n", SWAB16 (block+16));
printf ("Timestamp : %s\n", print_time (SWAB64 (block+189)));
printf ("Block size : %d bytes\n", vbsize);
printf ("Header size : %d bytes\n", hsize);
printf ("Version : %d/%d\n", SWAB16 (block+18), SWAB16 (block+20));
printf ("Number of VBLKs : 0x%X\n", vblocks);
printf ("Disk Group Name : %s\n", block+22);
printf ("Disk Group Id : %s\n", block+53);
printf ("Committed Sequence : 0x%llX\n", SWAB64 (block+117));
printf ("Pending Sequence : 0x%llX\n", SWAB64 (block+125));
#if 0
printf ("Unknowns : 0x%08X 0x%08X 0x%08X 0x%08X\n", SWAB32 (block+133), SWAB32 (block+141), SWAB32 (block+149), SWAB32 (block+157));
#endif
printf ("\n");
printf ("VBLK DATABASE:\n");
block += hsize;
for (i = 0; i < vblocks; i++, block += vbsize)
{
temp = *((__u32*) block);
if (MAGIC_VBLK != temp)
{
/*printf ("%d not a VBLK\n", i);*/
/*the last four are missing*/
break;
}
recsize = SWAB16 (block+14) * vbsize;
if (recsize == 0)
continue;
switch (block[19])
{
/* add a recsize param? */
case VBLK_COMP: dump_component (block, vbsize); break;
case VBLK_PART: dump_partition (block, vbsize); break;
case VBLK_DISK: dump_disk (block, vbsize); break;
case VBLK_DGRP: dump_diskgroup (block, vbsize); break;
case VBLK_VOLU: dump_volume (block, vbsize); break;
default: continue; /* extended here? */
}
printf ("\n");
if (recsize > vbsize)
block += recsize - vbsize; /* skip extension record */
}
return 0;
}
int dump_privhead (__u8 *block)
{
__u64 temp = 0;
if (!block)
{
return 1;
}
temp = *((__u64*) block);
if (MAGIC_PRIVHEAD != temp)
{
printf ("Not a PRIVHEAD\n");
return 1;
}
printf ("PRIVATE HEAD:\n");
printf ("Signature : %c%c%c%c%c%c%c%c\n", block[0], block[1], block[2], block[3], block[4], block[5], block[6], block[7]);
printf ("Version : %d.%d\n", SWAB16 (block + 12), SWAB16 (block + 14));
if (block[48])
printf ("Disk Id : %s\n", block+48);
if (block[112])
printf ("Host Id : %s\n", block+112);
if (block[176])
printf ("Disk Group Id : %s\n", block+176);
printf ("Disk Group Name : %s\n", block+240);
printf ("Logical disk start : 0x%llX\n", SWAB64 (block+283));
temp = SWAB64 (block+291);
printf ("Logical disk size : 0x%llX (%lld MB)\n", temp, temp>>11);
printf ("Configuration start: 0x%llX\n", SWAB64 (block+299));
temp = SWAB64 (block+307);
printf ("Configuration size : 0x%llX (%lld MB)\n", temp, temp>>11);
printf ("Number of TOCs : %lld\n", SWAB64 (block+315));
printf ("TOC size : 0x%llX\n", SWAB64 (block+323));
printf ("Number of Configs : %ld\n", SWAB32 (block+331));
printf ("Config size : 0x%llX bytes\n", SWAB64 (block+339));
printf ("Number of Logs : %ld\n", SWAB32 (block+335));
printf ("Log size : 0x%llX bytes\n", SWAB64 (block+347));
#if 0
/* not in orig version */
printf ("-------------------:\n");
printf ("Timestamp : %s\n", print_time (SWAB64 (block+16)));
printf ("disk id : 0x%lX (of something?)\n", SWAB32 (block+355));
printf ("GUID of disk set : %s\n", print_guid (block+359));
printf ("GUID of disk set : %s\n", print_guid (block+375));
#endif
printf ("\n");
return 0;
}
int dump_tocblock (__u8 *block)
{
__u64 temp = 0;
int i;
if (!block)
{
return 1;
}
temp = *((__u64*) block);
if (MAGIC_TOCBLOCK != temp)
{
printf ("Not a TOCBLOCK\n");
return 1;
}
for (i = 0; i < 2; i++)
{
printf ("TOC %d:\n", i);
printf ("Signature : %c%c%c%c%c%c%c%c\n", block[0], block[1], block[2], block[3], block[4], block[5], block[6], block[7]);
/* sequence could be 64 bits */
printf ("Sequence : 0x%llX\n", SWAB64 (block+12));
#if 0
printf ("Bitmap name : \"%s\"\n", block+36);
#endif
printf ("Config bitmap start: 0x%llX\n", SWAB64 (block+46));
printf ("Config bitmap size : 0x%llX\n", SWAB64 (block+54));
#if 0
printf ("Bitmap name : \"%s\"\n", block+70);
#endif
printf ("Log bitmap start : 0x%llX\n", SWAB64 (block+80));
printf ("Log bitmap size : 0x%llX\n", SWAB64 (block+88));
}
printf ("\n");
return 0;
}
/* Yay! O(n^2) */
int dump_disks (__u8 *block)
{
__u64 temp;
int vblocks;
int vbsize;
int i;
int j;
__u8 *ioff;
__u8 *joff;
if (!block)
return 1;
if (MAGIC_VMDB != *((__u32*) block))
{
printf ("not a VMDB\n");
return 1;
}
printf ("PARTITION LAYOUT:\n");
printf ("\n");
vblocks = SWAB32 (block+4);
vbsize = SWAB32 (block+8);
for (i = 4; i < vblocks; i++) /* Skip the VMDB header */
{
int diskid;
int parent;
int rel_objid;
ioff = block + i*vbsize;
if (MAGIC_VBLK != *((__u32*) ioff))
break;
if (VBLK_DISK != ioff[19])
continue;
/* Calculate relative offsets */
rel_objid = 1 + ioff[0x18];
printf ("Disk %s:\n", get_vstr (ioff+0x18+rel_objid));
diskid = get_vnum (ioff+0x18);
for (j = 4; j < vblocks; j++)
{
int rel_objid;
int rel_name;
int rel_size;
int rel_parent;
joff = block + j*vbsize;
if (MAGIC_VBLK != *((__u32*) joff))
break;
if (VBLK_PART != joff[19])
continue;
/* Calculate relative offsets */
rel_objid = 1 + joff[0x18];
rel_name = 1 + joff[0x18+rel_objid] + rel_objid;
rel_size = 1 + joff[0x34+rel_name] + rel_name;
rel_parent = 1 + joff[0x34+rel_size] + rel_size;
parent = get_vnum (joff+0x34+rel_parent);
if (parent != diskid)
continue;
printf (" %s ", get_vstr (joff+0x18+rel_objid));
printf ("Offset: 0x%08llX ", SWAB64 (joff+0x24+rel_name));
temp = get_vnum (joff+0x34+rel_name);
printf ("Length: 0x%08llX (%lld MB)\n", temp, temp>>11);
}
}
printf ("\n");
return 0;
}
/* O(n^3)? This is getting silly */
int dump_volumes (__u8 *block)
{
__u64 temp;
int vblocks;
int vbsize;
int i;
int j;
int k;
int iobj;
int jobj;
__u8 *ioff;
__u8 *joff;
__u8 *koff;
if (!block)
return 1;
if (MAGIC_VMDB != *((__u32*) block))
{
printf ("not a VMDB\n");
return 1;
}
printf ("VOLUME DEFINITIONS:\n");
printf ("\n");
vblocks = SWAB32 (block+4);
vbsize = SWAB32 (block+8);
for (i = 4; i < vblocks; i++)
{
int rel_objid;
int rel_name;
int rel_vtype;
ioff = block + i*vbsize;
if (MAGIC_VBLK != *((__u32*) ioff))
break;
if (VBLK_VOLU != ioff[19])
continue;
/* Calculate relative offsets */
rel_objid = 1 + ioff[0x18];
rel_name = 1 + ioff[0x18+rel_objid] + rel_objid;
rel_vtype = 1 + ioff[0x18+rel_name] + rel_name;
if (ioff[0x2F+rel_vtype] == 0x02) /* last byte of flags */
printf ("Mirrored ");
iobj = get_vnum (ioff+0x18); /* objid of volume */
printf ("%s ", get_vstr (ioff+0x18+rel_objid));
temp = get_vnum (ioff+0x40+rel_vtype);
printf ("Size: 0x%08llX (%lld MB)\n", temp, temp >> 11);
for (j = 4; j < vblocks; j++)
{
int rel_objid;
int rel_name;
int rel_vstate;
int parent;
joff = block + j*vbsize;
if (MAGIC_VBLK != *((__u32*) joff))
break;
if (VBLK_COMP != joff[19])
continue;
/* Calculate relative offsets */
rel_objid = 1 + joff[0x18];
rel_name = 1 + joff[0x18+rel_objid] + rel_objid;
rel_vstate = 1 + joff[0x18+rel_name] + rel_name;
parent = get_vnum (joff+0x2F+rel_vstate);
if (parent != iobj)
continue;
jobj = get_vnum (joff+0x18); /* objid of component */
printf (" %s -\n", get_vstr (joff+0x18+rel_objid));
for (k = 4; k < vblocks; k++)
{
int rel_objid;
int rel_name;
int rel_size;
koff = block + k*vbsize;
if (MAGIC_VBLK != *((__u32*) koff))
break;
if (VBLK_PART != koff[19])
continue;
/* Calculate relative offsets */
rel_objid = 1 + koff[0x18];
rel_name = 1 + koff[0x18+rel_objid] + rel_objid;
rel_size = 1 + koff[0x34+rel_name] + rel_name;
parent = get_vnum (koff+0x34+rel_size);
if (parent != jobj)
continue;
printf (" %s ", get_vstr (koff+0x18+rel_objid));
printf ("VolumeOffset: 0x%08llX ", SWAB64 (koff+0x2C+rel_name));
printf ("Offset: 0x%08llX ", SWAB64 (koff+0x24+rel_name));
printf ("Length: 0x%08llX\n", get_vnum (koff+0x34+rel_name));
}
}
}
printf ("\n");
return 0;
}
int get_partition (FILE *file, __u32 *first, __u32 *last)
{
__u8 buffer[512];
int ret = 1;
if (!first || !last)
{
goto gp_end;
}
*first = 0;
*last = 0;
if (fread (buffer, sizeof (buffer), 1, file) != 1)
{
printf ("gp fread\n");
goto gp_end;
}
/* Check this is the partition sector */
if (!(((buffer[510] == 0x55) && (buffer[511] == 0xAA)) ||
((buffer[510] == 0xAA) && (buffer[511] == 0x55))))
{
printf ("not a partition sector\n");
goto gp_end;
}
if (buffer[450] != 0x42) /* M$ dynamic disk */
{
printf ("partition type\n");
goto gp_end;
}
if (buffer[466] != 0x00)
{
printf ("multiple partitions!\n"); /* ignore for now */
}
/* little endian */
*first = *((__u32 *) (buffer + 454));
*last = *((__u32 *) (buffer + 458)); /* actually this is the size */
*last += *first - 1;
ret = 0;
gp_end:
return ret;
}
int main (int argc, char *argv[])
{
const int bufsize = 1048576; /* 1MiB */
__u32 first = 0;
__u32 last = 0;
__u32 db = 0;
__u8 *buffer = NULL;
FILE *file = NULL;
int ret = 1;
if (argc != 2)
{
printf ("args\n");
goto end;
}
file = fopen (argv[1], "r");
if (!file)
{
printf ("fopen\n");
goto end;
}
if (get_partition (file, &first, &last))
{
printf ("get_partition\n");
goto close;
}
/* check PRIVHEAD exists, else no LDM */
printf ("Device: %s\n", argv[1]);
printf ("Physical Size: %lld MiB\n", (__u64) (last+1) >> 11);
printf ("Logical Size: %lld MiB\n", (__u64) (last-first-2047) >> 11);
printf ("\n");
db = last - 2047; /* 1 MiB from the end */
if (db > 0x400000)
{
printf ("Disk exceeds 2GiB limit, giving up\n");
goto close;
}
db <<= 9; /* convert to bytes */
buffer = malloc (bufsize);
if (!buffer)
{
printf ("malloc\n");
goto free;
}
memset (buffer, 0, bufsize);
if (fseek (file, -bufsize, SEEK_END))
{
printf ("fseek\n");
goto free;
}
if (fread (buffer, bufsize, 1, file) != 1)
{
printf ("fread\n");
goto free;
}
dump_privhead (buffer + 0xE8000);
//dump_privhead (buffer + 0xFFE00);
//dump_tocblock (buffer + 0x200);
dump_tocblock (buffer + 0x400);
//dump_tocblock (buffer + 0xFFA00);
//dump_tocblock (buffer + 0xFFC00);
dump_vmdb (buffer + 0x2200);
dump_disks (buffer + 0x2200);
dump_volumes (buffer + 0x2200);
ret = 0;
free:
free (buffer);
close:
fclose (file);
end:
return ret;
}
|
|
From: Anton A. <an...@us...> - 2001-06-01 19:04:13
|
Changes by: antona
Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv12627/include
Modified Files:
layout.h
Log Message:
Updates & fixes.
Index: layout.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/layout.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -U2 -r1.2 -r1.3
--- layout.h 2001/06/01 02:07:24 1.2
+++ layout.h 2001/06/01 19:04:08 1.3
@@ -664,8 +664,8 @@
last access times updates can be
disabled altogether for speed. */
-/* 30*/ FILE_ATTR_FLAGS file_attributes; /* Flags describing the file. */
-/* 34*/ union {
+/* 32*/ FILE_ATTR_FLAGS file_attributes; /* Flags describing the file. */
+/* 36*/ union {
/* NTFS 1.2 (and previous, presumably) */
-/* 34 */ __u8 reserved12[14]; /* Reserved/alignment to 8-byte
+/* 36 */ __u8 reserved12[12]; /* Reserved/alignment to 8-byte
boundary. */
/* sizeof() = 48 bytes */
@@ -691,21 +691,21 @@
* attributes.
*/
- /* 34*/ __u32 maximum_versions; /* Maximum allowed versions for
+ /* 36*/ __u32 maximum_versions; /* Maximum allowed versions for
file. Zero if version numbering is disabled. */
- /* 38*/ __u32 version_number; /* This file's version (if any).
+ /* 40*/ __u32 version_number; /* This file's version (if any).
Set to zero if maximum_versions is zero. */
- /* 42*/ __u32 class_id; /* Class id from bidirectional
+ /* 44*/ __u32 class_id; /* Class id from bidirectional
class id index (?). */
- /* 46*/ __u32 owner_id; /* Owner_id of the user owning
+ /* 48*/ __u32 owner_id; /* Owner_id of the user owning
the file. Translate via $Q index in FILE_$Extend
/$Quota to the quota control entry for the user
owning the file. Zero if quotas are disabled. */
- /* 50*/ __u32 security_id; /* Security_id for the file.
+ /* 52*/ __u32 security_id; /* Security_id for the file.
Translate via $SII index and $SDS data stream
in FILE_$Secure to the security descriptor. */
- /* 54*/ __u64 quota_charged; /* Byte size of the charge to
+ /* 56*/ __u64 quota_charged; /* Byte size of the charge to
the quota for all streams of the file. Note: Is
zero if quotas are disabled. */
- /* 62*/ __u64 usn; /* Last update sequence number
+ /* 64*/ __u64 usn; /* Last update sequence number
of the file. This is a direct index into the
change (aka usn) journal file. It is zero if
@@ -721,5 +721,4 @@
journal is a very fast process, so the user
won't even notice it. */
- /* 70*/ __u16 reserved30; /* Align to 8-byte boundary. */
};
};
|
|
From: Anton A. <an...@us...> - 2001-06-01 19:04:12
|
Changes by: antona Update of /cvsroot/linux-ntfs/linux-ntfs/ntfstools In directory usw-pr-cvs1:/tmp/cvs-serv12627/ntfstools Modified Files: mkntfs.c Log Message: Updates & fixes. Index: mkntfs.c =================================================================== RCS file: /cvsroot/linux-ntfs/linux-ntfs/ntfstools/mkntfs.c,v retrieving revision 1.3 retrieving revision 1.4 diff -U2 -r1.3 -r1.4 --- mkntfs.c 2001/06/01 02:07:26 1.3 +++ mkntfs.c 2001/06/01 19:04:08 1.4 @@ -1544,5 +1544,4 @@ /* FIXME: $UsnJrnl support... */ si.usn = cpu_to_le64(0ULL); - si.reserved30 = cpu_to_le16(0); } /* NTFS 1.2: size of si = 48, NTFS 3.0: size of si = 72 */ |
