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: Szabolcs S. <sz...@us...> - 2005-08-21 00:50:23
|
Changes by: szaka Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6910/ntfsprogs Modified Files: ntfscluster.c Log Message: Fix incorrect volume usage calculation Index: ntfscluster.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscluster.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -p -r1.25 -r1.26 --- ntfscluster.c 19 Jun 2005 21:09:41 -0000 1.25 +++ ntfscluster.c 21 Aug 2005 00:50:15 -0000 1.26 @@ -269,7 +269,7 @@ static int info (ntfs_volume *vol) inuse++; - a_ctx = ntfs_attr_get_search_ctx (NULL, m_ctx->inode->mrec); + a_ctx = ntfs_attr_get_search_ctx (m_ctx->inode, NULL); while ((rec = find_attribute (AT_UNUSED, a_ctx))) { |
|
From: Szabolcs S. <sz...@us...> - 2005-08-21 00:50:23
|
Changes by: szaka Update of /cvsroot/linux-ntfs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6910 Modified Files: ChangeLog Log Message: Fix incorrect volume usage calculation Index: ChangeLog =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v retrieving revision 1.273 retrieving revision 1.274 diff -u -p -r1.273 -r1.274 --- ChangeLog 19 Aug 2005 16:01:15 -0000 1.273 +++ ChangeLog 21 Aug 2005 00:50:14 -0000 1.274 @@ -36,6 +36,7 @@ xx/xx/2005 - 1.12.0-WIP - Hard link mkfs.ntfs and mkfs.ntfs.8 with mkntfs and mkntfs.8. (Szaka) - Only include sys/ioctl.h in libntfs/device.c if ./configure detected it to be present. (Christophe) + - ntfscluster: fix incorrect volume usage calculation. (Szaka) 08/08/2005 - 1.11.2 - ntfsdecrypt now works and lots of fixes and improvements. |
|
From: Anton A. <an...@us...> - 2005-08-19 16:01:23
|
Changes by: antona Update of /cvsroot/linux-ntfs/ntfsprogs/libntfs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26588/libntfs Modified Files: device.c Log Message: Only include sys/ioctl.h in libntfs/device.c if ./configure detected it to be present. (Christophe) Index: device.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/device.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -p -r1.18 -r1.19 --- device.c 1 Aug 2005 22:10:39 -0000 1.18 +++ device.c 19 Aug 2005 16:01:15 -0000 1.19 @@ -29,7 +29,9 @@ #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> -#include <sys/ioctl.h> +#ifdef HAVE_SYS_IOCTL_H +# include <sys/ioctl.h> +#endif #ifdef HAVE_LINUX_FD_H # include <linux/fd.h> #endif |
|
From: Anton A. <an...@us...> - 2005-08-19 16:01:23
|
Changes by: antona Update of /cvsroot/linux-ntfs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26588 Modified Files: ChangeLog Log Message: Only include sys/ioctl.h in libntfs/device.c if ./configure detected it to be present. (Christophe) Index: ChangeLog =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v retrieving revision 1.272 retrieving revision 1.273 diff -u -p -r1.272 -r1.273 --- ChangeLog 15 Aug 2005 20:48:48 -0000 1.272 +++ ChangeLog 19 Aug 2005 16:01:15 -0000 1.273 @@ -33,7 +33,9 @@ xx/xx/2005 - 1.12.0-WIP ntfs_mft_record_alloc. (Yura) - Make ntfsmount use new APIs for file and directory creation/deletion. Implement utime operation. (Yura) - - Hard link mkfs.ntfs and mkfs.ntfs.8 with mkntfs and mkntfs.8 (Szaka). + - Hard link mkfs.ntfs and mkfs.ntfs.8 with mkntfs and mkntfs.8. (Szaka) + - Only include sys/ioctl.h in libntfs/device.c if ./configure detected + it to be present. (Christophe) 08/08/2005 - 1.11.2 - ntfsdecrypt now works and lots of fixes and improvements. |
|
From: Richard R. <fl...@us...> - 2005-08-17 15:59:35
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18315 Modified Files: ntfsrm.c Log Message: more housekeeping - no code changes Index: ntfsrm.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsrm.c,v retrieving revision 1.58 retrieving revision 1.59 diff -u -p -r1.58 -r1.59 --- ntfsrm.c 17 Aug 2005 14:53:07 -0000 1.58 +++ ntfsrm.c 17 Aug 2005 15:59:27 -0000 1.59 @@ -248,224 +248,6 @@ static void ntfs_dt_print (struct ntfs_d } } -/** - * ntfs_binary_print - */ -static void ntfs_binary_print (u8 num, BOOL backwards, BOOL colour) -{ - int i; - - if (backwards) [...991 lines suppressed...] if (0) result = ntfs_file_remove2 (vol, find.dt, find.dt_index); if (1) result = ntfs_file_add2 (vol, opts.file); - if (0) result = ntfs_test_bmp2 (vol); done: - if (1) utils_volume_commit (vol); - if (0) utils_volume_rollback (vol); + if (1) ntfs_volume_commit (vol); + if (0) ntfs_volume_rollback (vol); if (0) ntfs_inode_close2 (inode); - if (1) ntfs_umount2 (vol, FALSE); + if (1) ntfs_volume_umount2 (vol, FALSE); - if (0) ntfs_binary_print (0, FALSE, FALSE); if (0) utils_pathname_to_inode2 (NULL, NULL, NULL, NULL); - if (0) ntfs_dir_map (NULL, NULL); + if (0) ntfs_ie_remove_name (NULL); return result; } |
|
From: Richard R. <fl...@us...> - 2005-08-17 14:53:16
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2768 Modified Files: ntfsrm.c Log Message: housekeeping - no code changes Index: ntfsrm.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsrm.c,v retrieving revision 1.57 retrieving revision 1.58 diff -u -p -r1.57 -r1.58 --- ntfsrm.c 17 Aug 2005 14:33:16 -0000 1.57 +++ ntfsrm.c 17 Aug 2005 14:53:07 -0000 1.58 @@ -559,9 +559,9 @@ static void ntfs_bmp_free (struct ntfs_b } /** - * ntfs_bmp_alloc + * ntfs_bmp_create */ -static struct ntfs_bmp * ntfs_bmp_alloc (ntfs_inode *inode, ATTR_TYPES type, ntfschar *name, int name_len) +static struct ntfs_bmp * ntfs_bmp_create (ntfs_inode *inode, ATTR_TYPES type, ntfschar *name, int name_len) { struct ntfs_bmp *bmp; ntfs_attr *attr; @@ -840,6 +840,14 @@ static int ntfs_bmp_find_space (struct n /** + * ntfs_ie_free + */ +static void ntfs_ie_free (INDEX_ENTRY *ie) +{ + free (ie); +} + +/** * ntfs_ie_get_vcn */ static VCN ntfs_ie_get_vcn (INDEX_ENTRY *ie) @@ -1159,8 +1167,8 @@ static int ntfs_ie_test (void) ntfs_ie_dump (ie1); free (name); - free (ie1); - free (ie2); + ntfs_ie_free (ie1); + ntfs_ie_free (ie2); return 0; } @@ -1293,9 +1301,9 @@ static int ntfs_dt_commit (struct ntfs_d } /** - * ntfs_dt_alloc_children2 + * ntfs_dt_create_children2 */ -static BOOL ntfs_dt_alloc_children2 (struct ntfs_dt *dt, int count) +static BOOL ntfs_dt_create_children2 (struct ntfs_dt *dt, int count) { // XXX calculate for 2K and 4K indexes max and min filenames (inc/exc VCN) @@ -1320,9 +1328,9 @@ static BOOL ntfs_dt_alloc_children2 (str } /** - * ntfs_dt_count_root + * ntfs_dt_root_count */ -static int ntfs_dt_count_root (struct ntfs_dt *dt) +static int ntfs_dt_root_count (struct ntfs_dt *dt) { u8 *buffer = NULL; u8 *ptr = NULL; @@ -1355,7 +1363,7 @@ static int ntfs_dt_count_root (struct nt entry = (INDEX_ENTRY*) ptr; dt->child_count++; - ntfs_dt_alloc_children2 (dt, dt->child_count); // XXX retval + ntfs_dt_create_children2 (dt, dt->child_count); // XXX retval if (entry->flags & INDEX_ENTRY_NODE) { vcn = ntfs_ie_get_vcn ((INDEX_ENTRY*) ptr); @@ -1381,9 +1389,9 @@ static int ntfs_dt_count_root (struct nt } /** - * ntfs_dt_count_alloc + * ntfs_dt_alloc_count */ -static int ntfs_dt_count_alloc (struct ntfs_dt *dt) +static int ntfs_dt_alloc_count (struct ntfs_dt *dt) { u8 *buffer = NULL; u8 *ptr = NULL; @@ -1413,7 +1421,7 @@ static int ntfs_dt_count_alloc (struct n entry = (INDEX_ENTRY*) ptr; dt->child_count++; - ntfs_dt_alloc_children2 (dt, dt->child_count); // XXX retval + ntfs_dt_create_children2 (dt, dt->child_count); // XXX retval if (entry->flags & INDEX_ENTRY_NODE) { vcn = ntfs_ie_get_vcn ((INDEX_ENTRY*) ptr); @@ -1439,9 +1447,9 @@ static int ntfs_dt_count_alloc (struct n } /** - * ntfs_dt_alloc + * ntfs_dt_create */ -static struct ntfs_dt * ntfs_dt_alloc (struct ntfs_dir *dir, struct ntfs_dt *parent, VCN vcn) +static struct ntfs_dt * ntfs_dt_create (struct ntfs_dir *dir, struct ntfs_dt *parent, VCN vcn) { struct ntfs_dt *dt = NULL; //int i; @@ -1482,7 +1490,7 @@ static struct ntfs_dt * ntfs_dt_alloc (s //utils_dump_mem (dt->data, 0, dt->data_len, DM_DEFAULTS); //printf ("\n"); - ntfs_dt_count_alloc (dt); + ntfs_dt_alloc_count (dt); dt->header = &((INDEX_BLOCK*)dt->data)->index; //printf ("USA = %d\n", ((INDEX_BLOCK*)dt->data)->usa_count); @@ -1512,7 +1520,7 @@ static struct ntfs_dt * ntfs_dt_alloc (s //utils_dump_mem (dt->data, 0, dt->data_len, DM_DEFAULTS); //printf ("\n"); - ntfs_dt_count_root (dt); + ntfs_dt_root_count (dt); dt->header = &((INDEX_ROOT*)dt->data)->index; //dt->data_len = ((INDEX_ROOT*)dt->data)->index_block_size; @@ -1596,7 +1604,7 @@ static MFT_REF ntfs_dt_find (struct ntfs if (!dt->sub_nodes[i]) { vcn = ntfs_ie_get_vcn (ie); //printf ("vcn = %lld\n", vcn); - sub = ntfs_dt_alloc (dt->dir, dt, vcn); + sub = ntfs_dt_create (dt->dir, dt, vcn); dt->sub_nodes[i] = sub; } res = ntfs_dt_find (dt->sub_nodes[i], name, name_len); @@ -1672,7 +1680,7 @@ static struct ntfs_dt * ntfs_dt_find2 (s if (!dt->sub_nodes[i]) { vcn = ntfs_ie_get_vcn (ie); //printf ("vcn = %lld\n", vcn); - dt->sub_nodes[i] = ntfs_dt_alloc (dt->dir, dt, vcn); + dt->sub_nodes[i] = ntfs_dt_create (dt->dir, dt, vcn); } res = ntfs_dt_find2 (dt->sub_nodes[i], name, name_len, index_num); } else { @@ -1792,7 +1800,7 @@ static struct ntfs_dt * ntfs_dt_find4 (s if (!dt->sub_nodes[i]) { vcn = ntfs_ie_get_vcn (ie); //printf ("vcn = %lld\n", vcn); - sub = ntfs_dt_alloc (dt->dir, dt, vcn); + sub = ntfs_dt_create (dt->dir, dt, vcn); dt->sub_nodes[i] = sub; } res = ntfs_dt_find4 (dt->sub_nodes[i], name, name_len, index_num); @@ -1831,7 +1839,7 @@ static void ntfs_dt_find_all (struct ntf if (ie->flags & INDEX_ENTRY_NODE) { if (!dt->sub_nodes[i]) { vcn = ntfs_ie_get_vcn (ie); - dt->sub_nodes[i] = ntfs_dt_alloc (dt->dir, dt, vcn); + dt->sub_nodes[i] = ntfs_dt_create (dt->dir, dt, vcn); } ntfs_dt_find_all (dt->sub_nodes[i]); } @@ -1861,9 +1869,9 @@ static int ntfs_dt_find_parent (struct n } /** - * ntfs_dt_root + * ntfs_dt_isroot */ -static BOOL ntfs_dt_root (struct ntfs_dt *dt) +static BOOL ntfs_dt_isroot (struct ntfs_dt *dt) { if (!dt) return FALSE; @@ -1871,9 +1879,9 @@ static BOOL ntfs_dt_root (struct ntfs_dt } /** - * ntfs_dt_freespace_root + * ntfs_dt_root_freespace */ -static int ntfs_dt_freespace_root (struct ntfs_dt *dt) +static int ntfs_dt_root_freespace (struct ntfs_dt *dt) { int recsize; int inuse; @@ -1891,9 +1899,9 @@ static int ntfs_dt_freespace_root (struc } /** - * ntfs_dt_freespace_alloc + * ntfs_dt_alloc_freespace */ -static int ntfs_dt_freespace_alloc (struct ntfs_dt *dt) +static int ntfs_dt_alloc_freespace (struct ntfs_dt *dt) { int recsize; int inuse; @@ -1930,7 +1938,7 @@ static int ntfs_dt_initialise (struct nt dt->children = NULL; dt->sub_nodes = NULL; - if (!ntfs_dt_alloc_children2 (dt, 1)) + if (!ntfs_dt_create_children2 (dt, 1)) return -1; block = (INDEX_BLOCK*) dt->data; @@ -1989,10 +1997,10 @@ static int ntfs_dt_transfer (struct ntfs //file = &mov_ie->key.file_name; printf ("\ttrn name: "); ntfs_name_print (file->file_name, file->file_name_length); printf ("\n"); } - if (ntfs_dt_root (new)) - space = ntfs_dt_freespace_root (new); + if (ntfs_dt_isroot (new)) + space = ntfs_dt_root_freespace (new); else - space = ntfs_dt_freespace_alloc (new); + space = ntfs_dt_alloc_freespace (new); // XXX if this is an index root, it'll go badly wrong // restrict to allocs only? @@ -2057,7 +2065,7 @@ static int ntfs_dt_transfer (struct ntfs memset (dst, 0, len); new->child_count += count; - if (!ntfs_dt_alloc_children2 (new, new->child_count)) + if (!ntfs_dt_create_children2 (new, new->child_count)) return -1; src = (u8*) &old->sub_nodes[start+count-1]; @@ -2073,7 +2081,7 @@ static int ntfs_dt_transfer (struct ntfs memmove (dst, src, len); old->child_count -= count; - if (!ntfs_dt_alloc_children2 (old, old->child_count)) + if (!ntfs_dt_create_children2 (old, old->child_count)) return -1; src = (u8*) new->children[0]; @@ -2468,7 +2476,7 @@ static int ntfs_mft_add_index (struct nt if (!buffer) return 1; - dt = ntfs_dt_alloc (dir, dir->index, -1); + dt = ntfs_dt_create (dir, dir->index, -1); if (!dt) return 1; @@ -2478,7 +2486,7 @@ static int ntfs_mft_add_index (struct nt ie = ntfs_ie_set_vcn (ie, dt->vcn); // can't replace ie yet, there may not be room - free (ie); + ntfs_ie_free (ie); //ntfs_dt_transfer (dir->index, dt, 0, 7); @@ -2526,6 +2534,7 @@ static int ntfs_mft_add_index (struct nt return 0; } + /** * ntfs_dt_root_replace */ @@ -2759,7 +2768,7 @@ static BOOL ntfs_dt_root_remove (struct for (i = del_num; i < del->child_count; i++) del->children[i] = (INDEX_ENTRY*) ((u8*) del->children[i] - del_len); - if (!ntfs_dt_alloc_children2 (del, del->child_count)) + if (!ntfs_dt_create_children2 (del, del->child_count)) return FALSE; #if 0 @@ -2874,7 +2883,7 @@ static BOOL ntfs_dt_alloc_remove (struct for (i = del_num; i < del->child_count; i++) del->children[i] = (INDEX_ENTRY*) ((u8*) del->children[i] - del_ie->length); - if (!ntfs_dt_alloc_children2 (del, del->child_count)) + if (!ntfs_dt_create_children2 (del, del->child_count)) return FALSE; //utils_dump_mem (del->data, 0, del->data_len, DM_DEFAULTS); @@ -2912,154 +2921,9 @@ static BOOL ntfs_dt_alloc_remove (struct } /** - * ntfs_dt_root_add - */ -static int ntfs_dt_root_add (struct ntfs_dt *add, INDEX_ENTRY *add_ie) -{ - FILE_NAME_ATTR *file; - struct ntfs_dt *suc; - int suc_num; - int need; - int space; - u8 *src; - u8 *dst; - int len; - u8 *new_data = NULL; - int i; - - if (!add || !add_ie) - return -1; - - need = add_ie->length; - space = ntfs_mft_free_space (add->dir); - - printf ("need %d, have %d\n", need, space); - if (need > space) { - printf ("no room\n"); - return -1; - } - - new_data = realloc (add->data, add->data_len + need); - if (!new_data) { - return -1; - } - - memset (new_data + add->data_len, 0, need); - - for (i = 0; i < add->child_count; i++) - add->children[i] = (INDEX_ENTRY*) ((long)add->children[i] + (long)new_data - (long)add->data); // rebase the children - - add->data = new_data; - new_data = NULL; - - file = &add_ie->key.file_name; - - suc = ntfs_dt_find3 (add, file->file_name, file->file_name_length, &suc_num); - if (!suc) - return -1; - - // hmm, suc == add (i.e. entry already exists) - - src = (u8*) suc->children[suc_num]; - dst = src + need; - len = ((add->data + add->data_len) - src); - - memmove (dst, src, len); - - dst = src; - src = (u8*) add_ie; - len = add_ie->length; - - memcpy (dst, src, len); - - add->data_len += need; - add->header = (INDEX_HEADER*) (add->data + 0x10); - add->header->index_length = add->data_len - 16; - add->header->allocated_size = add->data_len - 16; - - ntfs_mft_resize_resident (add->dir->inode, AT_INDEX_ROOT, I30, 4, add->data, add->data_len); - - //utils_dump_mem (add->data, 0, add->data_len, DM_DEFAULTS); - //printf ("\n"); - - add->changed = TRUE; - - printf (GREEN "Modified: inode %lld, $INDEX_ROOT\n" END, add->dir->inode->mft_no); - return suc_num; -} - -/** * ntfs_dt_alloc_add */ -static int ntfs_dt_alloc_add (struct ntfs_dt *add, INDEX_ENTRY *add_ie) -{ - FILE_NAME_ATTR *file; - struct ntfs_dt *suc_dt; - int suc_num; - int need; - int space; - u8 *src; - u8 *dst; - int len; - - if (!add || !add_ie) - return 0; - - need = add_ie->length; - space = add->data_len - add->header->index_length - 24; - - file = &add_ie->key.file_name; - - suc_dt = ntfs_dt_find3 (add, file->file_name, file->file_name_length, &suc_num); - if (!suc_dt) - return 0; - - // hmm, suc_dt == add - - printf ("need %d, have %d\n", need, space); - if (need > space) { - printf ("no room"); - return 0; - } - - //utils_dump_mem (add->data, 0, add->data_len, DM_DEFAULTS); - //printf ("\n"); - - src = (u8*) suc_dt->children[suc_num]; - dst = src + need; - len = add->data + add->data_len - src - space; - //printf ("src = %d\n", src - add->data); - //printf ("dst = %d\n", dst - add->data); - //printf ("len = %d\n", len); - - memmove (dst, src, len); - - dst = src; - src = (u8*) add_ie; - len = need; - - memcpy (dst, src, len); - - add->header->index_length += len; - - dst = add->data + add->header->index_length + 24; - len = add->data_len - add->header->index_length - 24; - - memset (dst, 0, len); - - //utils_dump_mem (add->data, 0, add->data_len, DM_DEFAULTS); - //printf ("\n"); - - add->changed = TRUE; - - printf (GREEN "Modified: inode %lld, $INDEX_ALLOCATION vcn %lld-%lld\n" END, add->dir->inode->mft_no, add->vcn, add->vcn + (add->dir->index_size>>9) - 1); - return 0; -} - -/** - * ntfs_dt_add_alloc - */ -static int ntfs_dt_add_alloc (struct ntfs_dt *parent, int index_num, INDEX_ENTRY *ie, struct ntfs_dt *child) +static int ntfs_dt_alloc_add (struct ntfs_dt *parent, int index_num, INDEX_ENTRY *ie, struct ntfs_dt *child) { INDEX_BLOCK *block; INDEX_ENTRY *entry; @@ -3109,7 +2973,7 @@ static int ntfs_dt_add_alloc (struct ntf memset (dst, 0, len); //realloc children, sub_nodes - ntfs_dt_alloc_children2 (parent, parent->child_count + 1); + ntfs_dt_create_children2 (parent, parent->child_count + 1); // regen children pointers parent->child_count = 0; @@ -3145,9 +3009,9 @@ static int ntfs_dt_add_alloc (struct ntf } /** - * ntfs_dt_add_root + * ntfs_dt_root_add */ -static int ntfs_dt_add_root (struct ntfs_dt *parent, int index_num, INDEX_ENTRY *ie, struct ntfs_dt *child) +static int ntfs_dt_root_add (struct ntfs_dt *parent, int index_num, INDEX_ENTRY *ie, struct ntfs_dt *child) { INDEX_ROOT *root; INDEX_ENTRY *entry; @@ -3209,7 +3073,7 @@ static int ntfs_dt_add_root (struct ntfs ntfs_mft_resize_resident (parent->dir->inode, AT_INDEX_ROOT, I30, 4, parent->data, parent->data_len); //realloc children, sub_nodes - ntfs_dt_alloc_children2 (parent, parent->child_count + 1); + ntfs_dt_create_children2 (parent, parent->child_count + 1); // regen children pointers parent->child_count = 0; @@ -3283,19 +3147,19 @@ ascend: */ need = ie->length; - if (ntfs_dt_root (suc)) - space = ntfs_dt_freespace_root (suc); + if (ntfs_dt_isroot (suc)) + space = ntfs_dt_root_freespace (suc); else - space = ntfs_dt_freespace_alloc (suc); + space = ntfs_dt_alloc_freespace (suc); printf ("\tneed %d\n", need); printf ("\tspace %d\n", space); if (space >= need) { - if (ntfs_dt_root (suc)) - ntfs_dt_add_root (suc, suc_num, ie, chl); + if (ntfs_dt_isroot (suc)) + ntfs_dt_root_add (suc, suc_num, ie, chl); else - ntfs_dt_add_alloc (suc, suc_num, ie, chl); + ntfs_dt_alloc_add (suc, suc_num, ie, chl); goto done; } @@ -3347,7 +3211,7 @@ ascend: med_ie = ntfs_ie_copy (suc->children[median]); //file = &med_ie->key.file_name; printf ("\tmed name: "); ntfs_name_print (file->file_name, file->file_name_length); printf ("\n"); - free (med_ie); + ntfs_ie_free (med_ie); med_ie = NULL; //printf ("suc key count = %d\n", suc->child_count); @@ -3367,7 +3231,7 @@ ascend: //file = &suc->children[0]->key.file_name; printf ("\tmed name: "); ntfs_name_print (file->file_name, file->file_name_length); printf ("\n"); // can this be a root node? - if (ntfs_dt_root (suc)) + if (ntfs_dt_isroot (suc)) ntfs_dt_root_remove (suc, 0); else ntfs_dt_alloc_remove (suc, 0); @@ -3502,7 +3366,7 @@ static int ntfs_dir_truncate (ntfs_volum //utils_dump_mem (dir->index->data, 0, dir->index->data_len, DM_DEFAULTS); printf ("\n"); //printf ("root dt %d, vcn = %lld\n", dir->index->changed, dir->index->vcn); - free (ie); + ntfs_ie_free (ie); ie = NULL; //index flags remove LARGE_INDEX @@ -3650,9 +3514,9 @@ static void ntfs_dir_free (struct ntfs_d } /** - * ntfs_dir_alloc + * ntfs_dir_create */ -static struct ntfs_dir * ntfs_dir_alloc (ntfs_volume *vol, MFT_REF mft_num) +static struct ntfs_dir * ntfs_dir_create (ntfs_volume *vol, MFT_REF mft_num) { struct ntfs_dir *dir = NULL; ntfs_inode *inode = NULL; @@ -3663,7 +3527,7 @@ static struct ntfs_dir * ntfs_dir_alloc if (!vol) return NULL; - //printf ("ntfs_dir_alloc %lld\n", MREF (mft_num)); + //printf ("ntfs_dir_create %lld\n", MREF (mft_num)); inode = ntfs_inode_open2 (vol, mft_num); if (!inode) return NULL; @@ -3693,7 +3557,7 @@ static struct ntfs_dir * ntfs_dir_alloc dir->mft_num = mft_num; // This may not exist - dir->bitmap = ntfs_bmp_alloc (inode, AT_BITMAP, I30, 4); + dir->bitmap = ntfs_bmp_create (inode, AT_BITMAP, I30, 4); if (dir->iroot) { rec = find_first_attribute (AT_INDEX_ROOT, inode->mrec); @@ -3771,11 +3635,11 @@ static struct ntfs_dir * ntfs_dir_find2 mft_num = ie->indexed_file; - child = ntfs_dir_alloc (dir->vol, mft_num); + child = ntfs_dir_create (dir->vol, mft_num); if (!child) return NULL; - child->index = ntfs_dt_alloc (child, NULL, -1); + child->index = ntfs_dt_create (child, NULL, -1); ntfs_dir_add (dir, child); @@ -3813,7 +3677,7 @@ static int ntfs_dir_map (ntfs_volume *vo //dt->data = malloc (dt->data_len); //ntfs_attr_pread (dir->iroot, 0, dt->data_len, dt->data); - //ntfs_dt_count_root (dt); + //ntfs_dt_root_count (dt); return 0; } @@ -3948,14 +3812,14 @@ static ntfs_volume * utils_mount_volume2 vol->mft_ni ->private_data = NULL; vol->mftmirr_ni->private_data = NULL; - dir = ntfs_dir_alloc (vol, FILE_root); + dir = ntfs_dir_create (vol, FILE_root); if (!dir) { ntfs_umount2 (vol, FALSE); vol = NULL; goto done; } - dir->index = ntfs_dt_alloc (dir, NULL, -1); + dir->index = ntfs_dt_create (dir, NULL, -1); root = dir->index; @@ -4013,8 +3877,8 @@ static ntfs_volume * utils_mount_volume2 dir->inode->private_data = found; dir->inode->ref_count = 2; - vol->private_bmp1 = ntfs_bmp_alloc (vol->mft_ni, AT_BITMAP, NULL, 0); - vol->private_bmp2 = ntfs_bmp_alloc (vol->lcnbmp_ni, AT_DATA, NULL, 0); + vol->private_bmp1 = ntfs_bmp_create (vol->mft_ni, AT_BITMAP, NULL, 0); + vol->private_bmp2 = ntfs_bmp_create (vol->lcnbmp_ni, AT_DATA, NULL, 0); if (!vol->private_bmp1 || !vol->private_bmp2) { printf ("can't find the bitmaps\n"); @@ -4103,10 +3967,10 @@ static BOOL utils_pathname_to_inode2 (nt //printf ("dt's flags = 0x%08x\n", dt->children[dt_num]->key.file_name.file_attributes); if (dt->children[dt_num]->key.file_name.file_attributes == FILE_ATTR_DUP_FILE_NAME_INDEX_PRESENT) { //printf ("DIR\n"); - child = ntfs_dir_alloc (dir->vol, dt->children[dt_num]->indexed_file); + child = ntfs_dir_create (dir->vol, dt->children[dt_num]->indexed_file); //printf ("child = %p (%lld)\n", child, MREF (dt->children[dt_num]->indexed_file)); if (child) { - child->index = ntfs_dt_alloc (child, NULL, -1); + child->index = ntfs_dt_create (child, NULL, -1); ntfs_dir_add (dir, child); } @@ -4349,14 +4213,14 @@ static int ntfs_file_remove (ntfs_volume file = &suc_ie->key.file_name; printf ("\tsuc name: "); ntfs_name_print (file->file_name, file->file_name_length); printf ("\n"); //utils_dump_mem (del->data, 0, del->data_len, DM_BLUE|DM_GREEN|DM_INDENT); - if (ntfs_dt_root (del)) + if (ntfs_dt_isroot (del)) res = ntfs_dt_root_replace (del, del_num, del_ie, suc_ie); else res = ntfs_dt_alloc_replace (del, del_num, del_ie, suc_ie); //printf ("\n"); //utils_dump_mem (del->data, 0, del->data_len, DM_BLUE|DM_GREEN|DM_INDENT); - free (suc_ie); + ntfs_ie_free (suc_ie); if (res == FALSE) goto done; @@ -4381,7 +4245,7 @@ static int ntfs_file_remove (ntfs_volume //utils_dump_mem (del->data, 0, del->header->index_length+24, DM_BLUE|DM_GREEN|DM_INDENT); // XXX if del->child_count == 2, we could skip this step // no, if we combine with another node, we'll have to remember - if (ntfs_dt_root (del)) + if (ntfs_dt_isroot (del)) ntfs_dt_root_remove (del, del_num); else ntfs_dt_alloc_remove (del, del_num); @@ -4477,7 +4341,7 @@ static int ntfs_file_remove (ntfs_volume par_num--; - if (ntfs_dt_root (par)) + if (ntfs_dt_isroot (par)) printf (GREEN "Modified: inode %lld, $INDEX_ROOT\n" END, par->dir->inode->mft_no); else printf (GREEN "Modified: inode %lld, $INDEX_ALLOCATION vcn %lld-%lld\n" END, par->dir->inode->mft_no, par->vcn, par->vcn + (par->dir->index_size>>9) - 1); @@ -4516,7 +4380,7 @@ static int ntfs_file_remove (ntfs_volume #if 1 //printf ("PAR: %p,%d\n", par, par_num); - if (ntfs_dt_root (par)) + if (ntfs_dt_isroot (par)) ntfs_dt_root_remove (par, par_num); else ntfs_dt_alloc_remove (par, par_num); @@ -4763,7 +4627,7 @@ static int ntfs_file_add2 (ntfs_volume * close: free (buffer); ntfs_inode_close2 (ino); - free (ie); + ntfs_ie_free (ie); free (uname); ntfs_inode_close2 (find.inode); return 0; @@ -4897,8 +4761,6 @@ done: if (1) ntfs_umount2 (vol, FALSE); if (0) ntfs_binary_print (0, FALSE, FALSE); - if (0) ntfs_dt_root_add (NULL, NULL); - if (0) ntfs_dt_alloc_add (NULL, NULL); if (0) utils_pathname_to_inode2 (NULL, NULL, NULL, NULL); if (0) ntfs_dir_map (NULL, NULL); |
|
From: Richard R. <fl...@us...> - 2005-08-17 14:33:29
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30582 Modified Files: ntfsrm.c Log Message: create an index alloc (needs work) Index: ntfsrm.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsrm.c,v retrieving revision 1.56 retrieving revision 1.57 diff -u -p -r1.56 -r1.57 --- ntfsrm.c 16 Aug 2005 13:33:12 -0000 1.56 +++ ntfsrm.c 17 Aug 2005 14:33:16 -0000 1.57 @@ -43,7 +43,7 @@ GEN_PRINTF (Eprintf, stderr, NULL, GEN_PRINTF (Vprintf, stdout, &opts.verbose, TRUE) GEN_PRINTF (Qprintf, stdout, &opts.quiet, FALSE) -//#define RM_WRITE 1 +#define RM_WRITE 1 /** * version - Print version information about the program @@ -426,6 +426,46 @@ static int ntfs_inode_close2 (ntfs_inode return ntfs_inode_close (ni); } +/** + * utils_index_init + */ +static int utils_index_init (ntfs_volume *vol, u8 *buffer, int size) +{ + INDEX_ALLOCATION *alloc; + INDEX_ENTRY_HEADER *header; + + if (!vol) + return 1; + if (!buffer) + return 1; + if (size < 512) + return 1; + + memset (buffer, 0, size); + + alloc = (INDEX_ALLOCATION*) buffer; + + alloc->magic = magic_INDX; + alloc->usa_ofs = 0x28; + alloc->usa_count = (size >> vol->sector_size_bits) + 1; + alloc->lsn = 0; + alloc->index_block_vcn = 0; + + alloc->index.entries_offset = 0x40; + alloc->index.index_length = 0x10; + alloc->index.allocated_size = size - 0x18; + alloc->index.flags = 0; + + header = (INDEX_ENTRY_HEADER*) (buffer + 0x40); + + header->indexed_file = 0; + header->length = 0x10; + header->key_length = 0; + header->flags = INDEX_ENTRY_END; + + return 0; +} + /** * ntfs_bmp_rollback @@ -778,6 +818,26 @@ static s64 ntfs_bmp_find_last_set (struc return -1; } +/** + * ntfs_bmp_find_space + */ +static int ntfs_bmp_find_space (struct ntfs_bmp *bmp, LCN start, long size) +{ + if (!bmp) + return 0; + + start = 0; + size = 0; + + /* + bmp find space - uncached bmp's + $Bitmap/$DATA free space on volume + dir/$BITMAP free index record + $MFT/$BITMAP free record in mft + */ + return 0; +} + /** * ntfs_ie_get_vcn @@ -1252,9 +1312,9 @@ static BOOL ntfs_dt_alloc_children2 (str if (!dt->children || !dt->sub_nodes || !dt->inodes) return FALSE; // dt->child_count = -1 ? - memset ((u8*)dt->children + old, 0, (new - old) * sizeof (*dt->children)); - memset ((u8*)dt->sub_nodes + old, 0, (new - old) * sizeof (*dt->sub_nodes)); - memset ((u8*)dt->inodes + old, 0, (new - old) * sizeof (*dt->inodes)); + memset ((u8*)dt->children + old, 0, (new - old) * sizeof (*dt->children)); + memset ((u8*)dt->sub_nodes + old, 0, (new - old) * sizeof (*dt->sub_nodes)); + memset ((u8*)dt->inodes + old, 0, (new - old) * sizeof (*dt->inodes)); return (dt->children && dt->sub_nodes && dt->inodes); } @@ -1411,8 +1471,14 @@ static struct ntfs_dt * ntfs_dt_alloc (s dt->data_len = dt->dir->index_size; //printf ("parent size = %d\n", dt->data_len); dt->data = malloc (dt->data_len); - //printf ("%lld\n", ntfs_attr_mst_pread (dir->ialloc, vcn*512, 1, dt->data_len, dt->data)); - ntfs_attr_mst_pread (dir->ialloc, vcn*512, 1, dt->data_len, dt->data); + + if (vcn >= 0) { + //printf ("%lld\n", ntfs_attr_mst_pread (dir->ialloc, vcn*512, 1, dt->data_len, dt->data)); + ntfs_attr_mst_pread (dir->ialloc, vcn*512, 1, dt->data_len, dt->data); + } else { + utils_index_init (dir->vol, dt->data, dt->data_len); + } + //utils_dump_mem (dt->data, 0, dt->data_len, DM_DEFAULTS); //printf ("\n"); @@ -2104,7 +2170,6 @@ static int utils_free_non_residents2 (nt return 0; } - /** * utils_mftrec_mark_free6 */ @@ -2122,19 +2187,10 @@ static int utils_mftrec_set_inuse6 (ntfs // XXX extent inodes? - if (inuse) { - if ((rec->flags & MFT_RECORD_IN_USE) == 1) { - Eprintf ("MFT record is already in use.\n"); - return -1; - } + if (inuse) rec->flags |= MFT_RECORD_IN_USE; - } else { - if ((rec->flags & MFT_RECORD_IN_USE) == 0) { - Eprintf ("MFT record isn't in use.\n"); - return -1; - } + else rec->flags &= ~MFT_RECORD_IN_USE; - } // XXX inc sequence number @@ -2227,6 +2283,11 @@ static ATTR_RECORD * ntfs_mft_add_attr ( if (!mrec) return NULL; + if ((mrec->bytes_in_use + attr_size + 0x18) > mrec->bytes_allocated) { + printf ("attribute is too big to fit in the record\n"); + return NULL; + } + ptr = (u8*) inode->mrec + mrec->attrs_offset; while (1) { attr = (ATTR_RECORD*) ptr; @@ -2379,6 +2440,91 @@ static int ntfs_mft_free_space (struct n return res; } +/** + * ntfs_mft_add_index + */ +static int ntfs_mft_add_index (struct ntfs_dir *dir) +{ + ntfs_volume *vol; + u8 *buffer = NULL; + ATTR_RECORD *attr = NULL; + struct ntfs_dt *dt = NULL; + INDEX_ENTRY *ie = NULL; + + if (!dir) + return 1; + if (dir->bitmap && dir->ialloc) + return 0; + if (dir->bitmap || dir->ialloc) + return 1; + if (dir->index_size < 512) + return 1; + + vol = dir->vol; + printf ("add two attrs to " YELLOW); ntfs_name_print (dir->name, dir->name_len); printf (END "\n"); + printf ("index size = %d\n", dir->index_size); + + buffer = malloc (dir->index_size); + if (!buffer) + return 1; + + dt = ntfs_dt_alloc (dir, dir->index, -1); + if (!dt) + return 1; + + dt->vcn = 0; // New alloc record + + ie = ntfs_ie_copy (dir->index->children[dir->index->child_count-1]); + ie = ntfs_ie_set_vcn (ie, dt->vcn); + + // can't replace ie yet, there may not be room + free (ie); + + //ntfs_dt_transfer (dir->index, dt, 0, 7); + + printf ("root has %d children\n", dir->index->child_count); + printf ("node has %d children\n", dt->child_count); + + ntfs_dt_free (dt); + //utils_index_init (vol, buffer, dir->index_size); + + // create a new dt + // attach dt to dir + // move entries into alloc + // shrink root + + // transfer keys to new node + // hook up root & alloc dts + + // need disk allocation before here + + // Index Allocation + memset (buffer, 0, 128); + attr = ntfs_mft_add_attr (dir->inode, AT_INDEX_ALLOCATION, buffer, 0x48); + + // Bitmap + memset (buffer, 0, 8); + buffer[0] = 0x01; + //printf ("inode = %p\n", dir->inode); + attr = ntfs_mft_add_attr (dir->inode, AT_BITMAP, buffer, 8); + + // attach alloc and bitmap to dir + // need to create ntfs_attr's for them + + // one indx record + // 8 bits of bitmap + + if (0) ntfs_bmp_find_space (NULL, 0, 0); + + //printf ("m1 = %lld\n", vol->mft_zone_start); + //printf ("m2 = %lld\n", vol->mft_zone_end); + //printf ("m3 = %lld\n", vol->mft_zone_pos); + //printf ("z1 = %lld\n", vol->data1_zone_pos); + //printf ("z2 = %lld\n", vol->data2_zone_pos); + + free (buffer); + return 0; +} /** * ntfs_dt_root_replace @@ -2789,7 +2935,7 @@ static int ntfs_dt_root_add (struct ntfs printf ("need %d, have %d\n", need, space); if (need > space) { - printf ("no room"); + printf ("no room\n"); return -1; } @@ -2802,7 +2948,7 @@ static int ntfs_dt_root_add (struct ntfs for (i = 0; i < add->child_count; i++) add->children[i] = (INDEX_ENTRY*) ((long)add->children[i] + (long)new_data - (long)add->data); // rebase the children - + add->data = new_data; new_data = NULL; @@ -3106,8 +3252,8 @@ static int ntfs_dt_add2 (INDEX_ENTRY *ie int median; struct ntfs_dt *new = NULL; struct ntfs_dt *chl; - INDEX_ENTRY *med_ie; - FILE_NAME_ATTR *file; + INDEX_ENTRY *med_ie = NULL; + //FILE_NAME_ATTR *file; VCN vcn = 0; //int i; @@ -3165,6 +3311,7 @@ ascend: ded = ded->sub_nodes[0]; printf ("\treusing vcn %lld\n", new->vcn); } else { + ntfs_mft_add_index (suc->dir); /* * ALLOC * any unused records? @@ -3190,7 +3337,7 @@ ascend: */ } - printf ("\tnode has %d children\n", suc->child_count); + //printf ("\tnode has %d children\n", suc->child_count); // initialise new node ntfs_dt_initialise (new, vcn); @@ -3198,7 +3345,10 @@ ascend: // find median key median = (suc->child_count+1) / 2; med_ie = ntfs_ie_copy (suc->children[median]); - file = &med_ie->key.file_name; printf ("\tmed name: "); ntfs_name_print (file->file_name, file->file_name_length); printf ("\n"); + //file = &med_ie->key.file_name; printf ("\tmed name: "); ntfs_name_print (file->file_name, file->file_name_length); printf ("\n"); + + free (med_ie); + med_ie = NULL; //printf ("suc key count = %d\n", suc->child_count); //printf ("new key count = %d\n", new->child_count); @@ -3545,11 +3695,12 @@ static struct ntfs_dir * ntfs_dir_alloc // This may not exist dir->bitmap = ntfs_bmp_alloc (inode, AT_BITMAP, I30, 4); - if (dir->ialloc) { + if (dir->iroot) { rec = find_first_attribute (AT_INDEX_ROOT, inode->mrec); ir = (INDEX_ROOT*) ((u8*)rec + rec->value_offset); dir->index_size = ir->index_block_size; } else { + // XXX !iroot? dir->index_size = 0; } @@ -4481,9 +4632,11 @@ static int ntfs_file_add2 (ntfs_volume * s64 now = 0; struct ntfs_dir *dir; struct ntfs_dt *dt; - int dt_index = 0; + //int dt_index = 0; int data_len = 0; ATTR_RECORD *attr; + struct ntfs_dt *suc = NULL; + int suc_num = 0; new_num = utils_mft_find_free_entry (vol); if (new_num == (MFT_REF) -1) @@ -4531,6 +4684,7 @@ static int ntfs_file_add2 (ntfs_volume * ino->mrec->link_count = 1; ino->mrec->base_mft_record = 0; ino->mrec->next_attr_instance = 0; + ino->mrec->flags = MFT_RECORD_IN_USE; utils_mftrec_set_inuse6 (ino, vol->private_bmp1, TRUE); @@ -4594,9 +4748,17 @@ static int ntfs_file_add2 (ntfs_volume * dir = dt->dir->children[0]; dt = dir->index; + suc = ntfs_dt_find3 (dt, uname, uname_len, &suc_num); + + ntfs_dt_add2 (ie, suc, suc_num, NULL); + + /* dt_index = ntfs_dt_root_add (dt, ie); - dt->inodes[dt_index] = ino; - ino->ref_count++; + if (dt_index >= 0) { + dt->inodes[dt_index] = ino; + ino->ref_count++; + } + */ close: free (buffer); |
|
From: Richard R. <fl...@us...> - 2005-08-16 13:33:21
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16440 Modified Files: ntfsrm.c Log Message: fix up dt root add Index: ntfsrm.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsrm.c,v retrieving revision 1.55 retrieving revision 1.56 diff -u -p -r1.55 -r1.56 --- ntfsrm.c 16 Aug 2005 13:25:15 -0000 1.55 +++ ntfsrm.c 16 Aug 2005 13:33:12 -0000 1.56 @@ -1218,6 +1218,7 @@ static int ntfs_dt_commit (struct ntfs_d for (i = 0; i < dt->child_count; i++) { if ((dt->inodes[i]) && (NInoDirty (dt->inodes[i]))) { + //utils_dump_mem (dt->inodes[i]->mrec, 0, vol->mft_record_size, DM_DEFAULTS); #ifdef RM_WRITE ntfs_inode_sync (dt->inodes[i]); #endif @@ -2774,58 +2775,58 @@ static int ntfs_dt_root_add (struct ntfs int suc_num; int need; int space; - u8 *attr; u8 *src; u8 *dst; int len; + u8 *new_data = NULL; + int i; if (!add || !add_ie) - return 0; - - //utils_dump_mem (add->data, 0, add->data_len, DM_DEFAULTS); - //printf ("\n"); + return -1; need = add_ie->length; space = ntfs_mft_free_space (add->dir); - file = &add_ie->key.file_name; - - suc = ntfs_dt_find3 (add, file->file_name, file->file_name_length, &suc_num); - if (!suc) - return 0; - - // hmm, suc == add - - //printf ("need %d, have %d\n", need, space); + printf ("need %d, have %d\n", need, space); if (need > space) { printf ("no room"); - return 0; + return -1; } - attr = malloc (add->data_len + need); + new_data = realloc (add->data, add->data_len + need); + if (!new_data) { + return -1; + } - src = add->data; - dst = attr; - len = add->header->entries_offset + 16; + memset (new_data + add->data_len, 0, need); - memcpy (dst, src, len); + for (i = 0; i < add->child_count; i++) + add->children[i] = (INDEX_ENTRY*) ((long)add->children[i] + (long)new_data - (long)add->data); // rebase the children + + add->data = new_data; + new_data = NULL; - dst += len; - src = (u8*) add_ie; - len = add_ie->length; + file = &add_ie->key.file_name; - memcpy (dst, src, len); + suc = ntfs_dt_find3 (add, file->file_name, file->file_name_length, &suc_num); + if (!suc) + return -1; + + // hmm, suc == add (i.e. entry already exists) - dst += len; src = (u8*) suc->children[suc_num]; - len = add->data + add->data_len - src; + dst = src + need; + len = ((add->data + add->data_len) - src); + + memmove (dst, src, len); + + dst = src; + src = (u8*) add_ie; + len = add_ie->length; memcpy (dst, src, len); - free (add->data); - add->data = attr; add->data_len += need; - add->header = (INDEX_HEADER*) (add->data + 0x10); add->header->index_length = add->data_len - 16; add->header->allocated_size = add->data_len - 16; @@ -2838,7 +2839,7 @@ static int ntfs_dt_root_add (struct ntfs add->changed = TRUE; printf (GREEN "Modified: inode %lld, $INDEX_ROOT\n" END, add->dir->inode->mft_no); - return 0; + return suc_num; } /** @@ -4480,6 +4481,7 @@ static int ntfs_file_add2 (ntfs_volume * s64 now = 0; struct ntfs_dir *dir; struct ntfs_dt *dt; + int dt_index = 0; int data_len = 0; ATTR_RECORD *attr; @@ -4494,7 +4496,7 @@ static int ntfs_file_add2 (ntfs_volume * filename = ptr + 1; } - //printf ("looking for %s\n", dirname); + printf ("looking for %s\n", dirname); if (utils_pathname_to_inode2 (vol, NULL, dirname, &find) == FALSE) { printf ("!inode\n"); return 0; @@ -4507,7 +4509,7 @@ static int ntfs_file_add2 (ntfs_volume * if (uname_len < 0) goto close; - //printf ("new inode %lld\n", new_num); + printf ("new inode %lld\n", new_num); ino = ntfs_inode_open3 (vol, new_num); if (!ino) { printf ("!ino\n"); @@ -4542,6 +4544,10 @@ static int ntfs_file_add2 (ntfs_volume * *(u64*)(buffer + 0x08) = now; // Time *(u64*)(buffer + 0x10) = now; // Time *(u64*)(buffer + 0x18) = now; // Time + ino->creation_time = time (NULL); + ino->last_data_change_time = time (NULL); + ino->last_mft_change_time = time (NULL); + ino->last_access_time = time (NULL); attr = ntfs_mft_add_attr (ino, AT_STANDARD_INFORMATION, buffer, 0x48); // Data @@ -4588,9 +4594,9 @@ static int ntfs_file_add2 (ntfs_volume * dir = dt->dir->children[0]; dt = dir->index; - ntfs_dt_root_add (dt, ie); + dt_index = ntfs_dt_root_add (dt, ie); + dt->inodes[dt_index] = ino; ino->ref_count++; - dt->inodes[0] = ino; close: free (buffer); |
|
From: Richard R. <fl...@us...> - 2005-08-16 13:25:26
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13290 Modified Files: ntfsrm.c utils.c utils.h Log Message: change utils_dump_mem to take a void ptr update the comments a bit Index: ntfsrm.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsrm.c,v retrieving revision 1.54 retrieving revision 1.55 diff -u -p -r1.54 -r1.55 --- ntfsrm.c 14 Aug 2005 22:22:06 -0000 1.54 +++ ntfsrm.c 16 Aug 2005 13:25:15 -0000 1.55 @@ -802,7 +802,7 @@ static void ntfs_ie_dump (INDEX_ENTRY *i printf ("________________________________________________"); printf ("\n"); - utils_dump_mem ((u8*)ie, 0, ie->length, DM_DEFAULTS); + utils_dump_mem (ie, 0, ie->length, DM_DEFAULTS); printf ("MFT Ref: 0x%llx\n", ie->indexed_file); printf ("length: %d\n", ie->length); @@ -1429,7 +1429,7 @@ static struct ntfs_dt * ntfs_dt_alloc (s printf ("IE (%d)\n", ie->length); else printf ("IE %lld (%d)\n", MREF (ie->key.file_name.parent_directory), ie->length); - utils_dump_mem ((u8*)ie, 0, ie->length, DM_DEFAULTS); + utils_dump_mem (ie, 0, ie->length, DM_DEFAULTS); printf ("\n"); } #endif @@ -1460,7 +1460,7 @@ static struct ntfs_dt * ntfs_dt_alloc (s printf ("IE (%d)\n", ie->length); else printf ("IE %lld (%d)\n", MREF (ie->key.file_name.parent_directory), ie->length); - utils_dump_mem ((u8*)ie, 0, ie->length, DM_DEFAULTS); + utils_dump_mem (ie, 0, ie->length, DM_DEFAULTS); printf ("\n"); } #endif @@ -2174,9 +2174,9 @@ static int ntfs_mft_remove_attr (struct // inode->mrec mft = inode->mrec; - //utils_dump_mem ((u8*)mft, 0, mft->bytes_in_use, DM_DEFAULTS); printf ("\n"); + //utils_dump_mem (mft, 0, mft->bytes_in_use, DM_DEFAULTS); printf ("\n"); - //utils_dump_mem ((u8*)attrXX, 0, attrXX->length, DM_DEFAULTS); printf ("\n"); + //utils_dump_mem (attrXX, 0, attrXX->length, DM_DEFAULTS); printf ("\n"); //printf ("mrec = %p, attr = %p, diff = %d (0x%02X)\n", mft, attrXX, (u8*)attrXX - (u8*)mft, (u8*)attrXX - (u8*)mft); // memmove @@ -2196,7 +2196,7 @@ static int ntfs_mft_remove_attr (struct #endif memmove (dst, src, len); - //utils_dump_mem ((u8*)mft, 0, mft->bytes_in_use, DM_DEFAULTS); printf ("\n"); + //utils_dump_mem (mft, 0, mft->bytes_in_use, DM_DEFAULTS); printf ("\n"); NInoSetDirty(inode); return 0; @@ -2353,7 +2353,7 @@ static int ntfs_mft_resize_resident (ntf memset ((u8*)mrec + mrec->bytes_in_use, 0, mft_size - mrec->bytes_in_use); mft_usage += (attr_new - attr_orig); - //utils_dump_mem ((u8*) mrec, 0, mft_size, DM_DEFAULTS); + //utils_dump_mem (mrec, 0, mft_size, DM_DEFAULTS); res = 0; done: ntfs_attr_put_search_ctx (ctx); @@ -3346,7 +3346,7 @@ static int ntfs_dir_truncate (ntfs_volum } //utils_dump_mem (dir->index->data, 0, dir->index->data_len, DM_DEFAULTS); printf ("\n"); - //utils_dump_mem ((u8*)ie, 0, ie->length, DM_DEFAULTS); printf ("\n"); + //utils_dump_mem (ie, 0, ie->length, DM_DEFAULTS); printf ("\n"); ntfs_dt_root_replace (dir->index, 0, dir->index->children[0], ie); //utils_dump_mem (dir->index->data, 0, dir->index->data_len, DM_DEFAULTS); printf ("\n"); //printf ("root dt %d, vcn = %lld\n", dir->index->changed, dir->index->vcn); @@ -4159,7 +4159,7 @@ static int ntfs_file_remove (ntfs_volume //ntfs_dt_print (top, 0); del_ie = del->children[del_num]; - //utils_dump_mem ((u8*)del_ie, 0, del_ie->length, DM_DEFAULTS); + //utils_dump_mem (del_ie, 0, del_ie->length, DM_DEFAULTS); //printf ("\n"); /* @@ -4186,11 +4186,11 @@ static int ntfs_file_remove (ntfs_volume //printf ("\n"); suc_ie = ntfs_ie_copy (suc->children[suc_num]); - //utils_dump_mem ((u8*)suc_ie, 0, suc_ie->length, DM_BLUE|DM_GREEN|DM_INDENT); + //utils_dump_mem (suc_ie, 0, suc_ie->length, DM_BLUE|DM_GREEN|DM_INDENT); //printf ("\n"); suc_ie = ntfs_ie_set_vcn (suc_ie, vcn); - //utils_dump_mem ((u8*)suc_ie, 0, suc_ie->length, DM_BLUE|DM_GREEN|DM_INDENT); + //utils_dump_mem (suc_ie, 0, suc_ie->length, DM_BLUE|DM_GREEN|DM_INDENT); //printf ("\n"); file = &del_ie->key.file_name; printf ("\trep name: "); ntfs_name_print (file->file_name, file->file_name_length); printf ("\n"); @@ -4303,11 +4303,11 @@ static int ntfs_file_remove (ntfs_volume par_ie = par->children[par_num]; vcn = ntfs_ie_get_vcn (par_ie); //printf ("\toffset = %d\n", (u8*)par_ie - par->data); printf ("\tflags = %d\n", par_ie->flags); printf ("\tvcn = %lld\n", vcn); printf ("\tlength = %d\n", par_ie->length); - //utils_dump_mem ((u8*)par_ie, 0, par_ie->length, DM_DEFAULTS); + //utils_dump_mem (par_ie, 0, par_ie->length, DM_DEFAULTS); //printf ("\n"); //printf ("\toffset = %d\n", (u8*)par_ie - par->data); printf ("\tflags = %d\n", par_ie->flags); printf ("\tvcn = %lld\n", vcn); printf ("\tlength = %d\n", par_ie->length); - //utils_dump_mem ((u8*)par_ie, 0, par_ie->length, DM_DEFAULTS); + //utils_dump_mem (par_ie, 0, par_ie->length, DM_DEFAULTS); //printf ("\n"); file = &par->children[par_num] ->key.file_name; printf ("\tpar name: "); ntfs_name_print (file->file_name, file->file_name_length); printf ("\n"); @@ -4348,7 +4348,7 @@ static int ntfs_file_remove (ntfs_volume goto done; //printf ("\n"); - //utils_dump_mem ((u8*)add_ie, 0, add_ie->length, DM_BLUE|DM_GREEN|DM_INDENT); + //utils_dump_mem (add_ie, 0, add_ie->length, DM_BLUE|DM_GREEN|DM_INDENT); ded = par->sub_nodes[par_num]; par->sub_nodes[par_num] = NULL; Index: utils.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/utils.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -p -r1.40 -r1.41 --- utils.c 14 Aug 2005 15:56:31 -0000 1.40 +++ utils.c 16 Aug 2005 13:25:16 -0000 1.41 @@ -746,14 +746,19 @@ int utils_is_metadata (ntfs_inode *inode * @buf: Buffer to be displayed * @start: Offset into @buf to start from * @length: Number of bytes to display - * @ascii: Whether or not to display the ascii values + * @flags: Options to change the style of the output * * Display a block of memory in a tradition hex-dump manner. * Optionally the ascii part can be turned off. + * + * The flags, described fully in utils.h, default to 0 (DM_DEFAULTS). + * Examples are: DM_INDENT (indent the output by one tab); DM_RED (colour the + * output); DM_NO_ASCII (only print the hex values). */ -void utils_dump_mem (u8 *buf, int start, int length, int flags) +void utils_dump_mem (void *buf, int start, int length, int flags) { int off, i, s, e, col; + u8 *mem = buf; s = start & ~15; // round down e = (start + length + 15) & ~15; // round up @@ -781,7 +786,7 @@ void utils_dump_mem (u8 *buf, int start, if ((i == 8) && (!(flags & DM_NO_DIVIDER))) printf (" -"); if (((off+i) >= start) && ((off+i) < (start+length))) - printf (" %02X", buf[off+i]); + printf (" %02X", mem[off+i]); else printf (" "); } @@ -790,8 +795,8 @@ void utils_dump_mem (u8 *buf, int start, for (i = 0; i < 16; i++) { if (((off+i) < start) || ((off+i) >= (start+length))) printf (" "); - else if (isprint (buf[off + i])) - printf ("%c", buf[off + i]); + else if (isprint (mem[off + i])) + printf ("%c", mem[off + i]); else printf ("."); } Index: utils.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/utils.h,v retrieving revision 1.24 retrieving revision 1.25 diff -u -p -r1.24 -r1.25 --- utils.h 20 Jul 2005 19:06:51 -0000 1.24 +++ utils.h 16 Aug 2005 13:25:16 -0000 1.25 @@ -92,7 +92,7 @@ int utils_attr_get_name (ntfs_volume *vo int utils_cluster_in_use (ntfs_volume *vol, long long lcn); int utils_mftrec_in_use (ntfs_volume *vol, MFT_REF mref); int utils_is_metadata (ntfs_inode *inode); -void utils_dump_mem (u8 *buf, int start, int length, int ascii); +void utils_dump_mem (void *buf, int start, int length, int ascii); ATTR_RECORD * find_attribute (const ATTR_TYPES type, ntfs_attr_search_ctx *ctx); ATTR_RECORD * find_first_attribute (const ATTR_TYPES type, MFT_RECORD *mft); |
|
From: Szabolcs S. <sz...@us...> - 2005-08-15 21:44:23
|
Changes by: szaka Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15904/ntfsprogs Modified Files: ntfsresize.8.in Log Message: Articulate --bad-sectors a bit better Index: ntfsresize.8.in =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.8.in,v retrieving revision 1.23 retrieving revision 1.24 diff -u -p -r1.23 -r1.24 --- ntfsresize.8.in 5 Aug 2005 17:28:41 -0000 1.23 +++ ntfsresize.8.in 15 Aug 2005 21:44:10 -0000 1.24 @@ -156,12 +156,19 @@ displays what it would do if it were to Continue with the real resizing only if the test run passed. .TP .B -b, --bad-sectors -Support disks having physical errors, bad sectors. Make a backup by +Support disks having hardware errors, bad sectors with those +.B ntfsresize +would refuse to work by default. + +Prior using this option, it's strongly recommended to make a backup by .BR ntfsclone (8) -using option --rescue, then run from the command line 'chkdsk /f /r -volume:' on Windows prior using this option. +using the --rescue option, then running 'chkdsk /f /r volume:' on Windows +from the command line. If the disk guarantee is still valid then replace it. +It's defected. Please also note, that no software can repair these type of +hardware errors. The most what they can do is to work around the permanent +defects. -If the guarantee is still valid for the disk then replace it. It's defected. +This option doesn't have any effect if the disk is flawless. .TP .B -P, --no-progress-bar Don't show progress bars. |
|
From: Szabolcs S. <sz...@us...> - 2005-08-15 20:48:56
|
Changes by: szaka Update of /cvsroot/linux-ntfs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3668 Modified Files: ChangeLog TODO.ntfsprogs configure.ac ntfsprogs.spec.in Log Message: Hard link mkfs.ntfs and mkfs.ntfs.8 with mkntfs and mkntfs.8 Index: ChangeLog =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v retrieving revision 1.271 retrieving revision 1.272 diff -u -p -r1.271 -r1.272 --- ChangeLog 14 Aug 2005 15:44:46 -0000 1.271 +++ ChangeLog 15 Aug 2005 20:48:48 -0000 1.272 @@ -33,6 +33,7 @@ xx/xx/2005 - 1.12.0-WIP ntfs_mft_record_alloc. (Yura) - Make ntfsmount use new APIs for file and directory creation/deletion. Implement utime operation. (Yura) + - Hard link mkfs.ntfs and mkfs.ntfs.8 with mkntfs and mkntfs.8 (Szaka). 08/08/2005 - 1.11.2 - ntfsdecrypt now works and lots of fixes and improvements. Index: TODO.ntfsprogs =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/TODO.ntfsprogs,v retrieving revision 1.21 retrieving revision 1.22 diff -u -p -r1.21 -r1.22 --- TODO.ntfsprogs 25 Jul 2005 20:40:08 -0000 1.21 +++ TODO.ntfsprogs 15 Aug 2005 20:48:48 -0000 1.22 @@ -8,7 +8,6 @@ Thanks, * mkntfs * ********** -- mkntfs should be hard linked with mkfs.ntfs for the mkfs utility. - Got a report that creating a floppy with mkntfs failed. Difference between this floppy and the floppy created by the special tool found on the net was said to be that the bitmap is 256kib on the special floppy while mkntfs will Index: configure.ac =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/configure.ac,v retrieving revision 1.74 retrieving revision 1.75 diff -u -p -r1.74 -r1.75 --- configure.ac 9 Aug 2005 10:57:41 -0000 1.74 +++ configure.ac 15 Aug 2005 20:48:48 -0000 1.75 @@ -116,6 +116,7 @@ esac AC_PROG_CC AC_PROG_GCC_TRADITIONAL AC_PROG_INSTALL +AC_PATH_PROG(LN, ln, ln) AC_PROG_LN_S AC_PROG_MAKE_SET AC_PROG_LIBTOOL Index: ntfsprogs.spec.in =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs.spec.in,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- ntfsprogs.spec.in 18 Jul 2005 16:02:40 -0000 1.14 +++ ntfsprogs.spec.in 15 Aug 2005 20:48:48 -0000 1.15 @@ -90,6 +90,7 @@ rm -rf "$RPM_BUILD_ROOT" %{bindir}/ntfs[^m][^o]* %{sbindir}/* %{mandir}/man8/mkntfs.8* +%{mandir}/man8/mkfs.ntfs.8* %{mandir}/man8/ntfs[^m][^o]*.8* %{_libdir}/libntfs.*so* @@ -111,6 +112,9 @@ rm -rf "$RPM_BUILD_ROOT" %{_libdir}/gnome-vfs-2.0/modules/libntfs-gnomevfs.*a* %changelog +* Mon Aug 15 2005 Szabolcs Szakacsits <sz...@si...> +- Add mkfs.ntfs. + * Mon Jul 18 2005 Anton Altaparmakov <ai...@ca...> - Add ntfsmount fuse module in separate rpm ntfsprogs-fuse. |
|
From: Szabolcs S. <sz...@us...> - 2005-08-15 20:48:56
|
Changes by: szaka Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3668/ntfsprogs Modified Files: Makefile.am Log Message: Hard link mkfs.ntfs and mkfs.ntfs.8 with mkntfs and mkntfs.8 Index: Makefile.am =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/Makefile.am,v retrieving revision 1.44 retrieving revision 1.45 diff -u -p -r1.44 -r1.45 --- Makefile.am 5 Aug 2005 23:41:52 -0000 1.44 +++ Makefile.am 15 Aug 2005 20:48:48 -0000 1.45 @@ -134,3 +134,16 @@ libs: extra: extras extras: libs $(EXTRA_PROGRAMS) + +# mkfs.ntfs[.8] hard links + +install-exec-hook: + $(LN) -f $(DESTDIR)$(sbindir)/mkntfs $(DESTDIR)$(sbindir)/mkfs.ntfs + +install-data-hook: + $(LN) -f $(DESTDIR)$(man8dir)/mkntfs.8 $(DESTDIR)$(man8dir)/mkfs.ntfs.8 + +uninstall-local: + rm -f $(DESTDIR)$(sbindir)/mkfs.ntfs + rm -f $(DESTDIR)$(man8dir)/mkfs.ntfs.8 + |
|
From: Yura P. <cha...@us...> - 2005-08-15 00:50:27
|
Changes by: cha0smaster Update of /cvsroot/linux-ntfs/ntfsprogs/libntfs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30248/libntfs Modified Files: dir.c Log Message: Thoght that FUSE will check if directory is empty, it didn't. Add such check to ntfs_delete. Index: dir.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/dir.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -p -r1.20 -r1.21 --- dir.c 14 Aug 2005 15:44:47 -0000 1.20 +++ dir.c 15 Aug 2005 00:50:19 -0000 1.21 @@ -1271,6 +1271,25 @@ int ntfs_delete(ntfs_inode *ni, ntfs_ino ni = ni->base_ni; if (dir_ni->nr_extents == -1) dir_ni = dir_ni->base_ni; + /* If deleting directory check it to be empty. */ + if (ni->mrec->flags & MFT_RECORD_IS_DIRECTORY) { + ntfs_attr *na; + + na = ntfs_attr_open(ni, AT_INDEX_ROOT, I30, 4); + if (!na) { + ntfs_error(, "Corrupt directory or library bug."); + errno = EIO; + goto err_out; + } + if (na->data_size != sizeof(INDEX_ROOT) + + sizeof(INDEX_ENTRY_HEADER)) { + ntfs_attr_close(na); + ntfs_error(, "Directory is not empty."); + errno = ENOTEMPTY; + goto err_out; + } + ntfs_attr_close(na); + } /* * Search for FILE_NAME attribute with such name. If it's in POSIX or * WIN32_AND_DOS namespace, then simply remove it from index and inode. |
|
From: Richard R. <fl...@us...> - 2005-08-14 22:22:15
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7805 Modified Files: ntfsrm.c Log Message: tidy up complicated mft mess Index: ntfsrm.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsrm.c,v retrieving revision 1.53 retrieving revision 1.54 diff -u -p -r1.53 -r1.54 --- ntfsrm.c 14 Aug 2005 16:08:44 -0000 1.53 +++ ntfsrm.c 14 Aug 2005 22:22:06 -0000 1.54 @@ -2205,7 +2205,7 @@ static int ntfs_mft_remove_attr (struct /** * ntfs_mft_add_attr */ -static int ntfs_mft_add_attr (ntfs_inode *inode, ATTR_TYPES type, u8 *data, int data_len) +static ATTR_RECORD * ntfs_mft_add_attr (ntfs_inode *inode, ATTR_TYPES type, u8 *data, int data_len) { MFT_RECORD *mrec; ATTR_RECORD *attr; @@ -2216,15 +2216,15 @@ static int ntfs_mft_add_attr (ntfs_inode int attr_size; if (!inode) - return 1; + return NULL; if (!data) - return 1; + return NULL; attr_size = ATTR_SIZE (data_len); mrec = inode->mrec; if (!mrec) - return 1; + return NULL; ptr = (u8*) inode->mrec + mrec->attrs_offset; while (1) { @@ -2263,7 +2263,7 @@ static int ntfs_mft_add_attr (ntfs_inode mrec->next_attr_instance++; - return 0; + return attr; } /** @@ -2796,7 +2796,7 @@ static int ntfs_dt_root_add (struct ntfs // hmm, suc == add - printf ("need %d, have %d\n", need, space); + //printf ("need %d, have %d\n", need, space); if (need > space) { printf ("no room"); return 0; @@ -4481,6 +4481,7 @@ static int ntfs_file_add2 (ntfs_volume * struct ntfs_dir *dir; struct ntfs_dt *dt; int data_len = 0; + ATTR_RECORD *attr; new_num = utils_mft_find_free_entry (vol); if (new_num == (MFT_REF) -1) @@ -4493,6 +4494,7 @@ static int ntfs_file_add2 (ntfs_volume * filename = ptr + 1; } + //printf ("looking for %s\n", dirname); if (utils_pathname_to_inode2 (vol, NULL, dirname, &find) == FALSE) { printf ("!inode\n"); return 0; @@ -4505,25 +4507,6 @@ static int ntfs_file_add2 (ntfs_volume * if (uname_len < 0) goto close; - ie = ntfs_ie_create(); - ie = ntfs_ie_set_name (ie, uname, uname_len, FILE_NAME_POSIX); - if (!ie) { - printf ("!ie\n"); - goto close; - } - - // These two NEED the sequence number in the top 8 bits - ie->indexed_file = new_num; // MFT Ref: new file - ie->key.file_name.parent_directory = MK_MREF (find.mref, 2);// MFT Ref: parent dir - - now = utc2ntfs (time(NULL)); - ie->key.file_name.creation_time = now; - ie->key.file_name.last_data_change_time = now; - ie->key.file_name.last_mft_change_time = now; - ie->key.file_name.last_access_time = now; - - //ntfs_ie_dump (ie); - //printf ("new inode %lld\n", new_num); ino = ntfs_inode_open3 (vol, new_num); if (!ino) { @@ -4531,9 +4514,8 @@ static int ntfs_file_add2 (ntfs_volume * goto close; } - //printf ("attributes start at offset 0x%02X\n", ino->mrec->attrs_offset); - tmp = (u8*) ino->mrec; + now = utc2ntfs (time(NULL)); // Wipe all the attributes memset (tmp + ino->mrec->attrs_offset, 0, vol->mft_record_size - ino->mrec->attrs_offset); @@ -4550,10 +4532,6 @@ static int ntfs_file_add2 (ntfs_volume * utils_mftrec_set_inuse6 (ino, vol->private_bmp1, TRUE); - ie->indexed_file = MK_MREF (new_num, ino->mrec->sequence_number); - - //utils_dump_mem ((u8*)ino->mrec, 0, ino->mrec->bytes_in_use, DM_DEFAULTS); - buffer = malloc (128); if (!buffer) goto close; @@ -4564,18 +4542,15 @@ static int ntfs_file_add2 (ntfs_volume * *(u64*)(buffer + 0x08) = now; // Time *(u64*)(buffer + 0x10) = now; // Time *(u64*)(buffer + 0x18) = now; // Time - ntfs_mft_add_attr (ino, AT_STANDARD_INFORMATION, buffer, 0x48); - //utils_dump_mem (buffer, 0, 0x48, DM_DEFAULTS); + attr = ntfs_mft_add_attr (ino, AT_STANDARD_INFORMATION, buffer, 0x48); // Data memset (buffer, 0, 128); data_len = sprintf ((char*)buffer, "Contents of file: %s\n", filename); - ntfs_mft_add_attr (ino, AT_DATA, buffer, data_len); + attr = ntfs_mft_add_attr (ino, AT_DATA, buffer, data_len); // File name memset (buffer, 0, 128); - printf ("parent = 0x%llX\n", find.mref); - printf ("ino mref = %lld\n", ino->mft_no); *(u64*)(buffer + 0x00) = MK_MREF (find.mref, 2); // MFT Ref of parent dir *(u64*)(buffer + 0x08) = now; // Time *(u64*)(buffer + 0x10) = now; // Time @@ -4588,38 +4563,35 @@ static int ntfs_file_add2 (ntfs_volume * *(u8* )(buffer + 0x40) = uname_len; // Filename length *(u8* )(buffer + 0x41) = FILE_NAME_POSIX; // Filename namespace memcpy (buffer + 0x42, uname, uname_len * sizeof (ntfschar)); - ntfs_mft_add_attr (ino, AT_FILE_NAME, buffer, ATTR_SIZE (0x42 + (uname_len * sizeof (ntfschar)))); - //utils_dump_mem (buffer, 0, 0x50, DM_DEFAULTS); + attr = ntfs_mft_add_attr (ino, AT_FILE_NAME, buffer, ATTR_SIZE (0x42 + (uname_len * sizeof (ntfschar)))); + attr->resident_flags = RESIDENT_ATTR_IS_INDEXED; + attr->name_offset = 0x18; - //utils_dump_mem ((u8*)ino->mrec, 0, ino->mrec->bytes_in_use, DM_DEFAULTS); - - //printf ("orig inode = %p\n", find.inode); - dir = dt->dir->children[0]; - dt = dir->index; - printf ("dir = %p (%lld)\n", dir, MREF (dir->mft_num)); - printf ("dt = %p (%d)\n", dt, dt->child_count); - printf ("\n"); + ie = ntfs_ie_create(); + ie = ntfs_ie_set_name (ie, uname, uname_len, FILE_NAME_POSIX); + if (!ie) { + printf ("!ie\n"); + goto close; + } - //printf ("\n"); - //utils_dump_mem (dt->data, 0, dt->data_len, DM_DEFAULTS); - //printf ("\n"); + // These two NEED the sequence number in the top 8 bits + ie->key.file_name.parent_directory = MK_MREF (find.mref, 2);// MFT Ref: parent dir + ie->indexed_file = MK_MREF (new_num, ino->mrec->sequence_number); + ie->key.file_name.creation_time = now; + ie->key.file_name.last_data_change_time = now; + ie->key.file_name.last_mft_change_time = now; + ie->key.file_name.last_access_time = now; ie->key.file_name.allocated_size = ATTR_SIZE (data_len); ie->key.file_name.data_size = data_len; + dir = dt->dir->children[0]; + dt = dir->index; + ntfs_dt_root_add (dt, ie); ino->ref_count++; dt->inodes[0] = ino; - *(((u8*) ino->mrec) + 166) = RESIDENT_ATTR_IS_INDEXED; - *(((u8*) ino->mrec) + 154) = 0x18; // offset to name - - // add inode to dt's list - - //printf ("\n"); - //utils_dump_mem (dt->data, 0, dt->data_len, DM_DEFAULTS); - //printf ("\n"); - close: free (buffer); ntfs_inode_close2 (ino); |
|
From: Richard R. <fl...@us...> - 2005-08-14 16:08:54
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2922/ntfsprogs Modified Files: ntfsrm.c Log Message: give the new file some dummy data Index: ntfsrm.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsrm.c,v retrieving revision 1.52 retrieving revision 1.53 diff -u -p -r1.52 -r1.53 --- ntfsrm.c 14 Aug 2005 15:44:48 -0000 1.52 +++ ntfsrm.c 14 Aug 2005 16:08:44 -0000 1.53 @@ -2213,12 +2213,15 @@ static int ntfs_mft_add_attr (ntfs_inode u8 *src; u8 *dst; int len; + int attr_size; if (!inode) return 1; if (!data) return 1; + attr_size = ATTR_SIZE (data_len); + mrec = inode->mrec; if (!mrec) return 1; @@ -2237,7 +2240,7 @@ static int ntfs_mft_add_attr (ntfs_inode len = ((u8*) mrec + mrec->bytes_in_use) - ((u8*) attr); src = (u8*) attr; - dst = src + data_len + 0x18; + dst = src + attr_size + 0x18; memmove (dst, src, len); @@ -2245,13 +2248,15 @@ static int ntfs_mft_add_attr (ntfs_inode dst = (u8*) attr + 0x18; len = data_len; + // XXX wipe slack space after attr? + memcpy (dst, src, len); - mrec->bytes_in_use += data_len + 0x18; + mrec->bytes_in_use += attr_size + 0x18; memset (attr, 0, 0x18); *(u32*)((u8*) attr + 0x00) = type; - *(u32*)((u8*) attr + 0x04) = data_len + 0x18; + *(u32*)((u8*) attr + 0x04) = attr_size + 0x18; *(u16*)((u8*) attr + 0x0E) = mrec->next_attr_instance; *(u32*)((u8*) attr + 0x10) = data_len; *(u32*)((u8*) attr + 0x14) = 0x18; @@ -3235,7 +3240,7 @@ ascend: //printf ("new's vcn = %lld\n", new->vcn); // adjust parents - // attach new to median + // attach new to median // escape clause for root node? // goto ascend @@ -4475,6 +4480,7 @@ static int ntfs_file_add2 (ntfs_volume * s64 now = 0; struct ntfs_dir *dir; struct ntfs_dt *dt; + int data_len = 0; new_num = utils_mft_find_free_entry (vol); if (new_num == (MFT_REF) -1) @@ -4516,10 +4522,6 @@ static int ntfs_file_add2 (ntfs_volume * ie->key.file_name.last_mft_change_time = now; ie->key.file_name.last_access_time = now; - // Need to be filled in later - ie->key.file_name.allocated_size = 0; - ie->key.file_name.data_size = 0; - //ntfs_ie_dump (ie); //printf ("new inode %lld\n", new_num); @@ -4565,29 +4567,30 @@ static int ntfs_file_add2 (ntfs_volume * ntfs_mft_add_attr (ino, AT_STANDARD_INFORMATION, buffer, 0x48); //utils_dump_mem (buffer, 0, 0x48, DM_DEFAULTS); + // Data + memset (buffer, 0, 128); + data_len = sprintf ((char*)buffer, "Contents of file: %s\n", filename); + ntfs_mft_add_attr (ino, AT_DATA, buffer, data_len); + // File name memset (buffer, 0, 128); printf ("parent = 0x%llX\n", find.mref); printf ("ino mref = %lld\n", ino->mft_no); *(u64*)(buffer + 0x00) = MK_MREF (find.mref, 2); // MFT Ref of parent dir - *(u64*)(buffer + 0x08) = now; // Time - *(u64*)(buffer + 0x10) = now; // Time - *(u64*)(buffer + 0x18) = now; // Time - *(u64*)(buffer + 0x20) = now; // Time - *(u64*)(buffer + 0x28) = 0; // Allocated size - *(u64*)(buffer + 0x30) = 0; // Initialised size - *(u32*)(buffer + 0x38) = 0; // Flags - *(u32*)(buffer + 0x3C) = 0; // Not relevant - *(u8* )(buffer + 0x40) = uname_len; // Filename length - *(u8* )(buffer + 0x41) = FILE_NAME_POSIX;// Filename namespace + *(u64*)(buffer + 0x08) = now; // Time + *(u64*)(buffer + 0x10) = now; // Time + *(u64*)(buffer + 0x18) = now; // Time + *(u64*)(buffer + 0x20) = now; // Time + *(u64*)(buffer + 0x28) = ATTR_SIZE (data_len); // Allocated size + *(u64*)(buffer + 0x30) = data_len; // Initialised size + *(u32*)(buffer + 0x38) = 0; // Flags + *(u32*)(buffer + 0x3C) = 0; // Not relevant + *(u8* )(buffer + 0x40) = uname_len; // Filename length + *(u8* )(buffer + 0x41) = FILE_NAME_POSIX; // Filename namespace memcpy (buffer + 0x42, uname, uname_len * sizeof (ntfschar)); ntfs_mft_add_attr (ino, AT_FILE_NAME, buffer, ATTR_SIZE (0x42 + (uname_len * sizeof (ntfschar)))); //utils_dump_mem (buffer, 0, 0x50, DM_DEFAULTS); - // Data - memset (buffer, 0, 128); - ntfs_mft_add_attr (ino, AT_DATA, buffer, 0); - //utils_dump_mem ((u8*)ino->mrec, 0, ino->mrec->bytes_in_use, DM_DEFAULTS); //printf ("orig inode = %p\n", find.inode); @@ -4601,6 +4604,9 @@ static int ntfs_file_add2 (ntfs_volume * //utils_dump_mem (dt->data, 0, dt->data_len, DM_DEFAULTS); //printf ("\n"); + ie->key.file_name.allocated_size = ATTR_SIZE (data_len); + ie->key.file_name.data_size = data_len; + ntfs_dt_root_add (dt, ie); ino->ref_count++; dt->inodes[0] = ino; |
|
From: Yura P. <cha...@us...> - 2005-08-14 16:06:41
|
Changes by: cha0smaster Update of /cvsroot/linux-ntfs/ntfsprogs/libntfs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2366/libntfs Modified Files: index.c Log Message: fix stupidness introduced just before commit Index: index.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/index.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- index.c 14 Aug 2005 15:44:47 -0000 1.9 +++ index.c 14 Aug 2005 16:06:33 -0000 1.10 @@ -455,8 +455,8 @@ int ntfs_index_add_filename(ntfs_inode * ntfs_debug("Entering."); if (!ni || !fn) { ntfs_error(, "Invalid arguments."); - err = EINVAL; - goto err_out; + errno = EINVAL; + return -1; } ictx = ntfs_index_ctx_get(ni, I30, 4); if (!ictx) |
|
From: Richard R. <fl...@us...> - 2005-08-14 15:56:48
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31576 Modified Files: utils.c Log Message: tidy up error message Index: utils.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/utils.c,v retrieving revision 1.39 retrieving revision 1.40 diff -u -p -r1.39 -r1.40 --- utils.c 29 Jul 2005 14:44:24 -0000 1.39 +++ utils.c 14 Aug 2005 15:56:31 -0000 1.40 @@ -160,7 +160,7 @@ ntfs_volume * utils_mount_volume (const Eprintf("Couldn't mount device '%s': %s\n", device, strerror(err)); if (err == EOPNOTSUPP) - Eprintf("It's seems that logfile check failed. " + Eprintf("It seems that the logfile check failed. " "Try to mount volume in windows.\n"); return NULL; } |
|
From: Yura P. <cha...@us...> - 2005-08-14 15:45:03
|
Changes by: cha0smaster Update of /cvsroot/linux-ntfs/ntfsprogs/include/ntfs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29034/include/ntfs Modified Files: dir.h index.h inode.h layout.h ntfstime.h volume.h Log Message: Sorry it's very large commit (46K of diffs between my local tree and CVS HEAD before commit), file and directory creation/deletion recursively requested many changes. See ChangeLog for description of all changes. Index: dir.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/dir.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -p -r1.4 -r1.5 --- dir.h 12 Jun 2005 18:12:56 -0000 1.4 +++ dir.h 14 Aug 2005 15:44:47 -0000 1.5 @@ -2,6 +2,7 @@ * dir.h - Exports for directory handling. Part of the Linux-NTFS project. * * Copyright (c) 2002 Anton Altaparmakov + * Copyright (c) 2005 Yura Pakhuchiy * * This program/include file is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as published @@ -39,6 +40,11 @@ extern u64 ntfs_inode_lookup_by_name(ntf extern ntfs_inode *ntfs_pathname_to_inode(ntfs_volume *vol, ntfs_inode *parent, const char *pathname); +extern ntfs_inode *ntfs_create(ntfs_inode *dir_ni, ntfschar *name, u8 name_len, + const unsigned type); +extern int ntfs_delete(ntfs_inode *ni, ntfs_inode *dir_ni, ntfschar *name, + u8 name_len); + /* * File types (adapted from include <linux/fs.h>) */ Index: index.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/index.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- index.h 29 Jul 2005 21:37:09 -0000 1.5 +++ index.h 14 Aug 2005 15:44:47 -0000 1.6 @@ -90,10 +90,15 @@ typedef struct { extern ntfs_index_context *ntfs_index_ctx_get(ntfs_inode *ni, ntfschar *name, u32 name_len); extern void ntfs_index_ctx_put(ntfs_index_context *ictx); +extern void ntfs_index_ctx_reinit(ntfs_index_context *ictx); extern int ntfs_index_lookup(const void *key, const int key_len, ntfs_index_context *ictx); +extern int ntfs_index_add_filename(ntfs_inode *ni, FILE_NAME_ATTR *fn, + MFT_REF mref); +extern int ntfs_index_rm(ntfs_index_context *ictx); + /** * ntfs_index_entry_mark_dirty - mark an index entry dirty * @ictx: ntfs index context describing the index entry Index: inode.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/inode.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -p -r1.14 -r1.15 --- inode.h 20 Jul 2005 19:06:47 -0000 1.14 +++ inode.h 14 Aug 2005 15:44:47 -0000 1.15 @@ -2,7 +2,7 @@ * inode.h - Defines for NTFS inode handling. Part of the Linux-NTFS project. * * Copyright (c) 2001,2002 Anton Altaparmakov - * Copyright (c) 2004 Yura Pakhuchiy + * Copyright (c) 2004-2005 Yura Pakhuchiy * * This program/include file is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as published @@ -144,9 +144,10 @@ struct _ntfs_inode { s64 data_size; s64 allocated_size; - time_t atime; /* Last access to the data within the file. */ - time_t mtime; /* Last change of the data within the file. */ - time_t ctime; /* Last change of the metadata of the file. */ + time_t creation_time; + time_t last_data_change_time; + time_t last_mft_change_time; + time_t last_access_time; }; extern ntfs_inode *ntfs_inode_allocate(ntfs_volume *vol); Index: layout.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/layout.h,v retrieving revision 1.26 retrieving revision 1.27 diff -u -p -r1.26 -r1.27 --- layout.h 14 Aug 2005 06:16:35 -0000 1.26 +++ layout.h 14 Aug 2005 15:44:47 -0000 1.27 @@ -883,8 +883,11 @@ typedef struct { /* 32*/ FILE_ATTR_FLAGS file_attributes; /* Flags describing the file. */ /* 36*/ union { /* NTFS 1.2 (and previous, presumably) */ -/* 36 */ u8 reserved12[12]; /* Reserved/alignment to 8-byte - boundary. */ + struct { + /* 36 */ u8 reserved12[12]; /* Reserved/alignment to 8-byte + boundary. */ + /* 48 */ void *v1_end[0]; /* Marker for offsetof(). */ + } __attribute__ ((__packed__)); /* sizeof() = 48 bytes */ /* NTFS 3.0 */ struct { @@ -937,6 +940,7 @@ typedef struct { partition. This, in contrast to disabling the journal is a very fast process, so the user won't even notice it. */ + /* 72*/ void *v3_end[0]; /* Marker for offsetof(). */ } __attribute__ ((__packed__)); } __attribute__ ((__packed__)); /* sizeof() = 72 bytes (NTFS 3.0) */ @@ -1989,10 +1993,10 @@ typedef struct { this must be COLLATION_FILE_NAME. */ 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 + s8 clusters_per_index_block; /* Cluster size of each index block (in the index allocation attribute), when an index block is >= than a cluster, - otherwise this will be the log of + otherwise this will be the -log of the size (like how the encoding of the mft record size and the index record size found in the boot sector @@ -2168,13 +2172,11 @@ typedef struct { */ typedef struct { /* 0 INDEX_ENTRY_HEADER; -- Unfolded here as gcc dislikes unnamed structs. */ - union { - struct { /* Only valid when INDEX_ENTRY_END is not set. */ - MFT_REF indexed_file; /* The mft reference of the file + union { /* Only valid when INDEX_ENTRY_END is not set. */ + MFT_REF indexed_file; /* The mft reference of the file described by this index entry. Used for directory indexes. */ - } __attribute__ ((__packed__)); struct { /* Used for views/indexes to find the entry's data. */ u16 data_offset; /* Data byte offset from this INDEX_ENTRY. Follows the Index: ntfstime.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/ntfstime.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -p -r1.1 -r1.2 --- ntfstime.h 4 Aug 2005 09:59:43 -0000 1.1 +++ ntfstime.h 14 Aug 2005 15:44:47 -0000 1.2 @@ -40,7 +40,7 @@ */ static __inline__ time_t ntfs2utc(s64 ntfs_time) { - return (ntfs_time - (NTFS_TIME_OFFSET)) / 10000000; + return (sle64_to_cpu(ntfs_time) - (NTFS_TIME_OFFSET)) / 10000000; } /** @@ -61,7 +61,7 @@ static __inline__ time_t ntfs2utc(s64 nt static __inline__ s64 utc2ntfs(time_t utc_time) { /* Convert to 100ns intervals and then add the NTFS time offset. */ - return (s64)utc_time * 10000000 + NTFS_TIME_OFFSET; + return cpu_to_sle64((s64)utc_time * 10000000 + NTFS_TIME_OFFSET); } #endif /* _NTFS_NTFSTIME_H */ Index: volume.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/volume.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- volume.h 10 May 2005 16:44:58 -0000 1.12 +++ volume.h 14 Aug 2005 15:44:47 -0000 1.13 @@ -2,6 +2,7 @@ * volume.h - Exports for NTFS volume handling. Part of the Linux-NTFS project. * * Copyright (c) 2000-2004 Anton Altaparmakov + * Copyright (c) 2005 Yura Pakhuchiy * * This program/include file is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as published @@ -124,8 +125,10 @@ struct _ntfs_volume { u8 sector_size_bits; /* Log(2) of the byte size of a sector. */ u32 cluster_size; /* Byte size of a cluster. */ u32 mft_record_size; /* Byte size of a mft record. */ + u32 indx_record_size; /* Byte size of a INDX record. */ u8 cluster_size_bits; /* Log(2) of the byte size of a cluster. */ u8 mft_record_size_bits;/* Log(2) of the byte size of a mft record. */ + u8 indx_record_size_bits;/* Log(2) of the byte size of a INDX record. */ /* Variables used by the cluster and mft allocators. */ u8 mft_zone_multiplier; /* Initial mft zone multiplier. */ |
|
From: Yura P. <cha...@us...> - 2005-08-14 15:45:03
|
Changes by: cha0smaster Update of /cvsroot/linux-ntfs/ntfsprogs/libntfs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29034/libntfs Modified Files: attrib.c bootsect.c dir.c index.c inode.c mft.c Log Message: Sorry it's very large commit (46K of diffs between my local tree and CVS HEAD before commit), file and directory creation/deletion recursively requested many changes. See ChangeLog for description of all changes. Index: attrib.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrib.c,v retrieving revision 1.172 retrieving revision 1.173 diff -u -p -r1.172 -r1.173 --- attrib.c 4 Aug 2005 00:00:29 -0000 1.172 +++ attrib.c 14 Aug 2005 15:44:47 -0000 1.173 @@ -2573,7 +2573,10 @@ int ntfs_resident_attr_record_add(ntfs_i a->instance = m->next_attr_instance; a->value_length = 0; a->value_offset = cpu_to_le16(length); - a->resident_flags = 0; + if (type == AT_FILE_NAME) + a->resident_flags = RESIDENT_ATTR_IS_INDEXED; + else + a->resident_flags = 0; if (name_len) memcpy((u8*)a + le16_to_cpu(a->name_offset), name, sizeof(ntfschar) * name_len); Index: bootsect.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/bootsect.c,v retrieving revision 1.15 retrieving revision 1.16 diff -u -p -r1.15 -r1.16 --- bootsect.c 21 Jun 2005 09:55:15 -0000 1.15 +++ bootsect.c 14 Aug 2005 15:44:47 -0000 1.16 @@ -2,6 +2,7 @@ * bootsect.c - Boot sector handling code. Part of the Linux-NTFS project. * * Copyright (c) 2000-2005 Anton Altaparmakov + * Copyright (c) 2005 Yura Pakhuchiy * * This program/include file is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as published @@ -225,7 +226,7 @@ int ntfs_boot_sector_parse(ntfs_volume * if (c < 0) vol->mft_record_size = 1 << -c; else - vol->mft_record_size = vol->cluster_size * c; + vol->mft_record_size = c << vol->cluster_size_bits; if (vol->mft_record_size & (vol->mft_record_size - 1)) { Dprintf("Error: %s is not a valid NTFS partition! " "mft_record_size is not a power of 2.\n", @@ -235,6 +236,16 @@ int ntfs_boot_sector_parse(ntfs_volume * vol->mft_record_size_bits = ffs(vol->mft_record_size) - 1; Dprintf("MftRecordSize = 0x%x\n", (unsigned)vol->mft_record_size); Dprintf("MftRecordSizeBits = %u\n", vol->mft_record_size_bits); + /* Same as above for INDX record. */ + c = bs->clusters_per_index_record; + Dprintf("ClustersPerINDXRecord = 0x%x\n", c); + if (c < 0) + vol->indx_record_size = 1 << -c; + else + vol->indx_record_size = c << vol->cluster_size_bits; + vol->indx_record_size_bits = ffs(vol->indx_record_size) - 1; + Dprintf("INDXRecordSize = 0x%x\n", (unsigned)vol->indx_record_size); + Dprintf("INDXRecordSizeBits = %u\n", vol->indx_record_size_bits); /* * Work out the size of the MFT mirror in number of mft records. If the * cluster size is less than or equal to the size taken by four mft Index: dir.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/dir.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -p -r1.19 -r1.20 --- dir.c 25 Jul 2005 22:05:27 -0000 1.19 +++ dir.c 14 Aug 2005 15:44:47 -0000 1.20 @@ -2,6 +2,7 @@ * dir.c - Directory handling code. Part of the Linux-NTFS project. * * Copyright (c) 2002-2005 Anton Altaparmakov + * Copyright (c) 2005 Yura Pakhuchiy * * This program/include file is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as published @@ -37,6 +38,10 @@ #include "inode.h" #include "dir.h" #include "volume.h" +#include "mft.h" +#include "index.h" +#include "ntfstime.h" +#include "lcnalloc.h" /* * The little endian Unicode string "$I30" as a global constant. @@ -1054,3 +1059,356 @@ err_out: return -1; } +/** + * ntfs_create - create file or directory on ntfs volume + * @dir_ni: ntfs inode for directory in which create new object + * @name: unicode name of new object + * @name_len: length of the name in unicode characters + * @type: type of the object to create + * + * @type can be either NTFS_DT_REG to create regular file or NTFS_DT_DIR to + * create directory, other valuer are invalid. + * + * Return opened ntfs inode that describes created file on success or NULL + * on error with errno set to the error code. + */ +ntfs_inode *ntfs_create(ntfs_inode *dir_ni, ntfschar *name, u8 name_len, + const unsigned type) +{ + ntfs_inode *ni; + ntfs_attr *na; + FILE_NAME_ATTR *fn = NULL; + STANDARD_INFORMATION *si = NULL; + int err, fn_len, si_len; + + ntfs_debug("Entering."); + /* Sanity checks. */ + if (!dir_ni || !name || !name_len || + (type != NTFS_DT_REG && type != NTFS_DT_DIR)) { + ntfs_error(, "Invalid arguments."); + return NULL; + } + /* Allocate MFT record for new file. */ + ni = ntfs_mft_record_alloc(dir_ni->vol, NULL); + if (!ni) { + ntfs_error(, "Failed to allocate new MFT record."); + return NULL; + } + /* + * Create STANDARD_INFORMATION attribute. Write STANDARD_INFORMATION + * version 1.2, windows will upgrade it to version 3 if needed. + */ + si_len = offsetof(STANDARD_INFORMATION, v1_end); + si = calloc(1, si_len); + if (!si) { + err = errno; + ntfs_error(, "Not enough memory."); + goto err_out; + } + si->creation_time = utc2ntfs(ni->creation_time); + si->last_data_change_time = utc2ntfs(ni->last_data_change_time); + si->last_mft_change_time = utc2ntfs(ni->last_mft_change_time); + si->last_access_time = utc2ntfs(ni->last_access_time); + /* Add STANDARD_INFORMATION to inode. */ + na = ntfs_attr_add(ni, AT_STANDARD_INFORMATION, AT_UNNAMED, 0, si_len); + if (!na) { + err = errno; + ntfs_error(, "Failed to add STANDARD_INFORMATION attribute."); + goto err_out; + } + if (ntfs_attr_pwrite(na, 0, si_len, si) != si_len) { + err = errno; + ntfs_error(, "Failed to initialize STANDARD_INFORMATION " + "attribute."); + goto err_out; + } + ntfs_attr_close(na); + if (type == NTFS_DT_DIR) { + INDEX_ROOT *ir = NULL; + INDEX_ENTRY *ie; + int ir_len, index_len; + + /* Create INDEX_ROOT attribute. */ + index_len = sizeof(INDEX_HEADER) + sizeof(INDEX_ENTRY_HEADER); + ir_len = offsetof(INDEX_ROOT, index) + index_len; + ir = calloc(1, ir_len); + if (!ir) { + err = errno; + ntfs_error(, "Not enough memory."); + goto err_out; + } + ir->type = AT_FILE_NAME; + ir->collation_rule = COLLATION_FILE_NAME; + ir->index_block_size = cpu_to_le32(ni->vol->indx_record_size); + if (ni->vol->cluster_size <= ni->vol->indx_record_size) + ir->clusters_per_index_block = + ni->vol->indx_record_size >> + ni->vol->cluster_size_bits; + else + ir->clusters_per_index_block = + -ni->vol->indx_record_size_bits; + ir->index.entries_offset = cpu_to_le32(sizeof(INDEX_HEADER)); + ir->index.index_length = cpu_to_le32(index_len); + ir->index.allocated_size = cpu_to_le32(index_len); + ie = (INDEX_ENTRY*)((u8*)ir + sizeof(INDEX_ROOT)); + ie->length = cpu_to_le16(sizeof(INDEX_ENTRY_HEADER)); + ie->key_length = 0; + ie->flags = INDEX_ENTRY_END; + /* Add INDEX_ROOT attribute to inode. */ + na = ntfs_attr_add(ni, AT_INDEX_ROOT, I30, 4, ir_len); + if (!na) { + err = errno; + free(ir); + ntfs_error(, "Failed to add INDEX_ROOT attribute."); + goto err_out; + } + if (ntfs_attr_pwrite(na, 0, ir_len, ir) != ir_len) { + err = errno; + free(ir); + ntfs_error(, "Failed to initialize INDEX_ROOT."); + goto err_out; + } + ntfs_attr_close(na); + } else { + /* Add DATA attribute to inode. */ + na = ntfs_attr_add(ni, AT_DATA, AT_UNNAMED, 0, 0); + if (!na) { + err = errno; + ntfs_error(, "Failed to add DATA attribute."); + goto err_out; + } + ntfs_attr_close(na); + } + /* Create FILE_NAME attribute. */ + fn_len = sizeof(FILE_NAME_ATTR) + name_len * sizeof(ntfschar); + fn = calloc(1, fn_len); + if (!fn) { + err = errno; + ntfs_error(, "Not enough memory."); + goto err_out; + } + fn->parent_directory = MK_LE_MREF(dir_ni->mft_no, + le16_to_cpu(dir_ni->mrec->sequence_number)); + fn->file_name_length = name_len; + fn->file_name_type = FILE_NAME_POSIX; + if (type == NTFS_DT_DIR) + fn->file_attributes = FILE_ATTR_DUP_FILE_NAME_INDEX_PRESENT; + fn->creation_time = utc2ntfs(ni->creation_time); + fn->last_data_change_time = utc2ntfs(ni->last_data_change_time); + fn->last_mft_change_time = utc2ntfs(ni->last_mft_change_time); + fn->last_access_time = utc2ntfs(ni->last_access_time); + memcpy(fn->file_name, name, name_len * sizeof(ntfschar)); + /* Add FILE_NAME attribute to inode. */ + na = ntfs_attr_add(ni, AT_FILE_NAME, AT_UNNAMED, 0, fn_len); + if (!na) { + err = errno; + ntfs_error(, "Failed to add FILE_NAME attribute."); + goto err_out; + } + if (ntfs_attr_pwrite(na, 0, fn_len, fn) != fn_len) { + err = errno; + ntfs_error(, "Failed to initialize FILE_NAME attribute."); + goto err_out; + } + ntfs_attr_close(na); + /* Add FILE_NAME attribute to index. */ + if (ntfs_index_add_filename(dir_ni, fn, MK_MREF(ni->mft_no, + le16_to_cpu(ni->mrec->sequence_number)))) { + err = errno; + ntfs_error(, "Failed to add entry to the index."); + goto err_out; + } + /* Set hard links count and directory flag. */ + ni->mrec->link_count = cpu_to_le16(1); + if (type == NTFS_DT_DIR) + ni->mrec->flags |= MFT_RECORD_IS_DIRECTORY; + ntfs_inode_mark_dirty(ni); + /* Done! */ + free(fn); + free(si); + ntfs_debug("Done."); + return ni; +err_out: + ntfs_debug("Failed."); + if (ntfs_mft_record_free(ni->vol, ni)) + ntfs_error(, "Failed to free MFT record. " + "Leaving inconsist metadata. Run chkdsk."); + if (fn) + free(fn); + if (si) + free(si); + errno = err; + return NULL; +} + +/** + * ntfs_delete - delete file or directory from ntfs volume + * @ni: ntfs inode for object to delte + * @dir_ni: ntfs inode for directory in which delete object + * @name: unicode name of the object to delete + * @name_len: length of the name in unicode characters + * + * @ni is always closed after using of this function (even if it failed), + * user do not need to call ntfs_inode_close himself. + * + * Return 0 on success or -1 on error with errno set to the error code. + */ +int ntfs_delete(ntfs_inode *ni, ntfs_inode *dir_ni, ntfschar *name, u8 name_len) +{ + ntfs_attr_search_ctx *actx = NULL; + ntfs_index_context *ictx = NULL; + FILE_NAME_ATTR *fn = NULL; + BOOL looking_for_dos_name = FALSE, looking_for_win32_name = FALSE; + int err = 0; + + ntfs_debug("Entering."); + if (!ni || !dir_ni || !name || !name_len) { + ntfs_error(, "Invalid arguments."); + errno = EINVAL; + goto err_out; + } + if (ni->nr_extents == -1) + ni = ni->base_ni; + if (dir_ni->nr_extents == -1) + dir_ni = dir_ni->base_ni; + /* + * Search for FILE_NAME attribute with such name. If it's in POSIX or + * WIN32_AND_DOS namespace, then simply remove it from index and inode. + * If filename in DOS or in WIN32 namespace, then remove DOS name first, + * only then remove WIN32 name. Mark WIN32 name as POSIX name to prevent + * chkdsk to complain about DOS name absentation, in case if DOS name + * had been successfully deleted, but WIN32 name removing failed. + */ + actx = ntfs_attr_get_search_ctx(ni, NULL); + if (!actx) + goto err_out; +search: + while (!ntfs_attr_lookup(AT_FILE_NAME, AT_UNNAMED, 0, CASE_SENSITIVE, + 0, NULL, 0, actx)) { + errno = 0; + fn = (FILE_NAME_ATTR*)((u8*)actx->attr + + le16_to_cpu(actx->attr->value_offset)); + if (looking_for_dos_name && fn->file_name_type == FILE_NAME_DOS) + break; + if (looking_for_win32_name && + fn->file_name_type == FILE_NAME_WIN32) + break; + if (dir_ni->mft_no == MREF_LE(fn->parent_directory) && + ntfs_names_are_equal(fn->file_name, + fn->file_name_length, name, + name_len, (fn->file_name_type == + FILE_NAME_POSIX) ? CASE_SENSITIVE : IGNORE_CASE, + ni->vol->upcase, ni->vol->upcase_len)) { + if (fn->file_name_type == FILE_NAME_WIN32) { + looking_for_dos_name = TRUE; + ntfs_attr_reinit_search_ctx(actx); + continue; + } + if (fn->file_name_type == FILE_NAME_DOS) + looking_for_dos_name = TRUE; + break; + } + } + if (errno) + goto err_out; + /* Search for such FILE_NAME in index. */ + ictx = ntfs_index_ctx_get(dir_ni, I30, 4); + if (!ictx) + goto err_out; + if (ntfs_index_lookup(fn, le32_to_cpu(actx->attr->value_length), ictx)) + goto err_out; + /* Set namespace to POSIX for WIN32 name. */ + if (fn->file_name_type == FILE_NAME_WIN32) { + fn->file_name_type = FILE_NAME_POSIX; + ntfs_inode_mark_dirty(actx->ntfs_ino); + ((FILE_NAME_ATTR*)ictx->data)->file_name_type = FILE_NAME_POSIX; + ntfs_index_entry_mark_dirty(ictx); + } + /* Do not support reparse oint deletion yet. */ + if (((FILE_NAME_ATTR*)ictx->data)->file_attributes & + FILE_ATTR_REPARSE_POINT) { + errno = EOPNOTSUPP; + goto err_out; + } + /* Remove FILE_NAME from index. */ + if (ntfs_index_rm(ictx)) + goto err_out; + ictx = NULL; + /* Remove FILE_NAME from inode. */ + if (ntfs_attr_record_rm(actx)) + goto err_out; + /* Decerement hard link count. */ + ni->mrec->link_count = cpu_to_le16(le16_to_cpu( + ni->mrec->link_count) - 1); + ntfs_inode_mark_dirty(ni); + if (looking_for_dos_name) { + looking_for_dos_name = FALSE; + looking_for_win32_name = TRUE; + ntfs_attr_reinit_search_ctx(actx); + goto search; + } + /* + * If hard link count is not equal to zero then we are done. In other + * case there are no reference to this inode left, so we should free all + * non-resident atributes and mark inode as not in use. + */ + if (ni->mrec->link_count) + goto out; + ntfs_attr_reinit_search_ctx(actx); + while (!ntfs_attrs_walk(actx)) { + if (actx->attr->non_resident) { + runlist *rl; + + rl = ntfs_mapping_pairs_decompress(ni->vol, actx->attr, + NULL); + if (!rl) { + err = errno; + ntfs_error(, "Failed to decompress runlist. " + "Leaving inconsist metadata."); + continue; + } + if (ntfs_cluster_free_from_rl(ni->vol, rl)) { + err = errno; + ntfs_error(, "Failed to free clusters. " + "Leaving inconsist metadata."); + continue; + } + free(rl); + } + } + if (errno != ENOENT) { + err = errno; + ntfs_error(, "Atribute enumeration failed. " + "Probably leaving inconsist metadata."); + } + /* All extents should be attached after attribute walk. */ + while (ni->nr_extents) + if (ntfs_mft_record_free(ni->vol, *(ni->extent_nis))) { + err = errno; + ntfs_error(, "Failed to free extent MFT record. " + "Leaving inconsist metadata."); + } + if (ntfs_mft_record_free(ni->vol, ni)) { + err = errno; + ntfs_error(, "Failed to free base MFT record. " + "Leaving inconsist metadata."); + } + ni = NULL; +out: + if (actx) + ntfs_attr_put_search_ctx(actx); + if (ictx) + ntfs_index_ctx_put(ictx); + if (ni) + ntfs_inode_close(ni); + if (err) { + ntfs_error(, "Failed."); + errno = err; + return -1; + } + ntfs_debug("Done."); + return 0; +err_out: + err = errno; + goto out; +} Index: index.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/index.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -p -r1.8 -r1.9 --- index.c 23 Jul 2005 00:50:34 -0000 1.8 +++ index.c 14 Aug 2005 15:44:47 -0000 1.9 @@ -27,6 +27,7 @@ #include "debug.h" #include "index.h" #include "mst.h" +#include "dir.h" /** * ntfs_index_ctx_get - allocate and initialize a new index context @@ -91,6 +92,42 @@ void ntfs_index_ctx_put(ntfs_index_conte } /** + * ntfs_index_ctx_reinit - reinitialize an index context + * @ictx: index context to reinitialize + * + * Reintialize the index context @ictx so it can be used for ntfs_index_lookup. + */ +void ntfs_index_ctx_reinit(ntfs_index_context *ictx) +{ + if (ictx->entry) { + if (ictx->is_in_root) { + if (ictx->actx) + ntfs_attr_put_search_ctx(ictx->actx); + } else { + /* Write out index block it it's dirty. */ + if (ictx->ia_dirty) { + if (ntfs_attr_mst_pwrite(ictx->ia_na, + ictx->ia_vcn << + ictx->ni->vol-> + cluster_size_bits, + 1, ictx->block_size, + ictx->ia) != 1) + ntfs_error(, "Failed to write out " + "index block."); + } + /* Free resources. */ + free(ictx->ia); + ntfs_attr_close(ictx->ia_na); + } + } + *ictx = (ntfs_index_context) { + .ni = ictx->ni, + .name = ictx->name, + .name_len = ictx->name_len, + }; +} + +/** * ntfs_index_lookup - find a key in an index and return its index entry * @key: [IN] key for which to search in the index * @key_len: [IN] length of @key in bytes @@ -397,3 +434,195 @@ idx_err_out: goto err_out; } +/** + * ntfs_index_add_filename - add filename to directory index + * @ni: ntfs inode describing directory to which index add filename + * @fn: FILE_NAME attribute to add + * @mref: reference of the inode which @fn describes + * + * NOTE: This function does not support all cases, so it can fail with + * EOPNOTSUPP error code. + * + * Return 0 on success or -1 on error with errno set to the error code. + */ +int ntfs_index_add_filename(ntfs_inode *ni, FILE_NAME_ATTR *fn, MFT_REF mref) +{ + ntfs_index_context *ictx; + INDEX_ENTRY *ie; + INDEX_HEADER *ih; + int err, fn_size, ie_size, allocated_size = 0; + + ntfs_debug("Entering."); + if (!ni || !fn) { + ntfs_error(, "Invalid arguments."); + err = EINVAL; + goto err_out; + } + ictx = ntfs_index_ctx_get(ni, I30, 4); + if (!ictx) + return -1; + fn_size = (fn->file_name_length * sizeof(ntfschar)) + + sizeof(FILE_NAME_ATTR); + ie_size = (sizeof(INDEX_ENTRY_HEADER) + fn_size + 7) & ~7; +retry: + /* Find place where insert new entry. */ + if (!ntfs_index_lookup(fn, fn_size, ictx)) { + err = EEXIST; + ntfs_error(, "Index already have such entry."); + goto err_out; + } + if (errno != ENOENT) { + err = errno; + ntfs_error(, "Failed to find place where to insert new entry."); + goto err_out; + } + /* Some setup. */ + if (ictx->is_in_root) + ih = &ictx->ir->index; + else + ih = &ictx->ia->index; + if (!allocated_size) + allocated_size = le16_to_cpu(ih->allocated_size); + /* Check whether we have enough space in the index. */ + if (le16_to_cpu(ih->index_length) + ie_size > allocated_size) { + /* If we in the index root try to resize it. */ + if (ictx->is_in_root) { + ntfs_attr *na; + + allocated_size = le16_to_cpu(ih->index_length) + + ie_size; + na = ntfs_attr_open(ictx->ni, AT_INDEX_ROOT, ictx->name, + ictx->name_len); + if (!na) { + err = errno; + ntfs_error(, "Failed to open INDEX_ROOT."); + goto err_out; + } + if (ntfs_attr_truncate(na, allocated_size + offsetof( + INDEX_ROOT, index))) { + err = EOPNOTSUPP; + ntfs_attr_close(na); + ntfs_error(, "Failed to truncate INDEX_ROOT."); + goto err_out; + } + ntfs_attr_close(na); + ntfs_index_ctx_reinit(ictx); + goto retry; + } + ntfs_debug("Not implemented case."); + err = EOPNOTSUPP; + goto err_out; + } + /* Update allocated size if we in INDEX_ROOT. */ + if (ictx->is_in_root) + ih->allocated_size = cpu_to_le16(allocated_size); + /* Create entry. */ + ie = calloc(1, ie_size); + if (!ie) { + err = errno; + goto err_out; + } + ie->indexed_file = cpu_to_le64(mref); + ie->length = cpu_to_le16(ie_size); + ie->key_length = cpu_to_le16(fn_size); + memcpy(&ie->key, fn, fn_size); + /* Update index length, move following entries forard and copy entry. */ + ih->index_length = cpu_to_le16(le16_to_cpu(ih->index_length) + ie_size); + memmove((u8*)ictx->entry + ie_size, ictx->entry, + le16_to_cpu(ih->index_length) - + ((u8*)ictx->entry - (u8*)ih) - ie_size); + memcpy(ictx->entry, ie, ie_size); + /* Done! */ + ntfs_index_entry_mark_dirty(ictx); + ntfs_index_ctx_put(ictx); + free(ie); + ntfs_debug("Done."); + return 0; +err_out: + ntfs_debug("Failed."); + ntfs_index_ctx_put(ictx); + errno = err; + return -1; +} + +/** + * ntfs_index_rm - remove entry from the index + * @ictx: index context describing entry to delete + * + * Delete entry described by @ictx from the index. NOTE: This function does not + * support all cases, so it can fail with EOPNOTSUPP error code. In any case + * index context is always reinitialized after use of this function, so it can + * be used for index lookup once again. + * + * Return 0 on success or -1 on error with errno set to the error code. + */ +int ntfs_index_rm(ntfs_index_context *ictx) +{ + INDEX_HEADER *ih; + u32 new_index_length; + int err; + + ntfs_debug("Entering."); + if (!ictx || (!ictx->ia && !ictx->ir) || + ictx->entry->flags & INDEX_ENTRY_END) { + ntfs_error(, "Invalid arguments."); + err = EINVAL; + goto err_out; + } + if (ictx->is_in_root) + ih = &ictx->ir->index; + else + ih = &ictx->ia->index; + /* Don't support deletion of entries with subnodes yet. */ + if (ictx->entry->flags & INDEX_ENTRY_NODE) { + err = EOPNOTSUPP; + goto err_out; + } + /* Calculate new length of the index. */ + new_index_length = le32_to_cpu(ih->index_length) - + le16_to_cpu(ictx->entry->length); + /* Don't support deletion of the last entry in the allocation block. */ + if (!ictx->is_in_root && (new_index_length <= + le32_to_cpu(ih->entries_offset) + + sizeof(INDEX_ENTRY_HEADER) + sizeof(VCN))) { + err = EOPNOTSUPP; + goto err_out; + } + /* Update index length and remove index entry. */ + ih->index_length = cpu_to_le32(new_index_length); + if (ictx->is_in_root) + ih->allocated_size = ih->index_length; + memmove(ictx->entry, (u8*)ictx->entry + le16_to_cpu( + ictx->entry->length), new_index_length - + ((u8*)ictx->entry - (u8*)ih)); + ntfs_index_entry_mark_dirty(ictx); + /* Resize INDEX_ROOT attribute. */ + if (ictx->is_in_root) { + ntfs_attr *na; + + na = ntfs_attr_open(ictx->ni, AT_INDEX_ROOT, ictx->name, + ictx->name_len); + if (!na) { + err = errno; + ntfs_error(, "Failed to open INDEX_ROOT attribute. " + "Leaving inconsist metadata."); + goto err_out; + } + if (ntfs_attr_truncate(na, new_index_length + offsetof( + INDEX_ROOT, index))) { + err = errno; + ntfs_error(, "Failed to truncate INDEX_ROOT attribute. " + " Leaving inconsist metadata."); + goto err_out; + } + ntfs_attr_close(na); + } + ntfs_index_ctx_reinit(ictx); + ntfs_debug("Done."); + return 0; +err_out: + ntfs_index_ctx_reinit(ictx); + ntfs_debug("Failed."); + errno = err; + return -1; +} Index: inode.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/inode.c,v retrieving revision 1.64 retrieving revision 1.65 diff -u -p -r1.64 -r1.65 --- inode.c 4 Aug 2005 09:59:43 -0000 1.64 +++ inode.c 14 Aug 2005 15:44:47 -0000 1.65 @@ -149,9 +149,10 @@ ntfs_inode *ntfs_inode_open(ntfs_volume NInoSetEncrypted(ni); if (std_info->file_attributes & FILE_ATTR_SPARSE_FILE) NInoSetSparse(ni); - ni->mtime = ntfs2utc(sle64_to_cpu(std_info->last_data_change_time)); - ni->ctime = ntfs2utc(sle64_to_cpu(std_info->last_mft_change_time)); - ni->atime = ntfs2utc(sle64_to_cpu(std_info->last_access_time)); + ni->creation_time = ntfs2utc(std_info->creation_time); + ni->last_data_change_time = ntfs2utc(std_info->last_data_change_time); + ni->last_mft_change_time = ntfs2utc(std_info->last_mft_change_time); + ni->last_access_time = ntfs2utc(std_info->last_access_time); /* Set attribute list information. */ if (ntfs_attr_lookup(AT_ATTRIBUTE_LIST, AT_UNNAMED, 0, 0, 0, NULL, 0, ctx)) { @@ -471,6 +472,10 @@ static int ntfs_inode_sync_standard_info std_info->file_attributes |= FILE_ATTR_SPARSE_FILE; else std_info->file_attributes &= ~FILE_ATTR_SPARSE_FILE; + std_info->creation_time = utc2ntfs(ni->creation_time); + std_info->last_data_change_time = utc2ntfs(ni->last_data_change_time); + std_info->last_mft_change_time = utc2ntfs(ni->last_mft_change_time); + std_info->last_access_time = utc2ntfs(ni->last_access_time); ntfs_inode_mark_dirty(ctx->ntfs_ino); ntfs_attr_put_search_ctx(ctx); return 0; @@ -561,6 +566,10 @@ static int ntfs_inode_sync_file_name(ntf fn->allocated_size = cpu_to_sle64(ni->allocated_size); if (ni->data_size != -1) fn->data_size = cpu_to_sle64(ni->data_size); + fn->creation_time = utc2ntfs(ni->creation_time); + fn->last_data_change_time = utc2ntfs(ni->last_data_change_time); + fn->last_mft_change_time = utc2ntfs(ni->last_mft_change_time); + fn->last_access_time = utc2ntfs(ni->last_access_time); ntfs_index_entry_mark_dirty(ictx); ntfs_index_ctx_put(ictx); ntfs_inode_close(index_ni); @@ -616,7 +625,8 @@ int ntfs_inode_sync(ntfs_inode *ni) __FUNCTION__, (long long) ni->mft_no); /* Update STANDARD_INFORMATION. */ - if (ni->nr_extents != -1 && ntfs_inode_sync_standard_information(ni)) { + if ((ni->mrec->flags & MFT_RECORD_IN_USE) && ni->nr_extents != -1 && + ntfs_inode_sync_standard_information(ni)) { if (!err || errno == EIO) { err = errno; if (err != EIO) @@ -627,7 +637,8 @@ int ntfs_inode_sync(ntfs_inode *ni) } /* Update FILE_NAME's in the index. */ - if (ni->nr_extents != -1 && NInoFileNameTestAndClearDirty(ni) && + if ((ni->mrec->flags & MFT_RECORD_IN_USE) && ni->nr_extents != -1 && + NInoFileNameTestAndClearDirty(ni) && ntfs_inode_sync_file_name(ni)) { if (!err || errno == EIO) { err = errno; @@ -640,8 +651,8 @@ int ntfs_inode_sync(ntfs_inode *ni) } /* Write out attribute list from cache to disk. */ - if (ni->nr_extents != -1 && NInoAttrList(ni) && - NInoAttrListTestAndClearDirty(ni)) { + if ((ni->mrec->flags & MFT_RECORD_IN_USE) && ni->nr_extents != -1 && + NInoAttrList(ni) && NInoAttrListTestAndClearDirty(ni)) { ntfs_attr *na; na = ntfs_attr_open(ni, AT_ATTRIBUTE_LIST, AT_UNNAMED, 0); Index: mft.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/mft.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -p -r1.32 -r1.33 --- mft.c 1 Aug 2005 22:10:39 -0000 1.32 +++ mft.c 14 Aug 2005 15:44:47 -0000 1.33 @@ -2,6 +2,7 @@ * mft.c - Mft record handling code. Part of the Linux-NTFS project. * * Copyright (c) 2000-2004 Anton Altaparmakov + * Copyright (c) 2005 Yura Pakhuchiy * * This program/include file is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as published @@ -25,6 +26,7 @@ #include <stdio.h> #include <errno.h> #include <string.h> +#include <time.h> #include "compat.h" @@ -1361,7 +1363,7 @@ mft_rec_already_initialized: if (ntfs_is_file_record(m->magic) && (m->flags & MFT_RECORD_IN_USE)) { ntfs_error(vol->sb, "Mft record 0x%llx was marked unused in " "mft bitmap but is marked used itself. " - "Corrupt filesystem or driver bug! " + "Corrupt filesystem or library bug! " "Run chkdsk immediately!", (long long)bit); free(m); errno = EIO; @@ -1435,6 +1437,11 @@ mft_rec_already_initialized: } /* Make sure the allocated inode is written out to disk later. */ ntfs_inode_mark_dirty(ni); + /* Initialize time, allocated and data size in ntfs_inode struct. */ + ni->data_size = ni->allocated_size = -1; + ni->creation_time = ni->last_data_change_time = + ni->last_mft_change_time = + ni->last_access_time = time(NULL); /* Update the default mft allocation position if it was used. */ if (!base_ni) vol->mft_data_pos = bit + 1; |
|
From: Yura P. <cha...@us...> - 2005-08-14 15:45:03
|
Changes by: cha0smaster Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29034/ntfsprogs Modified Files: ntfsinfo.c ntfsls.c ntfsmount.c ntfsrm.c ntfsundelete.c Log Message: Sorry it's very large commit (46K of diffs between my local tree and CVS HEAD before commit), file and directory creation/deletion recursively requested many changes. See ChangeLog for description of all changes. Index: ntfsinfo.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v retrieving revision 1.73 retrieving revision 1.74 diff -u -p -r1.73 -r1.74 --- ntfsinfo.c 4 Aug 2005 09:59:44 -0000 1.73 +++ ntfsinfo.c 14 Aug 2005 15:44:47 -0000 1.74 @@ -280,7 +280,7 @@ static int parse_options (int argc, char */ static char *ntfsinfo_time_to_str(const s64 sle_ntfs_clock) { - time_t unix_clock = ntfs2utc(sle64_to_cpu(sle_ntfs_clock)); + time_t unix_clock = ntfs2utc(sle_ntfs_clock); return ctime(&unix_clock); } @@ -450,11 +450,11 @@ static void ntfs_dump_flags(ATTR_TYPES t } if (type == AT_FILE_NAME) { if (flags & FILE_ATTR_DUP_FILE_NAME_INDEX_PRESENT) { - printf(" DIRECTORY"); + printf(" FILE_NAME_INDEX"); flags &= ~FILE_ATTR_DUP_FILE_NAME_INDEX_PRESENT; } if (flags & FILE_ATTR_DUP_VIEW_INDEX_PRESENT) { - printf(" INDEX_VIEW"); + printf(" VIEW_INDEX"); flags &= ~FILE_ATTR_DUP_VIEW_INDEX_PRESENT; } } Index: ntfsls.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsls.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -p -r1.27 -r1.28 --- ntfsls.c 11 Aug 2005 13:53:08 -0000 1.27 +++ ntfsls.c 14 Aug 2005 15:44:48 -0000 1.28 @@ -548,8 +548,7 @@ static int list_dir_entry(ntfsls_dirent if (!file_name_attr) goto release; - ntfs_time = ntfs2utc(sle64_to_cpu( - file_name_attr->last_data_change_time)); + ntfs_time = ntfs2utc(file_name_attr->last_data_change_time); strcpy(t_buf, ctime(&ntfs_time)); memmove(t_buf+16, t_buf+19, 5); t_buf[21] = '\0'; Index: ntfsmount.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v retrieving revision 1.22 retrieving revision 1.23 diff -u -p -r1.22 -r1.23 --- ntfsmount.c 8 Aug 2005 13:14:41 -0000 1.22 +++ ntfsmount.c 14 Aug 2005 15:44:48 -0000 1.23 @@ -33,6 +33,7 @@ #include <locale.h> #include <signal.h> #include <limits.h> +#include <time.h> #ifdef HAVE_SETXATTR #include <sys/xattr.h> @@ -285,9 +286,9 @@ static int ntfs_fuse_getattr(const char stbuf->st_uid = ctx->uid; stbuf->st_gid = ctx->gid; stbuf->st_ino = ni->mft_no; - stbuf->st_atime = ni->atime; - stbuf->st_ctime = ni->ctime; - stbuf->st_mtime = ni->mtime; + stbuf->st_atime = ni->last_access_time; + stbuf->st_ctime = ni->last_mft_change_time; + stbuf->st_mtime = ni->last_data_change_time; ntfs_inode_close(ni); } else res = -ENOENT; @@ -518,71 +519,166 @@ static int ntfs_fuse_chmod(const char *p return -EOPNOTSUPP; } -static int ntfs_fuse_mknod(const char *org_path, mode_t mode, - dev_t dev __attribute__((unused))) +static int ntfs_fuse_create(const char *org_path, const unsigned type) { - ntfs_inode *ni = NULL; - ntfs_attr *na; - char *path = NULL; - ntfschar *stream_name; - int stream_name_len; - int res = 0; + char *name; + ntfschar *uname = NULL; + ntfs_inode *dir_ni = NULL, *ni; + char *path; + int res = 0, uname_len; - if (mode && !(mode & S_IFREG)) - return -EOPNOTSUPP; - stream_name_len = ntfs_fuse_parse_path(org_path, &path, &stream_name); - if (stream_name_len < 0) - return stream_name_len; - if (!stream_name_len) { - res = -EOPNOTSUPP; + path = strdup(org_path); + if (!path) + return -errno; + /* Generate unicode filename. */ + name = strrchr(path, '/'); + name++; + uname_len = ntfs_mbstoucs(name, &uname, 0); + if (uname_len < 0) { + res = -errno; goto exit; } - ni = ntfs_pathname_to_inode(ctx->vol, NULL, path); - if (!ni) { + /* Open parent directory. */ + *name = 0; + dir_ni = ntfs_pathname_to_inode(ctx->vol, NULL, path); + if (!dir_ni) { res = -errno; if (res == -ENOENT) - res = -EOPNOTSUPP; + res = -EIO; goto exit; } - na = ntfs_attr_add(ni, AT_DATA, stream_name, stream_name_len, 0); - if (na) - ntfs_attr_close(na); + /* Create object specified in @type. */ + ni = ntfs_create(dir_ni, uname, uname_len, type); + if (ni) + ntfs_inode_close(ni); else res = -errno; exit: - if (ni && ntfs_inode_close(ni)) - perror("Failed to close inode"); + if (uname) + free(uname); + if (dir_ni) + ntfs_inode_close(dir_ni); free(path); - if (stream_name_len) - free(stream_name); return res; } -static int ntfs_fuse_rm_file(char *file) +static int ntfs_fuse_create_stream(const char *path, + ntfschar *stream_name, const int stream_name_len) { - free(file); - return -EOPNOTSUPP; + ntfs_inode *ni; + ntfs_attr *na; + int res = 0; + + ni = ntfs_pathname_to_inode(ctx->vol, NULL, path); + if (!ni) { + res = -errno; + if (res == -ENOENT) { + /* + * If such file does not exist, create it and try once + * again to add stream to it. + */ + res = ntfs_fuse_create(path, NTFS_DT_REG); + if (!res) + return ntfs_fuse_create_stream(path, + stream_name, stream_name_len); + else + res = -errno; + } + return res; + } + na = ntfs_attr_add(ni, AT_DATA, stream_name, stream_name_len, 0); + if (na) + ntfs_attr_close(na); + else + res = -errno; + if (ntfs_inode_close(ni)) + perror("Failed to close inode"); + return res; } -static int ntfs_fuse_unlink(const char *org_path) +static int ntfs_fuse_mknod(const char *org_path, mode_t mode, + dev_t dev __attribute__((unused))) { - ntfs_inode *ni = NULL; - ntfs_attr *na; char *path = NULL; ntfschar *stream_name; int stream_name_len; int res = 0; + if (mode && !(mode & S_IFREG)) + return -EOPNOTSUPP; stream_name_len = ntfs_fuse_parse_path(org_path, &path, &stream_name); if (stream_name_len < 0) return stream_name_len; if (!stream_name_len) - return ntfs_fuse_rm_file(path); - ni = ntfs_pathname_to_inode(ctx->vol, NULL, path); + res = ntfs_fuse_create(path, NTFS_DT_REG); + else + res = ntfs_fuse_create_stream(path, stream_name, + stream_name_len); + free(path); + if (stream_name_len) + free(stream_name); + return res; +} + +static int ntfs_fuse_rm(const char *org_path) +{ + char *name; + ntfschar *uname = NULL; + ntfs_inode *dir_ni = NULL, *ni; + char *path; + int res = 0, uname_len; + + path = strdup(org_path); + if (!path) + return -errno; + /* Open object for delete. */ + ni = ntfs_pathname_to_inode(ctx->vol, NULL, path); if (!ni) { res = -errno; goto exit; } + /* Generate unicode filename. */ + name = strrchr(path, '/'); + name++; + uname_len = ntfs_mbstoucs(name, &uname, 0); + if (uname_len < 0) { + res = -errno; + goto exit; + } + /* Open parent directory. */ + *name = 0; + dir_ni = ntfs_pathname_to_inode(ctx->vol, NULL, path); + if (!dir_ni) { + res = -errno; + if (res == -ENOENT) + res = -EIO; + goto exit; + } + /* Delete object. */ + if (ntfs_delete(ni, dir_ni, uname, uname_len)) + res = -errno; + ni = NULL; +exit: + if (ni) + ntfs_inode_close(ni); + if (uname) + free(uname); + if (dir_ni) + ntfs_inode_close(dir_ni); + free(path); + return res; +} + +static int ntfs_fuse_rm_stream(const char *path, ntfschar *stream_name, + const int stream_name_len) +{ + ntfs_inode *ni; + ntfs_attr *na; + int res = 0; + + ni = ntfs_pathname_to_inode(ctx->vol, NULL, path); + if (!ni) + return -errno; na = ntfs_attr_open(ni, AT_DATA, stream_name, stream_name_len); if (!na) { res = -errno; @@ -593,14 +689,70 @@ static int ntfs_fuse_unlink(const char * ntfs_attr_close(na); } exit: - if (ni && ntfs_inode_close(ni)) + if (ntfs_inode_close(ni)) perror("Failed to close inode"); + return res; +} + +static int ntfs_fuse_unlink(const char *org_path) +{ + char *path = NULL; + ntfschar *stream_name; + int stream_name_len; + int res = 0; + + stream_name_len = ntfs_fuse_parse_path(org_path, &path, &stream_name); + if (stream_name_len < 0) + return stream_name_len; + if (!stream_name_len) + res = ntfs_fuse_rm(path); + else + res = ntfs_fuse_rm_stream(path, stream_name, stream_name_len); free(path); if (stream_name_len) free(stream_name); return res; } +static int ntfs_fuse_mkdir(const char *path, + mode_t mode __attribute__((unused))) +{ + return ntfs_fuse_create(path, NTFS_DT_DIR); +} + +static int ntfs_fuse_rmdir(const char *path) +{ + return ntfs_fuse_rm(path); +} + +static int ntfs_fuse_utime(const char *path, struct utimbuf *buf) +{ + ntfs_inode *ni; + + if (strchr(path, ':')) + return 0; /* Unable to change time for named data streams. */ + ni = ntfs_pathname_to_inode(ctx->vol, NULL, path); + if (!ni) + return -errno; + if (buf) { + ni->last_access_time = buf->actime; + ni->last_data_change_time = buf->modtime; + ni->last_mft_change_time = buf->modtime; + } else { + time_t now; + + now = time(NULL); + ni->last_access_time = now; + ni->last_data_change_time = now; + ni->last_mft_change_time = now; + } + NInoFileNameSetDirty(ni); + NInoSetDirty(ni); + if (ntfs_inode_close(ni)) + perror("Failed to close inode"); + return 0; +} + #ifdef HAVE_SETXATTR static int ntfs_fuse_getxattr(const char *path, const char *name, @@ -883,6 +1035,9 @@ static struct fuse_operations ntfs_fuse_ .chmod = ntfs_fuse_chmod, .mknod = ntfs_fuse_mknod, .unlink = ntfs_fuse_unlink, + .mkdir = ntfs_fuse_mkdir, + .rmdir = ntfs_fuse_rmdir, + .utime = ntfs_fuse_utime, #ifdef HAVE_SETXATTR .getxattr = ntfs_fuse_getxattr, #if 0 Index: ntfsrm.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsrm.c,v retrieving revision 1.51 retrieving revision 1.52 diff -u -p -r1.51 -r1.52 --- ntfsrm.c 14 Aug 2005 12:26:55 -0000 1.51 +++ ntfsrm.c 14 Aug 2005 15:44:48 -0000 1.52 @@ -276,7 +276,7 @@ static void ntfs_binary_print (u8 num, B */ static const char * ntfsinfo_time_to_str(const s64 sle_ntfs_clock) { - time_t unix_clock = ntfs2utc(sle64_to_cpu(sle_ntfs_clock)); + time_t unix_clock = ntfs2utc(sle_ntfs_clock); if (sle_ntfs_clock == 0) return "none\n"; else Index: ntfsundelete.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsundelete.c,v retrieving revision 1.44 retrieving revision 1.45 diff -u -p -r1.44 -r1.45 --- ntfsundelete.c 4 Aug 2005 09:59:45 -0000 1.44 +++ ntfsundelete.c 14 Aug 2005 15:44:48 -0000 1.45 @@ -876,10 +876,10 @@ static int get_filenames (struct ufile * name->size_data = sle64_to_cpu (attr->data_size); name->flags = attr->file_attributes; - name->date_c = ntfs2utc (sle64_to_cpu (attr->creation_time)); - name->date_a = ntfs2utc (sle64_to_cpu (attr->last_data_change_time)); - name->date_m = ntfs2utc (sle64_to_cpu (attr->last_mft_change_time)); - name->date_r = ntfs2utc (sle64_to_cpu (attr->last_access_time)); + name->date_c = ntfs2utc (attr->creation_time); + name->date_a = ntfs2utc (attr->last_data_change_time); + name->date_m = ntfs2utc (attr->last_mft_change_time); + name->date_r = ntfs2utc (attr->last_access_time); if (ntfs_ucstombs (name->uname, name->uname_len, &name->name, 0) < 0) { @@ -1052,7 +1052,7 @@ static struct ufile * read_record (ntfs_ if (attr10) { STANDARD_INFORMATION *si; si = (STANDARD_INFORMATION *) ((char *) attr10 + le16_to_cpu (attr10->value_offset)); - file->date = ntfs2utc (sle64_to_cpu (si->last_data_change_time)); + file->date = ntfs2utc (si->last_data_change_time); } if (attr20 || !attr10) |
|
From: Yura P. <cha...@us...> - 2005-08-14 15:45:02
|
Changes by: cha0smaster Update of /cvsroot/linux-ntfs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29034 Modified Files: ChangeLog Log Message: Sorry it's very large commit (46K of diffs between my local tree and CVS HEAD before commit), file and directory creation/deletion recursively requested many changes. See ChangeLog for description of all changes. Index: ChangeLog =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v retrieving revision 1.270 retrieving revision 1.271 diff -u -p -r1.270 -r1.271 --- ChangeLog 10 Aug 2005 10:17:03 -0000 1.270 +++ ChangeLog 14 Aug 2005 15:44:46 -0000 1.271 @@ -1,6 +1,5 @@ -xx/xx/2005 - 1.11.3-WIP +xx/xx/2005 - 1.12.0-WIP - - ntfsmount: Fix small memleak. (Yura) - Add ./configure detection for gnutls library and make minimum version 1.2.3 which is the one that has the rsa key export fixed. (Anton) - Put in a minimum version for libgcrypt of 1.2.0 as I do not know if @@ -8,6 +7,32 @@ xx/xx/2005 - 1.11.3-WIP - Fix some memory leaks in ntfsdecrypt and do some cleanups. (Anton) - Fix ntfsdecrypt to also work with passwordless files. Note this requires a patched gnutls library or it still does not work. (Anton) + - Add new APIs for index adding/remove: + index.[ch]::ntfs_index_add_filename and index.[ch]::ntfs_index_rm. + They support only basic cases, so can fail with EOPNOTSUPP. (Yura) + - Add new API for index context reinitialization: + ntfs_index_ctx_reinit. (Yura) + - Add new high-level APIs for file and directory creation/deletion that + rely on ntfs_index_{add_filename,rm}: + dir.[ch]::ntfs_create and dir.[ch]::ntfs_delete. (Yura) + - Add @creation_time field to struct ntfs_inode and rename [acm]time + fields to @last_{data_change,mft_change,access}_time. Update them in + STANDARD_INFORMATION and FILE_NAMEs during inode sync. (Yura) + - layout.h: Add @v1_end and @v3_end markers for offsetof to struct + FILE_NAME_ATTR. Change type of @clusters_per_index_block from u8 to + s8, fix error in comment. Simplify a bit INDEX_ENTRY struct. (Yura) + - ntfstime.h: Use cpu_to_sle64 and sle64_to_cpu in utc2ntfs and + ntfs2utc respectively. Update all users. (Yura) + - Add @indx_record_size and @inx_record_size_bits to struct ntfs_volume. + Set them during mount. (Yura) + - attrib.c: Set RESIDENT_ATTR_IS_INDEXED flag for FILE_NAME attribute in + ntfs_attr_add. (Yura) + - inode.c: Do not sync STANDARD_INFORMATION and FILE_NAMEs for + freed inodes. (Yura) + - mft.c: Set *time and *size fields of struct ntfs_inode in + ntfs_mft_record_alloc. (Yura) + - Make ntfsmount use new APIs for file and directory creation/deletion. + Implement utime operation. (Yura) 08/08/2005 - 1.11.2 - ntfsdecrypt now works and lots of fixes and improvements. |
|
From: Richard R. <fl...@us...> - 2005-08-14 12:27:04
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32148 Modified Files: ntfsrm.c Log Message: remove old version of dt_alloc_children clean up inode handling fix ridiculous mft reading bug mftrec mark free -> set inuse inc attrib instance ids successfully create a file Index: ntfsrm.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsrm.c,v retrieving revision 1.50 retrieving revision 1.51 diff -u -p -r1.50 -r1.51 --- ntfsrm.c 11 Aug 2005 13:59:08 -0000 1.50 +++ ntfsrm.c 14 Aug 2005 12:26:55 -0000 1.51 @@ -385,7 +385,6 @@ static ntfs_inode * ntfs_inode_open3 (nt ino->mft_no = mref; ino->vol = vol; - ino->state = NI_Dirty; ino->data_size = -1; ino->allocated_size = -1; @@ -393,14 +392,14 @@ static ntfs_inode * ntfs_inode_open3 (nt ino->private_data = NULL; ino->ref_count = 1; - if (1 != ntfs_mst_pread (vol->dev, MREF(mref) * vol->mft_record_size, 1, vol->mft_record_size, ino->mrec)) { - printf ("mft record read failed\n"); + if (1 != ntfs_attr_mst_pread (vol->mft_na, MREF(mref) * vol->mft_record_size, 1, vol->mft_record_size, ino->mrec)) { //ntfs_inode_close2 (ino); ??? free (ino->mrec); free (ino); return NULL; } + NInoSetDirty (ino); return ino; } @@ -1233,21 +1232,6 @@ static int ntfs_dt_commit (struct ntfs_d } /** - * ntfs_dt_alloc_children - */ -static INDEX_ENTRY ** ntfs_dt_alloc_children (INDEX_ENTRY **children, int count) -{ - // XXX calculate for 2K and 4K indexes max and min filenames (inc/exc VCN) - int old = (count + 0x1e) & ~0x1f; - int new = (count + 0x1f) & ~0x1f; - - if (old == new) - return children; - - return realloc (children, new * sizeof (INDEX_ENTRY*)); -} - -/** * ntfs_dt_alloc_children2 */ static BOOL ntfs_dt_alloc_children2 (struct ntfs_dt *dt, int count) @@ -1264,7 +1248,12 @@ static BOOL ntfs_dt_alloc_children2 (str dt->sub_nodes = realloc (dt->sub_nodes, new * sizeof (*dt->sub_nodes)); dt->inodes = realloc (dt->inodes, new * sizeof (*dt->inodes)); - // XXX wipe new space + if (!dt->children || !dt->sub_nodes || !dt->inodes) + return FALSE; // dt->child_count = -1 ? + + memset ((u8*)dt->children + old, 0, (new - old) * sizeof (*dt->children)); + memset ((u8*)dt->sub_nodes + old, 0, (new - old) * sizeof (*dt->sub_nodes)); + memset ((u8*)dt->inodes + old, 0, (new - old) * sizeof (*dt->inodes)); return (dt->children && dt->sub_nodes && dt->inodes); } @@ -1303,9 +1292,9 @@ static int ntfs_dt_count_root (struct nt while (ptr < (buffer + size)) { entry = (INDEX_ENTRY*) ptr; - dt->child_count++; - dt->children = ntfs_dt_alloc_children (dt->children, dt->child_count); + dt->child_count++; + ntfs_dt_alloc_children2 (dt, dt->child_count); // XXX retval if (entry->flags & INDEX_ENTRY_NODE) { vcn = ntfs_ie_get_vcn ((INDEX_ENTRY*) ptr); @@ -1327,11 +1316,6 @@ static int ntfs_dt_count_root (struct nt //printf ("count = %d\n\n", dt->child_count); - if (dt->child_count > 0) { - //printf ("%d subnodes\n", dt->child_count); - dt->sub_nodes = calloc (dt->child_count, sizeof (struct ntfs_dt *)); - dt->inodes = calloc (dt->child_count, sizeof (struct ntfs_inode *)); - } return dt->child_count; } @@ -1366,9 +1350,9 @@ static int ntfs_dt_count_alloc (struct n dt->child_count = 0; while (ptr < (buffer + 0x18 + block->index.index_length)) { entry = (INDEX_ENTRY*) ptr; - dt->child_count++; - dt->children = ntfs_dt_alloc_children (dt->children, dt->child_count); + dt->child_count++; + ntfs_dt_alloc_children2 (dt, dt->child_count); // XXX retval if (entry->flags & INDEX_ENTRY_NODE) { vcn = ntfs_ie_get_vcn ((INDEX_ENTRY*) ptr); @@ -1390,12 +1374,6 @@ static int ntfs_dt_count_alloc (struct n } //printf ("count = %d\n", dt->child_count); - if (dt->child_count > 0) { - //printf ("%d subnodes\n", dt->child_count); - dt->sub_nodes = calloc (dt->child_count, sizeof (struct ntfs_dt *)); - dt->inodes = calloc (dt->child_count, sizeof (struct ntfs_inode *)); - } - return dt->child_count; } @@ -2127,33 +2105,39 @@ static int utils_free_non_residents2 (nt /** - * utils_mftrec_mark_free5 + * utils_mftrec_mark_free6 */ -static int utils_mftrec_mark_free5 (ntfs_inode *inode, struct ntfs_bmp *bmp, MFT_REF mref) +static int utils_mftrec_set_inuse6 (ntfs_inode *inode, struct ntfs_bmp *bmp, BOOL inuse) { MFT_RECORD *rec; if (!inode) return -1; - if (ntfs_bmp_set_range (bmp, (VCN) MREF (mref), 1, 0) < 0) + if (ntfs_bmp_set_range (bmp, (VCN) MREF (inode->mft_no), 1, inuse) < 0) return -1; rec = (MFT_RECORD*) inode->mrec; // XXX extent inodes? - if ((rec->flags & MFT_RECORD_IN_USE) == 0) { - Eprintf ("MFT record isn't in use (4).\n"); - return -1; + + if (inuse) { + if ((rec->flags & MFT_RECORD_IN_USE) == 1) { + Eprintf ("MFT record is already in use.\n"); + return -1; + } + rec->flags |= MFT_RECORD_IN_USE; + } else { + if ((rec->flags & MFT_RECORD_IN_USE) == 0) { + Eprintf ("MFT record isn't in use.\n"); + return -1; + } + rec->flags &= ~MFT_RECORD_IN_USE; } - rec->flags &= ~MFT_RECORD_IN_USE; - //printf ("inode %llu, %lu\n", inode->mft_no, inode->state); - NInoSetDirty(inode); - //printf ("inode %llu, %lu\n", inode->mft_no, inode->state); + // XXX inc sequence number - //printf ("\n"); - //utils_dump_mem (buffer, 0, 1024, DM_DEFAULTS); + NInoSetDirty(inode); printf (GREEN "Modified: inode %lld MFT_RECORD header\n" END, inode->mft_no); return 0; @@ -2268,9 +2252,12 @@ static int ntfs_mft_add_attr (ntfs_inode memset (attr, 0, 0x18); *(u32*)((u8*) attr + 0x00) = type; *(u32*)((u8*) attr + 0x04) = data_len + 0x18; + *(u16*)((u8*) attr + 0x0E) = mrec->next_attr_instance; *(u32*)((u8*) attr + 0x10) = data_len; *(u32*)((u8*) attr + 0x14) = 0x18; + mrec->next_attr_instance++; + return 0; } @@ -2834,6 +2821,7 @@ static int ntfs_dt_root_add (struct ntfs add->data = attr; add->data_len += need; + add->header = (INDEX_HEADER*) (add->data + 0x10); add->header->index_length = add->data_len - 16; add->header->allocated_size = add->data_len - 16; @@ -4451,7 +4439,7 @@ static int ntfs_file_remove2 (ntfs_volum bmp_mft = vol->private_bmp1; bmp_vol = vol->private_bmp2; - if (1) utils_mftrec_mark_free5 (ino, bmp_mft, ie->indexed_file); + if (1) utils_mftrec_set_inuse6 (ino, bmp_mft, FALSE); if (1) utils_free_non_residents2 (ino, bmp_vol); @@ -4482,7 +4470,6 @@ static int ntfs_file_add2 (ntfs_volume * ntfschar *uname = NULL; int uname_len = 0; ntfs_inode *ino = NULL; - ntfs_inode *ino2 = NULL; u8 *tmp = NULL; u8 *buffer = NULL; s64 now = 0; @@ -4513,7 +4500,7 @@ static int ntfs_file_add2 (ntfs_volume * goto close; ie = ntfs_ie_create(); - ie = ntfs_ie_set_name (ie, uname, uname_len, FILE_NAME_WIN32); + ie = ntfs_ie_set_name (ie, uname, uname_len, FILE_NAME_POSIX); if (!ie) { printf ("!ie\n"); goto close; @@ -4521,7 +4508,7 @@ static int ntfs_file_add2 (ntfs_volume * // These two NEED the sequence number in the top 8 bits ie->indexed_file = new_num; // MFT Ref: new file - ie->key.file_name.parent_directory = find.mref; // MFT Ref: parent dir + ie->key.file_name.parent_directory = MK_MREF (find.mref, 2);// MFT Ref: parent dir now = utc2ntfs (time(NULL)); ie->key.file_name.creation_time = now; @@ -4535,6 +4522,7 @@ static int ntfs_file_add2 (ntfs_volume * //ntfs_ie_dump (ie); + //printf ("new inode %lld\n", new_num); ino = ntfs_inode_open3 (vol, new_num); if (!ino) { printf ("!ino\n"); @@ -4544,12 +4532,24 @@ static int ntfs_file_add2 (ntfs_volume * //printf ("attributes start at offset 0x%02X\n", ino->mrec->attrs_offset); tmp = (u8*) ino->mrec; + + // Wipe all the attributes memset (tmp + ino->mrec->attrs_offset, 0, vol->mft_record_size - ino->mrec->attrs_offset); + // Add new end marker *(u32*) (tmp + ino->mrec->attrs_offset) = 0xFFFFFFFF; - ino->mrec->bytes_in_use = ino->mrec->attrs_offset + 8; + // Reset headers... + ino->mrec->lsn = 0; + ino->mrec->link_count = 1; + ino->mrec->base_mft_record = 0; + ino->mrec->next_attr_instance = 0; + + utils_mftrec_set_inuse6 (ino, vol->private_bmp1, TRUE); + + ie->indexed_file = MK_MREF (new_num, ino->mrec->sequence_number); + //utils_dump_mem ((u8*)ino->mrec, 0, ino->mrec->bytes_in_use, DM_DEFAULTS); buffer = malloc (128); @@ -4567,7 +4567,9 @@ static int ntfs_file_add2 (ntfs_volume * // File name memset (buffer, 0, 128); - *(u64*)(buffer + 0x00) = find.mref; // MFT Ref of parent dir + printf ("parent = 0x%llX\n", find.mref); + printf ("ino mref = %lld\n", ino->mft_no); + *(u64*)(buffer + 0x00) = MK_MREF (find.mref, 2); // MFT Ref of parent dir *(u64*)(buffer + 0x08) = now; // Time *(u64*)(buffer + 0x10) = now; // Time *(u64*)(buffer + 0x18) = now; // Time @@ -4577,7 +4579,7 @@ static int ntfs_file_add2 (ntfs_volume * *(u32*)(buffer + 0x38) = 0; // Flags *(u32*)(buffer + 0x3C) = 0; // Not relevant *(u8* )(buffer + 0x40) = uname_len; // Filename length - *(u8* )(buffer + 0x41) = FILE_NAME_WIN32;// Filename namespace + *(u8* )(buffer + 0x41) = FILE_NAME_POSIX;// Filename namespace memcpy (buffer + 0x42, uname, uname_len * sizeof (ntfschar)); ntfs_mft_add_attr (ino, AT_FILE_NAME, buffer, ATTR_SIZE (0x42 + (uname_len * sizeof (ntfschar)))); //utils_dump_mem (buffer, 0, 0x50, DM_DEFAULTS); @@ -4589,26 +4591,24 @@ static int ntfs_file_add2 (ntfs_volume * //utils_dump_mem ((u8*)ino->mrec, 0, ino->mrec->bytes_in_use, DM_DEFAULTS); //printf ("orig inode = %p\n", find.inode); - dt = find.inode->private_data; - dir = dt->dir; - //printf ("dt = %p\n", dt); - //printf ("dir = %p\n", dir); - //printf ("num = %lld\n", dir->mft_num); - //printf ("\n"); - - ino2 = find.dt->inodes[find.dt_index]; - //printf ("num = %lld\n", ino2->mft_no); - //printf ("data = %p\n", ino2->private_data); - //printf ("children = %p\n", dir->children); - //printf ("child? = %p\n", dir->children[find.dt_index]); - - if (0) ntfs_dir_map (vol, dir); + dir = dt->dir->children[0]; + dt = dir->index; + printf ("dir = %p (%lld)\n", dir, MREF (dir->mft_num)); + printf ("dt = %p (%d)\n", dt, dt->child_count); + printf ("\n"); //printf ("\n"); //utils_dump_mem (dt->data, 0, dt->data_len, DM_DEFAULTS); //printf ("\n"); - //ntfs_dt_root_add (dt, ie); + ntfs_dt_root_add (dt, ie); + ino->ref_count++; + dt->inodes[0] = ino; + + *(((u8*) ino->mrec) + 166) = RESIDENT_ATTR_IS_INDEXED; + *(((u8*) ino->mrec) + 154) = 0x18; // offset to name + + // add inode to dt's list //printf ("\n"); //utils_dump_mem (dt->data, 0, dt->data_len, DM_DEFAULTS); @@ -4754,6 +4754,7 @@ done: if (0) ntfs_dt_root_add (NULL, NULL); if (0) ntfs_dt_alloc_add (NULL, NULL); if (0) utils_pathname_to_inode2 (NULL, NULL, NULL, NULL); + if (0) ntfs_dir_map (NULL, NULL); return result; } |
|
From: Anton A. <an...@us...> - 2005-08-14 06:16:42
|
Changes by: antona Update of /cvsroot/linux-ntfs/ntfsprogs/include/ntfs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13097/include/ntfs Modified Files: layout.h Log Message: Update for more correct EFS information. Index: layout.h =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/layout.h,v retrieving revision 1.25 retrieving revision 1.26 diff -u -p -r1.25 -r1.26 --- layout.h 29 Jul 2005 09:54:02 -0000 1.25 +++ layout.h 14 Aug 2005 06:16:35 -0000 1.26 @@ -2388,10 +2388,10 @@ typedef struct { /* The header of the 0x100 attribute named "$EFS". */ typedef struct { -/* 0*/ u32 efs_length; /* Length of attribute in bytes. */ - u32 unknown1; /* always 0? */ - u32 unknown2; /* number of DDFs? */ - u32 unknown3; /* number of DRFs? */ +/* 0*/ u32 length; /* Length of EFS attribute in bytes. */ + u32 state; /* Always 0? */ + u32 version; /* Efs version. Always 2? */ + u32 crypto_api_version; /* Always 0? */ /* 16*/ u8 unknown4[16]; /* MD5 hash of decrypted FEK? */ /* 32*/ u8 unknown5[16]; /* MD5 hash of DDFs? */ /* 48*/ u8 unknown6[16]; /* MD5 hash of DRFs? */ @@ -2401,6 +2401,7 @@ typedef struct { u32 offset_to_drf_array;/* Offset in bytes to the array of data recovery fields (DRF), see below. Zero if no DRFs are present. */ + u32 reserved; /* Reserved. */ } __attribute__ ((__packed__)) EFS_ATTR_HEADER; typedef struct { @@ -2416,19 +2417,46 @@ typedef struct { encryption key (FEK). */ u32 fek_offset; /* Offset in bytes to the FEK from the start of the data decryption/recovery field. */ -/* 16*/ u32 unknown1; /* always 0? */ +/* 16*/ u32 unknown1; /* always 0? Might be just padding. */ } __attribute__ ((__packed__)) EFS_DF_HEADER; typedef struct { /* 0*/ u32 cred_length; /* Length of this credential in bytes. */ u32 sid_offset; /* Offset in bytes to the user's sid from start - of this structure. */ - u32 cred_version; /* always 3? */ - u32 cert_header_size; /* Size in bytes of the certificate header. */ -/* 16*/ u32 cert_header_offset; /* Offset in bytes to the certificate header - from start of this structure. */ - u32 unknown1; /* always 0? */ - u32 unknown2; /* always 0? */ + of this structure. Zero if no sid is + present. */ +/* 8*/ u32 type; /* Type of this credential: + 1 = CryptoAPI container. + 2 = Unexpected type. + 3 = Certificate thumbprint. + other = Unknown type. */ + union { + /* CryptoAPI container. */ + struct { +/* 12*/ u32 container_name_offset; /* Offset in bytes to + the name of the container from start of this + structure (may not be zero). */ +/* 16*/ u32 provider_name_offset; /* Offset in bytes to + the name of the provider from start of this + structure (may not be zero). */ + u32 public_key_blob_offset; /* Offset in bytes to + the public key blob from start of this + structure. */ +/* 24*/ u32 public_key_blob_size; /* Size in bytes of + public key blob. */ + } __attribute__ ((__packed__)); + /* Certificate thumbprint. */ + struct { +/* 12*/ u32 cert_thumbprint_header_size; /* Size in + bytes of the header of the certificate + thumbprint. */ +/* 16*/ u32 cert_thumbprint_header_offset; /* Offset in + bytes to the header of the certificate + thumbprint from start of this structure. */ + u32 unknown1; /* Always 0? Might be padding... */ + u32 unknown2; /* Always 0? Might be padding... */ + } __attribute__ ((__packed__)); + } __attribute__ ((__packed__)); } __attribute__ ((__packed__)) EFS_DF_CREDENTIAL_HEADER; typedef EFS_DF_CREDENTIAL_HEADER EFS_DF_CRED_HEADER; @@ -2436,16 +2464,19 @@ typedef EFS_DF_CREDENTIAL_HEADER EFS_DF_ typedef struct { /* 0*/ u32 thumbprint_offset; /* Offset in bytes to the thumbprint. */ u32 thumbprint_size; /* Size of thumbprint in bytes. */ -/* 8*/ u32 guid_offset; /* Offset in bytes to GUID from start - if this structure or 0 if no GUID - present. */ - u32 container_name_offset; /* Offset in bytes to the name of the +/* 8*/ u32 container_name_offset; /* Offset in bytes to the name of the container from start of this structure or 0 if no name present. */ + u32 provider_name_offset; /* Offset in bytes to the name of the + cryptographic provider from start of + this structure or 0 if no name + present. */ /* 16*/ u32 user_name_offset; /* Offset in bytes to the user name - from start of this structure. */ -} __attribute__ ((__packed__)) EFS_DF_CERTIFICATE_HEADER; + from start of this structure or 0 if + no user name present. (This is also + known as lpDisplayInformation.) */ +} __attribute__ ((__packed__)) EFS_DF_CERTIFICATE_THUMBPRINT_HEADER; -typedef EFS_DF_CERTIFICATE_HEADER EFS_DF_CERT_HEADER; +typedef EFS_DF_CERTIFICATE_THUMBPRINT_HEADER EFS_DF_CERT_THUMBPRINT_HEADER; #endif /* defined _NTFS_LAYOUT_H */ |
|
From: Richard R. <fl...@us...> - 2005-08-11 13:59:24
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29640 Modified Files: ntfsrm.c Log Message: more code to start testing add keep track of dir names Index: ntfsrm.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsrm.c,v retrieving revision 1.49 retrieving revision 1.50 diff -u -p -r1.49 -r1.50 --- ntfsrm.c 4 Aug 2005 09:59:45 -0000 1.49 +++ ntfsrm.c 11 Aug 2005 13:59:08 -0000 1.50 @@ -363,6 +363,48 @@ static ntfs_inode * ntfs_inode_open2 (nt } /** + * ntfs_inode_open3 + * open a deleted inode + */ +static ntfs_inode * ntfs_inode_open3 (ntfs_volume *vol, const MFT_REF mref) +{ + ntfs_inode *ino = NULL; + + if (!vol) + return NULL; + + ino = calloc (1, sizeof (*ino)); + if (!ino) + return NULL; + + ino->mrec = malloc (vol->mft_record_size); + if (!ino->mrec) { + free (ino); + return NULL; + } + + ino->mft_no = mref; + ino->vol = vol; + ino->state = NI_Dirty; + + ino->data_size = -1; + ino->allocated_size = -1; + + ino->private_data = NULL; + ino->ref_count = 1; + + if (1 != ntfs_mst_pread (vol->dev, MREF(mref) * vol->mft_record_size, 1, vol->mft_record_size, ino->mrec)) { + printf ("mft record read failed\n"); + //ntfs_inode_close2 (ino); ??? + free (ino->mrec); + free (ino); + return NULL; + } + + return ino; +} + +/** * ntfs_inode_close2 */ static int ntfs_inode_close2 (ntfs_inode *ni) @@ -814,7 +856,7 @@ static INDEX_ENTRY * ntfs_ie_create (voi INDEX_ENTRY *ie; length = 16; - ie = malloc (length); + ie = calloc (1, length); if (!ie) return NULL; @@ -920,20 +962,20 @@ static INDEX_ENTRY * ntfs_ie_set_name (I * VCN vcn; */ - printf ("key length = 0x%02X\n", ie->key_length); - printf ("new name length = %d\n", namelen); + //printf ("key length = 0x%02X\n", ie->key_length); + //printf ("new name length = %d\n", namelen); if (ie->key_length > 0) { file = &ie->key.file_name; - printf ("filename, length %d\n", file->file_name_length); + //printf ("filename, length %d\n", file->file_name_length); need = ATTR_SIZE (namelen * sizeof (ntfschar) + 2) - ATTR_SIZE (file->file_name_length * sizeof (ntfschar) + 2); } else { - printf ("no filename\n"); + //printf ("no filename\n"); need = ATTR_SIZE (sizeof (FILE_NAME_ATTR) + (namelen * sizeof (ntfschar))); wipe = TRUE; } - printf ("need 0x%02X bytes\n", need); + //printf ("need 0x%02X bytes\n", need); if (need != 0) { if (ie->flags & INDEX_ENTRY_NODE) @@ -942,7 +984,7 @@ static INDEX_ENTRY * ntfs_ie_set_name (I ie->length += need; ie->key_length += need; - printf ("realloc 0x%02X\n", ie->length); + //printf ("realloc 0x%02X\n", ie->length); ie = realloc (ie, ie->length); if (!ie) return NULL; @@ -2177,6 +2219,62 @@ static int ntfs_mft_remove_attr (struct } /** + * ntfs_mft_add_attr + */ +static int ntfs_mft_add_attr (ntfs_inode *inode, ATTR_TYPES type, u8 *data, int data_len) +{ + MFT_RECORD *mrec; + ATTR_RECORD *attr; + u8 *ptr; + u8 *src; + u8 *dst; + int len; + + if (!inode) + return 1; + if (!data) + return 1; + + mrec = inode->mrec; + if (!mrec) + return 1; + + ptr = (u8*) inode->mrec + mrec->attrs_offset; + while (1) { + attr = (ATTR_RECORD*) ptr; + + if (type < attr->type) + break; + + ptr += attr->length; + } + + //printf ("insert before attr 0x%02X\n", attr->type); + + len = ((u8*) mrec + mrec->bytes_in_use) - ((u8*) attr); + src = (u8*) attr; + dst = src + data_len + 0x18; + + memmove (dst, src, len); + + src = data; + dst = (u8*) attr + 0x18; + len = data_len; + + memcpy (dst, src, len); + + mrec->bytes_in_use += data_len + 0x18; + + memset (attr, 0, 0x18); + *(u32*)((u8*) attr + 0x00) = type; + *(u32*)((u8*) attr + 0x04) = data_len + 0x18; + *(u32*)((u8*) attr + 0x10) = data_len; + *(u32*)((u8*) attr + 0x14) = 0x18; + + return 0; +} + +/** * ntfs_mft_resize_resident */ static int ntfs_mft_resize_resident (ntfs_inode *inode, ATTR_TYPES type, ntfschar *name, int name_len, u8 *data, int data_len) @@ -2670,7 +2768,7 @@ static BOOL ntfs_dt_alloc_remove (struct printf ("indx is empty\n"); ntfs_bmp_set_range (del->dir->bitmap, del->vcn, 1, 0); } - + return TRUE; } @@ -3402,6 +3500,7 @@ static void ntfs_dir_free (struct ntfs_d for (i = 0; i < dir->child_count; i++) ntfs_dir_free (dir->children[i]); + free (dir->name); free (dir->children); free (dir); } @@ -3413,8 +3512,9 @@ static struct ntfs_dir * ntfs_dir_alloc { struct ntfs_dir *dir = NULL; ntfs_inode *inode = NULL; - ATTR_RECORD *rec = NULL; - INDEX_ROOT *ir = NULL; + ATTR_RECORD *rec = NULL; + INDEX_ROOT *ir = NULL; + FILE_NAME_ATTR *name = NULL; if (!vol) return NULL; @@ -3434,6 +3534,11 @@ static struct ntfs_dir * ntfs_dir_alloc dir->iroot = ntfs_attr_open (inode, AT_INDEX_ROOT, I30, 4); dir->ialloc = ntfs_attr_open (inode, AT_INDEX_ALLOCATION, I30, 4); + if (!dir->iroot) { + ntfs_dir_free (dir); + return NULL; + } + dir->vol = vol; dir->parent = NULL; dir->name = NULL; @@ -3454,10 +3559,13 @@ static struct ntfs_dir * ntfs_dir_alloc dir->index_size = 0; } - if (!dir->iroot) { - ntfs_dir_free (dir); - return NULL; - } + // Finally, find the dir's name + rec = find_first_attribute (AT_FILE_NAME, inode->mrec); + name = (FILE_NAME_ATTR*) ((u8*)rec + rec->value_offset); + + dir->name_len = name->file_name_length; + dir->name = malloc (sizeof (ntfschar) * dir->name_len); + memcpy (dir->name, name->file_name, sizeof (ntfschar) * dir->name_len); return dir; } @@ -3529,6 +3637,42 @@ static struct ntfs_dir * ntfs_dir_find2 return child; } +/** + * ntfs_dir_map + */ +static int ntfs_dir_map (ntfs_volume *vol, struct ntfs_dir *dir) +{ + //struct ntfs_dt *dt; + + if (!vol) + return 1; + if (!dir) + return 1; + +#if 0 + printf ("dir = %p\n", dir); + printf ("vol = %p\n", dir->vol); + printf ("parent = %p\n", dir->parent); + printf ("name = "); ntfs_name_print (dir->name, dir->name_len); printf ("\n"); + printf ("mftnum = %lld\n", MREF (dir->mft_num)); + printf ("dt = %p\n", dir->index); + printf ("children = %p (%d)\n", dir->children, dir->child_count); + printf ("bitmap = %p\n", dir->bitmap); + printf ("inode = %p\n", dir->inode); + printf ("iroot = %p\n", dir->iroot); + printf ("ialloc = %p\n", dir->ialloc); + printf ("isize = %d\n", dir->index_size); +#endif + + //dt->data_len = dir->iroot->allocated_size; + //dt->data = malloc (dt->data_len); + //ntfs_attr_pread (dir->iroot, 0, dt->data_len, dt->data); + + //ntfs_dt_count_root (dt); + + return 0; +} + /** * utils_volume_commit @@ -3793,7 +3937,9 @@ static BOOL utils_pathname_to_inode2 (nt goto close; } - //printf ("looking for %s\n", p); + //printf ("looking for %s in dir %lld\n", p, MREF (dir->mft_num)); + //printf ("dir: index = %p, children = %p, inode = %p, iroot = %p, ialloc = %p, count = %d\n", dir->index, dir->children, dir->inode, dir->iroot, dir->ialloc, dir->child_count); + //if (dir->parent) if (q) { child = ntfs_dir_find2 (dir, unicode, len); if (!child) { @@ -3809,6 +3955,18 @@ static BOOL utils_pathname_to_inode2 (nt goto close; } + //printf ("dt's flags = 0x%08x\n", dt->children[dt_num]->key.file_name.file_attributes); + if (dt->children[dt_num]->key.file_name.file_attributes == FILE_ATTR_DUP_FILE_NAME_INDEX_PRESENT) { + //printf ("DIR\n"); + child = ntfs_dir_alloc (dir->vol, dt->children[dt_num]->indexed_file); + //printf ("child = %p (%lld)\n", child, MREF (dt->children[dt_num]->indexed_file)); + if (child) { + child->index = ntfs_dt_alloc (child, NULL, -1); + ntfs_dir_add (dir, child); + } + + } + if (dt->inodes[dt_num] == NULL) { dt->inodes[dt_num] = ntfs_inode_open (dir->vol, dt->children[dt_num]->indexed_file); if (!dt->inodes[dt_num]) { @@ -3820,7 +3978,6 @@ static BOOL utils_pathname_to_inode2 (nt } //printf ("dt = %p,%d\n", dt, dt_num); - break; } @@ -3844,6 +4001,26 @@ close: return result; } +/** + * utils_mft_find_free_entry + */ +static s64 utils_mft_find_free_entry (ntfs_volume *vol) +{ + MFT_REF i; + u64 recs; + + if (!vol) + return -1; + + recs = vol->mft_na->initialized_size >> vol->mft_record_size_bits; + //printf ("mft contains %lld records\n", recs); + for (i = 24; i < recs; i++) { + if (utils_mftrec_in_use (vol, i) == 0) + return i; + } + return -1; +} + /** * ntfs_index_dump_alloc @@ -3887,8 +4064,8 @@ static int ntfs_index_dump_alloc (ntfs_a if (entry->flags & INDEX_ENTRY_END) break; } - printf ("%.*s", indent, space_line); - printf ("fill = %u/%u\n", (unsigned)block->index.index_length, (unsigned)block->index.allocated_size); + //printf ("%.*s", indent, space_line); + //printf ("fill = %u/%u\n", (unsigned)block->index.index_length, (unsigned)block->index.allocated_size); return 0; } @@ -3947,7 +4124,7 @@ static int ntfs_index_dump (ntfs_inode * ntfs_attr_close (iroot); ntfs_attr_close (ialloc); - printf ("fill = %d\n", ptr - buffer); + //printf ("fill = %d\n", ptr - buffer); return 0; } @@ -4079,14 +4256,27 @@ static int ntfs_file_remove (ntfs_volume // find the key nearest the root which has no descendants printf ("\n"); printf (BOLD YELLOW "Find childless parent:\n" END); +#if 0 for (par = del->parent, old = par; par; old = par, par = par->parent) { + printf (CYAN "marker 1\n" END); if (par->child_count > 1) break; + printf (CYAN "marker 2\n" END); par_num = ntfs_dt_find_parent (par); } +#endif + + printf (CYAN "marker 3\n" END); fflush (stdout); + printf ("del = %p, parent = %p\n", del, del->parent); + par = del->parent; + par_num = ntfs_dt_find_parent (del); + printf (CYAN "marker 4\n" END); fflush (stdout); //utils_dump_mem (par->data, 0, par->data_len, DM_BLUE|DM_GREEN|DM_INDENT); + printf ("par = %p, par->parent = %p, num = %d\n", par, par->parent, par_num); + par_num = 0; // TEMP + if (par) { file = &par->children[par_num]->key.file_name; printf ("\tpar name: "); @@ -4280,6 +4470,160 @@ static int ntfs_file_remove2 (ntfs_volum } /** + * ntfs_file_add2 + */ +static int ntfs_file_add2 (ntfs_volume *vol, char *filename) +{ + MFT_REF new_num; + char *ptr = NULL; + char *dirname = NULL; + struct ntfs_find find; + INDEX_ENTRY *ie; + ntfschar *uname = NULL; + int uname_len = 0; + ntfs_inode *ino = NULL; + ntfs_inode *ino2 = NULL; + u8 *tmp = NULL; + u8 *buffer = NULL; + s64 now = 0; + struct ntfs_dir *dir; + struct ntfs_dt *dt; + + new_num = utils_mft_find_free_entry (vol); + if (new_num == (MFT_REF) -1) + return 1; + + if (rindex (filename, PATH_SEP)) { + ptr = rindex (filename, PATH_SEP); + *ptr = 0; + dirname = filename; + filename = ptr + 1; + } + + if (utils_pathname_to_inode2 (vol, NULL, dirname, &find) == FALSE) { + printf ("!inode\n"); + return 0; + } + + dt = find.dt; + dir = find.dir; + + uname_len = ntfs_mbstoucs(filename, &uname, 0); + if (uname_len < 0) + goto close; + + ie = ntfs_ie_create(); + ie = ntfs_ie_set_name (ie, uname, uname_len, FILE_NAME_WIN32); + if (!ie) { + printf ("!ie\n"); + goto close; + } + + // These two NEED the sequence number in the top 8 bits + ie->indexed_file = new_num; // MFT Ref: new file + ie->key.file_name.parent_directory = find.mref; // MFT Ref: parent dir + + now = utc2ntfs (time(NULL)); + ie->key.file_name.creation_time = now; + ie->key.file_name.last_data_change_time = now; + ie->key.file_name.last_mft_change_time = now; + ie->key.file_name.last_access_time = now; + + // Need to be filled in later + ie->key.file_name.allocated_size = 0; + ie->key.file_name.data_size = 0; + + //ntfs_ie_dump (ie); + + ino = ntfs_inode_open3 (vol, new_num); + if (!ino) { + printf ("!ino\n"); + goto close; + } + + //printf ("attributes start at offset 0x%02X\n", ino->mrec->attrs_offset); + + tmp = (u8*) ino->mrec; + memset (tmp + ino->mrec->attrs_offset, 0, vol->mft_record_size - ino->mrec->attrs_offset); + + *(u32*) (tmp + ino->mrec->attrs_offset) = 0xFFFFFFFF; + + ino->mrec->bytes_in_use = ino->mrec->attrs_offset + 8; + + //utils_dump_mem ((u8*)ino->mrec, 0, ino->mrec->bytes_in_use, DM_DEFAULTS); + + buffer = malloc (128); + if (!buffer) + goto close; + + // Standard information + memset (buffer, 0, 128); + *(u64*)(buffer + 0x00) = now; // Time + *(u64*)(buffer + 0x08) = now; // Time + *(u64*)(buffer + 0x10) = now; // Time + *(u64*)(buffer + 0x18) = now; // Time + ntfs_mft_add_attr (ino, AT_STANDARD_INFORMATION, buffer, 0x48); + //utils_dump_mem (buffer, 0, 0x48, DM_DEFAULTS); + + // File name + memset (buffer, 0, 128); + *(u64*)(buffer + 0x00) = find.mref; // MFT Ref of parent dir + *(u64*)(buffer + 0x08) = now; // Time + *(u64*)(buffer + 0x10) = now; // Time + *(u64*)(buffer + 0x18) = now; // Time + *(u64*)(buffer + 0x20) = now; // Time + *(u64*)(buffer + 0x28) = 0; // Allocated size + *(u64*)(buffer + 0x30) = 0; // Initialised size + *(u32*)(buffer + 0x38) = 0; // Flags + *(u32*)(buffer + 0x3C) = 0; // Not relevant + *(u8* )(buffer + 0x40) = uname_len; // Filename length + *(u8* )(buffer + 0x41) = FILE_NAME_WIN32;// Filename namespace + memcpy (buffer + 0x42, uname, uname_len * sizeof (ntfschar)); + ntfs_mft_add_attr (ino, AT_FILE_NAME, buffer, ATTR_SIZE (0x42 + (uname_len * sizeof (ntfschar)))); + //utils_dump_mem (buffer, 0, 0x50, DM_DEFAULTS); + + // Data + memset (buffer, 0, 128); + ntfs_mft_add_attr (ino, AT_DATA, buffer, 0); + + //utils_dump_mem ((u8*)ino->mrec, 0, ino->mrec->bytes_in_use, DM_DEFAULTS); + + //printf ("orig inode = %p\n", find.inode); + dt = find.inode->private_data; + dir = dt->dir; + //printf ("dt = %p\n", dt); + //printf ("dir = %p\n", dir); + //printf ("num = %lld\n", dir->mft_num); + //printf ("\n"); + + ino2 = find.dt->inodes[find.dt_index]; + //printf ("num = %lld\n", ino2->mft_no); + //printf ("data = %p\n", ino2->private_data); + //printf ("children = %p\n", dir->children); + //printf ("child? = %p\n", dir->children[find.dt_index]); + + if (0) ntfs_dir_map (vol, dir); + + //printf ("\n"); + //utils_dump_mem (dt->data, 0, dt->data_len, DM_DEFAULTS); + //printf ("\n"); + + //ntfs_dt_root_add (dt, ie); + + //printf ("\n"); + //utils_dump_mem (dt->data, 0, dt->data_len, DM_DEFAULTS); + //printf ("\n"); + +close: + free (buffer); + ntfs_inode_close2 (ino); + free (ie); + free (uname); + ntfs_inode_close2 (find.inode); + return 0; +} + +/** * ntfs_test_bmp2 */ static int ntfs_test_bmp2 (ntfs_volume *vol) @@ -4383,27 +4727,33 @@ int main (int argc, char *argv[]) goto done; } +#if 0 if (utils_pathname_to_inode2 (vol, NULL, opts.file, &find) == FALSE) { printf ("!inode\n"); goto done; } inode = find.inode; +#endif //printf ("inode = %lld\n", inode->mft_no); if (0) result = ntfs_index_dump (inode); if (0) result = ntfs_ie_test(); - if (1) result = ntfs_file_remove2 (vol, find.dt, find.dt_index); + if (0) result = ntfs_file_remove2 (vol, find.dt, find.dt_index); + if (1) result = ntfs_file_add2 (vol, opts.file); if (0) result = ntfs_test_bmp2 (vol); done: - if (1) ntfs_inode_close2 (inode); + if (1) utils_volume_commit (vol); + if (0) utils_volume_rollback (vol); + if (0) ntfs_inode_close2 (inode); if (1) ntfs_umount2 (vol, FALSE); if (0) ntfs_binary_print (0, FALSE, FALSE); if (0) ntfs_dt_root_add (NULL, NULL); if (0) ntfs_dt_alloc_add (NULL, NULL); + if (0) utils_pathname_to_inode2 (NULL, NULL, NULL, NULL); return result; } |
|
From: Richard R. <fl...@us...> - 2005-08-11 13:53:16
|
Changes by: flatcap Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28162 Modified Files: ntfsls.c Log Message: display year in long listing Index: ntfsls.c =================================================================== RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsls.c,v retrieving revision 1.26 retrieving revision 1.27 diff -u -p -r1.26 -r1.27 --- ntfsls.c 4 Aug 2005 09:59:45 -0000 1.26 +++ ntfsls.c 11 Aug 2005 13:53:08 -0000 1.27 @@ -551,7 +551,8 @@ static int list_dir_entry(ntfsls_dirent ntfs_time = ntfs2utc(sle64_to_cpu( file_name_attr->last_data_change_time)); strcpy(t_buf, ctime(&ntfs_time)); - t_buf[16] = '\0'; + memmove(t_buf+16, t_buf+19, 5); + t_buf[21] = '\0'; if (dt_type != NTFS_DT_DIR) { if (!ntfs_attr_lookup(AT_DATA, AT_UNNAMED, 0, 0, 0, |
