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: Yuval <uv...@de...> - 2006-10-27 13:06:44
|
Changes by: uvman Update of /cvs/linux-ntfs/ntfsprogs In directory delta357:/tmp/cvs-serv16680 Modified Files: CREDITS Log Message: Oops, edited the wrong file. Add zhanglinbao to CREDITS for his big-endiness testing and fixes. Add my mail address. anti-spam changes (if it helps nowdays). Misc changes. (Yuval) Index: CREDITS =================================================================== RCS file: /cvs/linux-ntfs/ntfsprogs/CREDITS,v retrieving revision 1.27 retrieving revision 1.28 diff -u -p -r1.27 -r1.28 --- CREDITS 27 Oct 2006 13:00:08 -0000 1.27 +++ CREDITS 27 Oct 2006 13:06:11 -0000 1.28 @@ -6,34 +6,33 @@ The list is sorted alphabetically, so pl Please contact <linux-ntfs-dev at lists.sf.net> if you believe someone is missing or if you prefer not to be listed. +Alexei Alexandrov <alex_alexandrov at hotmail.com> +Anton Altaparmakov <aia21 at cantab.net> +Albert D. Cahalan <acahalan at cs.uml.edu> +Russ Christensen <rchriste at cs.utah.edu> +Pete Curran <curran at rpi.edu> +Mario Emmenlauer <mario at emmenlauer.de> +Andras Erdei <ccg at freemail.hu> +Matthew J. Fanto <mattjf at uncompiled.com> +Yuval Fledel <yuvalfl at gmail.com> +Marcin GibuÅa <m.gibula at conecto.pl> +Christophe Grenier <grenier at cgsecurity.org> +Ian Jackson <ian at davenant.greenend.org.uk> +Carmelo Kintana <kintana at berkeley.edu> +Jan Kratochvil <project-captive at jankratochvil.net> +Lode Leroy <lode_leroy at hotmail.com> +David MartÃnez Moreno <ender at debian.org> +Giang Nguyen <cauthu at hotmail.com> +Leonard NorrgÃ¥rd <vinsci at nic.funet.fi> +Holger Ohmacht <holger.ohmacht at web.de> +Per Olofsson <pelle at dsv.su.se> +Yura Pakhuchiy <pakhuchiy at gmail.com> +Yuri Per <yuri at acronis.com> +Richard Russon <ntfs at flatcap.org> +Erik Sørnes <erso1970 at yahoo.no> +Szabolcs Szakacsits <szaka at sienet.hu> +zhanglinbao <zhanglinbao2000 at 163.com> -Alexei Alexandrov <ale...@ho...> -Anton Altaparmakov <ai...@ca...> -Albert D. Cahalan <aca...@cs...> -Russ Christensen <rch...@cs...> -Pete Curran <cu...@rp...> -Mario Emmenlauer <ma...@em...> -Andras Erdei <cc...@fr...> -Matthew J. Fanto <ma...@un...> -Yuval Fledel (no email address on request) -Marcin GibuÅa <m.g...@co...> -Christophe Grenier <gr...@cg...> -Ian Jackson <ia...@da...> -Carmelo Kintana <ki...@be...> -Jan Kratochvil <pro...@ja...> -Lode Leroy <lod...@ho...> -David MartÃnez Moreno <en...@de...> -Giang Nguyen <ca...@ho...> -Leonard NorrgÃ¥rd <vi...@ni...> -Holger Ohmacht <hol...@we...> -Per Olofsson <pe...@ds...> -Yura Pakhuchiy <pak...@gm...> -Yuri Per <yu...@ac...> -Richard Russon <nt...@fl...> -Erik Sørnes <ers...@ya...> -Szabolcs Szakacsits <sz...@si...> - -Also, various code snippets and especially the autoconf/automake automated -configuration, compilation and installation system have been ripped shamelessly -from numerous different GNU and Gnome utilities and libraries so "Many thanks!" +Configuration, compilation and installation system are originally based on +numerous different GNU and Gnome utilities and libraries so "Many thanks!" to all the people who have participated in their creation! |
|
From: Yuval <uv...@de...> - 2006-10-27 13:00:40
|
Changes by: uvman Update of /cvs/linux-ntfs/ntfsprogs In directory delta357:/tmp/cvs-serv15955 Modified Files: AUTHORS CREDITS autogen.sh Log Message: Change contact address to -dev. Add Mario to project members. Add zhanglinbao to CREDITS for his big-endiness testing and fixes. Add my mail address. anti-spam changes (if it helps nowdays). Misc changes. (Yuval, Szaka) Index: AUTHORS =================================================================== RCS file: /cvs/linux-ntfs/ntfsprogs/AUTHORS,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- AUTHORS 20 Jun 2005 14:31:30 -0000 1.12 +++ AUTHORS 27 Oct 2006 13:00:08 -0000 1.13 @@ -1,10 +1,12 @@ -ntfsprogs is written and maintained by Anton Altaparmakov <ai...@ca...>. +ntfsprogs is written and maintained by the Linux-NTFS project, you can contact +us at <linux-ntfs-dev at lists.sf.net>. -Current active developers on the project are (in alphabetical order): +Current active project members are (in alphabetical order): -Anton Altaparmakov <ai...@ca...> -Yuval Fledel (no email address on request) -Yura Pakhuchiy <pak...@gm...> -Richard Russon <nt...@fl...> -Szakacsits Szabolcs <sz...@si...> +Anton Altaparmakov <aia21 at cantab.net> +Mario Emmenlauer <mario at emmenlauer.de> +Yuval Fledel <yuvalfl at gmail.com> +Yura Pakhuchiy <pakhuchiy at gmail.com> +Richard Russon <ntfs at flatcap.org> +Szabolcs Szakacsits <szaka at sienet.hu> Index: CREDITS =================================================================== RCS file: /cvs/linux-ntfs/ntfsprogs/CREDITS,v retrieving revision 1.26 retrieving revision 1.27 diff -u -p -r1.26 -r1.27 --- CREDITS 23 Feb 2006 00:36:33 -0000 1.26 +++ CREDITS 27 Oct 2006 13:00:08 -0000 1.27 @@ -3,8 +3,8 @@ project. The list is sorted alphabetically, so please keep it this way! -Please let me know (email Anton Altaparmakov <ai...@ca...>) if you believe -someone is missing or if you prefer to not be listed. +Please contact <linux-ntfs-dev at lists.sf.net> if you believe someone is +missing or if you prefer not to be listed. Alexei Alexandrov <ale...@ho...> Index: autogen.sh =================================================================== RCS file: /cvs/linux-ntfs/ntfsprogs/autogen.sh,v retrieving revision 1.9 retrieving revision 1.10 diff -u -p -r1.9 -r1.10 --- autogen.sh 20 Jun 2005 14:31:42 -0000 1.9 +++ autogen.sh 27 Oct 2006 13:00:08 -0000 1.10 @@ -1,5 +1,5 @@ #!/bin/bash -# Run this to generate all the initial makefiles, etc. +# Run this to generate configure, Makefile.in's, etc if test "$srcdir" == ""; then srcdir=. |
Changes by: uvman
Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357:/tmp/cvs-serv10841/libntfs
Modified Files:
attrib.c dir.c index.c inode.c runlist.c unistr.c unix_io.c
volume.c
Log Message:
Whitespace cleanup
Index: attrib.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.226
retrieving revision 1.227
diff -u -p -r1.226 -r1.227
--- attrib.c 26 Oct 2006 20:45:28 -0000 1.226
+++ attrib.c 27 Oct 2006 12:24:30 -0000 1.227
@@ -3861,7 +3861,7 @@ static int ntfs_resident_attr_resize(ntf
goto put_err_out;
}
- /*
+ /*
* Force index allocation creation instead of moving out index root
* from the base MFT record.
*/
@@ -4988,21 +4988,21 @@ int ntfs_attr_truncate(ntfs_attr *na, co
ntfs_inode_update_time(na->ni);
return ret;
}
-
+
/**
* ntfs_attr_readall - read the entire data from an ntfs attribute
* @ni: open ntfs inode in which the ntfs attribute resides
* @type: attribute type
* @name: attribute name in little endian Unicode or AT_UNNAMED or NULL
* @name_len: length of attribute @name in Unicode characters (if @name given)
- * @data_size: if non-NULL then store here the data size
+ * @data_size: if non-NULL then store here the data size
*
* This function will read the entire content of an ntfs attribute.
* If @name is AT_UNNAMED then look specifically for an unnamed attribute.
- * If @name is NULL then the attribute could be either named or not.
+ * If @name is NULL then the attribute could be either named or not.
* In both those cases @name_len is not used at all.
*
- * On success a buffer is allocated with the content of the attribute
+ * On success a buffer is allocated with the content of the attribute
* and which needs to be freed when it's not needed anymore. If the
* @data_size parameter is non-NULL then the data size is set there.
*
@@ -5014,7 +5014,7 @@ void *ntfs_attr_readall(ntfs_inode *ni,
ntfs_attr *na;
void *data, *ret = NULL;
s64 size;
-
+
na = ntfs_attr_open(ni, type, name, name_len);
if (!na) {
ntfs_log_perror("ntfs_attr_open failed");
@@ -5047,13 +5047,13 @@ int ntfs_attr_exist(ntfs_inode *ni, cons
{
ntfs_attr_search_ctx *ctx;
int ret;
-
+
ntfs_log_trace("Entering.\n");
-
+
ctx = ntfs_attr_get_search_ctx(ni, NULL);
if (!ctx)
return 0;
-
+
ret = ntfs_attr_lookup(type, name, name_len, CASE_SENSITIVE, 0, NULL, 0,
ctx);
Index: dir.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/dir.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -p -r1.69 -r1.70
--- dir.c 26 Oct 2006 20:45:28 -0000 1.69
+++ dir.c 27 Oct 2006 12:24:30 -0000 1.70
@@ -1175,7 +1175,7 @@ static ntfs_inode *__ntfs_create(ntfs_in
* 4 bytes to every SID.
*/
sd_len = sizeof(SECURITY_DESCRIPTOR_ATTR) + 2 * (sizeof(SID) + 4) +
- sizeof(ACL) + sizeof(ACCESS_ALLOWED_ACE);
+ sizeof(ACL) + sizeof(ACCESS_ALLOWED_ACE);
sd = calloc(1, sd_len);
if (!sd) {
err = errno;
@@ -1191,7 +1191,7 @@ static ntfs_inode *__ntfs_create(ntfs_in
sid->sub_authority[0] = cpu_to_le32(32);
sid->sub_authority[1] = cpu_to_le32(544);
sid->identifier_authority.value[5] = 5;
- sid = (SID*)((u8*)sid + sizeof(SID) + 4);
+ sid = (SID*)((u8*)sid + sizeof(SID) + 4);
sd->group = cpu_to_le32((u8*)sid - (u8*)sd);
sid->revision = 1;
sid->sub_authority_count = 2;
Index: index.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/index.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- index.c 25 Oct 2006 16:49:00 -0000 1.31
+++ index.c 27 Oct 2006 12:24:30 -0000 1.32
@@ -59,9 +59,9 @@ static VCN ntfs_ib_pos_to_vcn(ntfs_index
static int ntfs_ib_write(ntfs_index_context *icx, VCN vcn, void *buf)
{
s64 ret;
-
+
ntfs_log_trace("vcn: %lld\n", vcn);
-
+
ret = ntfs_attr_mst_pwrite(icx->ia_na, ntfs_ib_vcn_to_pos(icx, vcn),
1, icx->block_size, buf);
if (ret != 1) {
@@ -76,9 +76,9 @@ static int ntfs_icx_ib_write(ntfs_index_
{
if (ntfs_ib_write(icx, icx->ib_vcn, icx->ib))
return STATUS_ERROR;
-
+
icx->ib_dirty = FALSE;
-
+
return STATUS_OK;
}
@@ -97,7 +97,7 @@ ntfs_index_context *ntfs_index_ctx_get(n
ntfs_index_context *icx;
ntfs_log_trace("Entering.\n");
-
+
if (!ni) {
errno = EINVAL;
return NULL;
@@ -117,7 +117,7 @@ ntfs_index_context *ntfs_index_ctx_get(n
static void ntfs_index_ctx_free(ntfs_index_context *icx)
{
ntfs_log_trace("Entering.\n");
-
+
if (!icx->entry)
return;
@@ -134,7 +134,7 @@ static void ntfs_index_ctx_free(ntfs_ind
/* FIXME: Error handling!!! */
ntfs_ib_write(icx, icx->ib_vcn, icx->ib);
}
-
+
free(icx->ib);
ntfs_attr_close(icx->ia_na);
}
@@ -160,9 +160,9 @@ void ntfs_index_ctx_put(ntfs_index_conte
void ntfs_index_ctx_reinit(ntfs_index_context *icx)
{
ntfs_log_trace("Entering.\n");
-
+
ntfs_index_ctx_free(icx);
-
+
*icx = (ntfs_index_context) {
.ni = icx->ni,
.name = icx->name,
@@ -204,13 +204,13 @@ static int ntfs_ie_end(INDEX_ENTRY *ie)
return ie->flags & INDEX_ENTRY_END;
}
-/**
+/**
* Find the last entry in the index block
*/
static INDEX_ENTRY *ntfs_ie_get_last(INDEX_ENTRY *ie, char *ies_end)
{
ntfs_log_trace("Entering.\n");
-
+
while ((char *)ie < ies_end && !ntfs_ie_end(ie))
ie = ntfs_ie_get_next(ie);
return ie;
@@ -219,9 +219,9 @@ static INDEX_ENTRY *ntfs_ie_get_last(IND
static INDEX_ENTRY *ntfs_ie_get_by_pos(INDEX_HEADER *ih, int pos)
{
ntfs_log_trace("pos: %d\n", pos);
-
+
INDEX_ENTRY *ie = ntfs_ie_get_first(ih);
-
+
while (pos-- > 0)
ie = ntfs_ie_get_next(ie);
return ie;
@@ -230,10 +230,10 @@ static INDEX_ENTRY *ntfs_ie_get_by_pos(I
static INDEX_ENTRY *ntfs_ie_prev(INDEX_HEADER *ih, INDEX_ENTRY *ie)
{
ntfs_log_trace("Entering.\n");
-
+
INDEX_ENTRY *ie_prev = NULL;
INDEX_ENTRY *tmp = ntfs_ie_get_first(ih);
-
+
while (tmp != ie) {
ie_prev = tmp;
tmp = ntfs_ie_get_next(tmp);
@@ -270,9 +270,9 @@ void ntfs_ie_filename_dump(INDEX_ENTRY *
void ntfs_ih_filename_dump(INDEX_HEADER *ih)
{
INDEX_ENTRY *ie;
-
+
ntfs_log_trace("Entering.\n");
-
+
ie = ntfs_ie_get_first(ih);
while (!ntfs_ie_end(ie)) {
ntfs_ie_filename_dump(ie);
@@ -284,9 +284,9 @@ static int ntfs_ih_numof_entries(INDEX_H
{
int n;
INDEX_ENTRY *ie;
-
+
ntfs_log_trace("Entering.\n");
-
+
ie = ntfs_ie_get_first(ih);
for (n = 0; !ntfs_ie_end(ie); n++)
ie = ntfs_ie_get_next(ie);
@@ -306,9 +306,9 @@ static int ntfs_ih_zero_entry(INDEX_HEAD
static void ntfs_ie_delete(INDEX_HEADER *ih, INDEX_ENTRY *ie)
{
u32 new_size;
-
+
ntfs_log_trace("Entering.\n");
-
+
new_size = le32_to_cpu(ih->index_length) - le16_to_cpu(ie->length);
ih->index_length = cpu_to_le32(new_size);
memmove(ie, (u8 *)ie + le16_to_cpu(ie->length),
@@ -326,9 +326,9 @@ static void ntfs_ie_set_vcn(INDEX_ENTRY
static void ntfs_ie_insert(INDEX_HEADER *ih, INDEX_ENTRY *ie, INDEX_ENTRY *pos)
{
int ie_size = le16_to_cpu(ie->length);
-
+
ntfs_log_trace("Entering.\n");
-
+
ih->index_length = cpu_to_le32(le32_to_cpu(ih->index_length) + ie_size);
memmove((u8 *)pos + ie_size, pos,
le32_to_cpu(ih->index_length) - ((u8 *)pos - (u8 *)ih) -
@@ -339,9 +339,9 @@ static void ntfs_ie_insert(INDEX_HEADER
static INDEX_ENTRY *ntfs_ie_dup(INDEX_ENTRY *ie)
{
INDEX_ENTRY *dup;
-
+
ntfs_log_trace("Entering.\n");
-
+
dup = ntfs_malloc(ie->length);
if (dup)
memcpy(dup, ie, ie->length);
@@ -352,16 +352,16 @@ static INDEX_ENTRY *ntfs_ie_dup_novcn(IN
{
INDEX_ENTRY *dup;
int size = ie->length;
-
+
ntfs_log_trace("Entering.\n");
-
+
if (ie->flags & INDEX_ENTRY_NODE)
size -= sizeof(VCN);
-
+
dup = ntfs_malloc(size);
if (dup)
memcpy(dup, ie, size);
-
+
dup->flags &= ~INDEX_ENTRY_NODE;
dup->length = size;
return dup;
@@ -370,30 +370,30 @@ static INDEX_ENTRY *ntfs_ie_dup_novcn(IN
static int ntfs_ia_check(ntfs_index_context *icx, INDEX_BLOCK *ib, VCN vcn)
{
u32 ib_size = (unsigned)le32_to_cpu(ib->index.allocated_size) + 0x18;
-
+
ntfs_log_trace("Entering.\n");
-
+
if (!ntfs_is_indx_record(ib->magic)) {
-
+
ntfs_log_error("Corrupt index block signature: vcn %lld inode "
"%llu\n", (long long)vcn, icx->ni->mft_no);
return -1;
}
-
+
if (sle64_to_cpu(ib->index_block_vcn) != vcn) {
-
+
ntfs_log_error("Corrupt index block: VCN (%lld) is different "
"from expected VCN (%lld) in inode %llu\n",
(long long) sle64_to_cpu(ib->index_block_vcn),
(long long)vcn, icx->ni->mft_no);
return -1;
}
-
+
if (ib_size != icx->block_size) {
-
+
ntfs_log_error("Corrupt index block : VCN (%lld) of inode %llu "
"has a size (%u) differing from the index "
- "specified size (%u)\n", (long long)vcn,
+ "specified size (%u)\n", (long long)vcn,
icx->ni->mft_no, ib_size, icx->block_size);
return -1;
}
@@ -407,26 +407,26 @@ static INDEX_ROOT *ntfs_ir_lookup(ntfs_i
INDEX_ROOT *ir = NULL;
ntfs_log_trace("Entering.\n");
-
+
*ctx = ntfs_attr_get_search_ctx(ni, NULL);
if (!*ctx) {
ntfs_log_perror("Failed to get $INDEX_ROOT search context");
return NULL;
}
-
- if (ntfs_attr_lookup(AT_INDEX_ROOT, name, name_len, CASE_SENSITIVE,
+
+ if (ntfs_attr_lookup(AT_INDEX_ROOT, name, name_len, CASE_SENSITIVE,
0, NULL, 0, *ctx)) {
ntfs_log_perror("Failed to lookup $INDEX_ROOT");
goto err_out;
}
-
+
a = (*ctx)->attr;
if (a->non_resident) {
errno = EINVAL;
ntfs_log_perror("Non-resident $INDEX_ROOT detected");
goto err_out;
}
-
+
ir = (INDEX_ROOT *)((char *)a + le16_to_cpu(a->value_offset));
err_out:
if (!ir)
@@ -434,11 +434,11 @@ err_out:
return ir;
}
-/**
+/**
* Find a key in the index block.
- *
+ *
* Return values:
- * STATUS_OK with errno set to ESUCCESS if we know for sure that the
+ * STATUS_OK with errno set to ESUCCESS if we know for sure that the
* entry exists and @ie_out points to this entry.
* STATUS_NOT_FOUND with errno set to ENOENT if we know for sure the
* entry doesn't exist and @ie_out is the insertion point.
@@ -453,11 +453,11 @@ static int ntfs_ie_lookup(const void *ke
INDEX_ENTRY *ie;
u8 *index_end;
int rc, item = 0;
-
+
ntfs_log_trace("Entering.\n");
-
+
index_end = ntfs_ie_get_end(ih);
-
+
/*
* Loop until we exceed valid memory (corruption case) or until we
* reach the last entry.
@@ -496,14 +496,14 @@ static int ntfs_ie_lookup(const void *ke
*/
if (rc == -1)
break;
-
+
if (!rc) {
*ie_out = ie;
errno = 0;
icx->parent_pos[icx->pindex] = item;
return STATUS_OK;
}
-
+
item++;
}
/*
@@ -517,7 +517,7 @@ static int ntfs_ie_lookup(const void *ke
errno = ENOENT;
return STATUS_NOT_FOUND;
}
-
+
/* Get the starting vcn of the index_block holding the child node. */
*vcn = ntfs_ie_get_vcn(ie);
if (*vcn < 0) {
@@ -535,7 +535,7 @@ static int ntfs_ie_lookup(const void *ke
static ntfs_attr *ntfs_ia_open(ntfs_index_context *icx, ntfs_inode *ni)
{
ntfs_attr *na;
-
+
na = ntfs_attr_open(ni, AT_INDEX_ALLOCATION, icx->name, icx->name_len);
if (!na) {
ntfs_log_perror("Failed to open index allocation of inode "
@@ -550,7 +550,7 @@ static int ntfs_ib_read(ntfs_index_conte
s64 pos, ret;
ntfs_log_trace("vcn: %lld\n", vcn);
-
+
pos = ntfs_ib_vcn_to_pos(icx, vcn);
ret = ntfs_attr_mst_pread(icx->ia_na, pos, 1, icx->block_size,
@@ -558,12 +558,12 @@ static int ntfs_ib_read(ntfs_index_conte
if (ret != 1) {
if (ret == -1)
ntfs_log_perror("Failed to read index block");
- else
+ else
ntfs_log_error("Failed to read full index block at "
"%lld\n", pos);
return -1;
}
-
+
if (ntfs_ia_check(icx, dst, vcn))
return -1;
return 0;
@@ -590,7 +590,7 @@ static int ntfs_icx_parent_dec(ntfs_inde
}
return STATUS_OK;
}
-
+
/**
* ntfs_index_lookup - find a key in an index and return its index entry
* @key: [IN] key for which to search in the index
@@ -635,7 +635,7 @@ int ntfs_index_lookup(const void *key, c
int ret, err = 0;
ntfs_log_trace("Entering.\n");
-
+
if (!key || key_len <= 0) {
errno = EINVAL;
ntfs_log_perror("key: %p key_len: %d", key, key_len);
@@ -648,7 +648,7 @@ int ntfs_index_lookup(const void *key, c
errno = EIO;
return -1;
}
-
+
icx->block_size = le32_to_cpu(ir->index_block_size);
if (icx->block_size < NTFS_BLOCK_SIZE) {
errno = EINVAL;
@@ -662,17 +662,17 @@ int ntfs_index_lookup(const void *key, c
icx->vcn_size_bits = ni->vol->cluster_size_bits;
else
icx->vcn_size_bits = ni->vol->sector_size_bits;
-
+
icx->cr = ir->collation_rule;
if (!ntfs_is_collation_rule_supported(icx->cr)) {
err = errno = EOPNOTSUPP;
- ntfs_log_perror("Unknown collation rule 0x%x",
+ ntfs_log_perror("Unknown collation rule 0x%x",
(unsigned)le32_to_cpu(icx->cr));
goto err_out;
}
-
+
old_vcn = VCN_INDEX_ROOT_PARENT;
- /*
+ /*
* FIXME: check for both ir and ib that the first index entry is
* within the index block.
*/
@@ -681,10 +681,10 @@ int ntfs_index_lookup(const void *key, c
err = errno;
goto err_out;
}
-
+
icx->actx = actx;
icx->ir = ir;
-
+
if (ret != STATUS_KEEP_SEARCHING) {
/* STATUS_OK or STATUS_NOT_FOUND */
err = errno;
@@ -692,18 +692,18 @@ int ntfs_index_lookup(const void *key, c
icx->parent_vcn[icx->pindex] = old_vcn;
goto done;
}
-
+
/* Child node present, descend into it. */
icx->ia_na = ntfs_ia_open(icx, ni);
if (!icx->ia_na)
goto err_out;
-
+
ib = ntfs_malloc(icx->block_size);
if (!ib) {
err = errno;
goto err_out;
}
-
+
descend_into_child_node:
icx->parent_vcn[icx->pindex] = old_vcn;
if (ntfs_icx_parent_inc(icx)) {
@@ -713,16 +713,16 @@ descend_into_child_node:
old_vcn = vcn;
ntfs_log_debug("Descend into node with VCN %lld.\n", vcn);
-
+
if (ntfs_ib_read(icx, vcn, ib))
goto err_out;
-
+
ret = ntfs_ie_lookup(key, key_len, icx, &ib->index, &vcn, &ie);
if (ret != STATUS_KEEP_SEARCHING) {
err = errno;
if (ret == STATUS_ERROR)
goto err_out;
-
+
/* STATUS_OK or STATUS_NOT_FOUND */
icx->is_in_root = FALSE;
icx->ib = ib;
@@ -735,7 +735,7 @@ descend_into_child_node:
"node in inode 0x%llx.\n", ni->mft_no);
goto err_out;
}
-
+
goto descend_into_child_node;
err_out:
if (icx->ia_na) {
@@ -762,38 +762,38 @@ done:
return 0;
}
-static INDEX_BLOCK *ntfs_ib_alloc(VCN ib_vcn, int ib_size,
+static INDEX_BLOCK *ntfs_ib_alloc(VCN ib_vcn, int ib_size,
INDEX_HEADER_FLAGS node_type)
{
INDEX_BLOCK *ib;
int ih_size = sizeof(INDEX_HEADER);
-
+
ntfs_log_trace("Entering ib_vcn = %lld ib_size = %d\n", ib_vcn,
ib_size);
-
+
ib = ntfs_calloc(ib_size);
if (!ib)
return NULL;
-
+
ib->magic = magic_INDX;
ib->usa_ofs = cpu_to_le16(sizeof(INDEX_BLOCK));
ib->usa_count = cpu_to_le16(ib_size / NTFS_BLOCK_SIZE + 1);
/* Set USN to 1 */
*(u16 *)((char *)ib + le16_to_cpu(ib->usa_ofs)) = cpu_to_le16(1);
ib->lsn = cpu_to_le64(0);
-
+
ib->index_block_vcn = cpu_to_sle64(ib_vcn);
-
+
ib->index.entries_offset = cpu_to_le32((ih_size +
le16_to_cpu(ib->usa_count) * 2 + 7) & ~7);
ib->index.index_length = 0;
- ib->index.allocated_size = cpu_to_le32(ib_size -
+ ib->index.allocated_size = cpu_to_le32(ib_size -
(sizeof(INDEX_BLOCK) - ih_size));
ib->index.flags = node_type;
return ib;
-}
+}
-/**
+/**
* Find the median by going through all the entries
*/
static INDEX_ENTRY *ntfs_ie_get_median(INDEX_HEADER *ih)
@@ -801,12 +801,12 @@ static INDEX_ENTRY *ntfs_ie_get_median(I
INDEX_ENTRY *ie, *ie_start;
u8 *ie_end;
int i = 0, median;
-
+
ntfs_log_trace("Entering.\n");
-
+
ie = ie_start = ntfs_ie_get_first(ih);
ie_end = (u8 *)ntfs_ie_get_end(ih);
-
+
while ((u8 *)ie < ie_end && !ntfs_ie_end(ie)) {
ie = ntfs_ie_get_next(ie);
i++;
@@ -815,12 +815,12 @@ static INDEX_ENTRY *ntfs_ie_get_median(I
* NOTE: this could be also the entry at the half of the index block.
*/
median = i / 2 - 1;
-
+
ntfs_log_trace("Entries: %d median: %d\n", i, median);
-
+
for (i = 0, ie = ie_start; i <= median; i++)
ie = ntfs_ie_get_next(ie);
-
+
return ie;
}
@@ -839,7 +839,7 @@ static int ntfs_ibm_add(ntfs_index_conte
u8 bmp[8];
ntfs_log_trace("Entering.\n");
-
+
if (ntfs_attr_exist(icx->ni, AT_BITMAP, icx->name, icx->name_len))
return STATUS_OK;
/*
@@ -864,7 +864,7 @@ static int ntfs_ibm_modify(ntfs_index_co
int ret = STATUS_ERROR;
ntfs_log_trace("%s vcn: %lld\n", set ? "set" : "clear", vcn);
-
+
na = ntfs_attr_open(icx->ni, AT_BITMAP, icx->name, icx->name_len);
if (!na) {
ntfs_log_perror("Failed to open $BITMAP attribute");
@@ -879,17 +879,17 @@ static int ntfs_ibm_modify(ntfs_index_co
}
}
}
-
+
if (ntfs_attr_pread(na, bpos, 1, &byte) != 1) {
ntfs_log_perror("Failed to read $BITMAP");
goto err_na;
}
- if (set)
+ if (set)
byte |= bit;
else
byte &= ~bit;
-
+
if (ntfs_attr_pwrite(na, bpos, 1, &byte) != 1) {
ntfs_log_perror("Failed to write $Bitmap");
goto err_na;
@@ -919,17 +919,17 @@ static VCN ntfs_ibm_get_free(ntfs_index_
s64 vcn, byte, size;
ntfs_log_trace("Entering.\n");
-
+
bm = ntfs_attr_readall(icx->ni, AT_BITMAP, icx->name, icx->name_len,
&size);
if (!bm)
return (VCN)-1;
-
+
for (byte = 0; byte < size; byte++) {
-
+
if (bm[byte] == 255)
continue;
-
+
for (bit = 0; bit < 8; bit++) {
if (!(bm[byte] & (1 << bit))) {
vcn = ntfs_ibm_pos_to_vcn(icx, byte * 8 + bit);
@@ -937,14 +937,14 @@ static VCN ntfs_ibm_get_free(ntfs_index_
}
}
}
-
+
vcn = ntfs_ibm_pos_to_vcn(icx, size * 8);
-out:
+out:
ntfs_log_trace("allocated vcn: %lld\n", vcn);
if (ntfs_ibm_set(icx, vcn))
vcn = (VCN)-1;
-
+
free(bm);
return vcn;
}
@@ -955,28 +955,28 @@ static INDEX_BLOCK *ntfs_ir_to_ia(INDEX_
INDEX_ENTRY *ie_last;
char *ies_start, *ies_end;
int i;
-
+
ntfs_log_trace("Entering.\n");
-
+
ib = ntfs_ib_alloc(ib_vcn, ir->index_block_size, LEAF_NODE);
if (!ib)
return NULL;
-
+
ies_start = (char *)ntfs_ie_get_first(&ir->index);
ies_end = (char *)ntfs_ie_get_end(&ir->index);
-
+
ie_last = ntfs_ie_get_last((INDEX_ENTRY *)ies_start, ies_end);
- /*
+ /*
* Copy all entries, including the termination entry
* as well, which can never have any data.
*/
i = (char *)ie_last - ies_start + le16_to_cpu(ie_last->length);
memcpy(ntfs_ie_get_first(&ib->index), ies_start, i);
-
+
ib->index.flags = ir->index.flags;
ib->index.index_length = cpu_to_le32(i +
le32_to_cpu(ib->index.entries_offset));
- /*
+ /*
* Move the index root termination entry forward
*/
if ((char *)ie_last > ies_start) {
@@ -987,27 +987,27 @@ static INDEX_BLOCK *ntfs_ir_to_ia(INDEX_
return ib;
}
-static int ntfs_ib_copy_tail(ntfs_index_context *icx, INDEX_BLOCK *src,
+static int ntfs_ib_copy_tail(ntfs_index_context *icx, INDEX_BLOCK *src,
INDEX_BLOCK *dst, INDEX_ENTRY *median, VCN new_vcn)
{
u8 *ies_end;
INDEX_ENTRY *ie_head; /* first entry after the median */
int tail_size;
-
+
ntfs_log_trace("Entering.\n");
-
+
ie_head = ntfs_ie_get_next(median);
-
+
ies_end = (u8 *)ntfs_ie_get_end(&src->index);
tail_size = ies_end - (u8 *)ie_head;
memcpy(ntfs_ie_get_first(&dst->index), ie_head, tail_size);
-
+
dst->index.index_length = cpu_to_le32(tail_size +
le32_to_cpu(dst->index.entries_offset));
-
+
if (ntfs_ib_write(icx, new_vcn, dst))
return STATUS_ERROR;
-
+
return STATUS_OK;
}
@@ -1016,34 +1016,34 @@ static int ntfs_ib_cut_tail(ntfs_index_c
{
char *ies_start, *ies_end;
INDEX_ENTRY *ie_last;
-
+
ntfs_log_trace("Entering.\n");
-
+
ies_start = (char *)ntfs_ie_get_first(&src->index);
ies_end = (char *)ntfs_ie_get_end(&src->index);
-
+
ie_last = ntfs_ie_get_last((INDEX_ENTRY *)ies_start, ies_end);
if (ie_last->flags & INDEX_ENTRY_NODE)
ntfs_ie_set_vcn(ie_last, ntfs_ie_get_vcn(ie));
-
+
memcpy(ie, ie_last, ie_last->length);
-
- src->index.index_length = cpu_to_le32(((char *)ie - ies_start) +
+
+ src->index.index_length = cpu_to_le32(((char *)ie - ies_start) +
ie->length + le32_to_cpu(src->index.entries_offset));
-
+
if (ntfs_ib_write(icx, icx->parent_vcn[icx->pindex + 1], src))
return STATUS_ERROR;
-
+
return STATUS_OK;
}
-
+
static int ntfs_ia_add(ntfs_index_context *icx)
{
ntfs_log_trace("Entering.\n");
if (ntfs_ibm_add(icx))
return -1;
-
+
if (!ntfs_attr_exist(icx->ni, AT_INDEX_ALLOCATION, icx->name,
icx->name_len)) {
if (ntfs_attr_add(icx->ni, AT_INDEX_ALLOCATION, icx->name,
@@ -1052,7 +1052,7 @@ static int ntfs_ia_add(ntfs_index_contex
return -1;
}
}
-
+
icx->ia_na = ntfs_ia_open(icx, icx->ni);
if (!icx->ia_na)
return -1;
@@ -1117,23 +1117,23 @@ err_out:
/**
* ntfs_ir_truncate - Truncate index root attribute
- *
+ *
* Returns STATUS_OK, STATUS_RESIDENT_ATTRIBUTE_FILLED_MFT or STATUS_ERROR.
*/
static int ntfs_ir_truncate(ntfs_index_context *icx, int data_size)
-{
+{
ntfs_attr *na;
int ret;
ntfs_log_trace("Entering.\n");
-
+
na = ntfs_attr_open(icx->ni, AT_INDEX_ROOT, icx->name, icx->name_len);
if (!na) {
ntfs_log_perror("Failed to open INDEX_ROOT");
return STATUS_ERROR;
}
/*
- * INDEX_ROOT must be resident and its entries can be moved to
+ * INDEX_ROOT must be resident and its entries can be moved to
* INDEX_BLOCK, so ENOSPC isn't a real error.
*/
ret = ntfs_attr_truncate(na, data_size + offsetof(INDEX_ROOT, index));
@@ -1144,7 +1144,7 @@ static int ntfs_ir_truncate(ntfs_index_c
&ctx);
if (!icx->ir)
return STATUS_ERROR;
-
+
icx->ir->index.allocated_size = cpu_to_le32(data_size);
ntfs_attr_put_search_ctx(ctx);
@@ -1158,19 +1158,19 @@ static int ntfs_ir_truncate(ntfs_index_c
ntfs_attr_close(na);
return ret;
}
-
+
/**
* ntfs_ir_make_space - Make more space for the index root attribute
- *
+ *
* On success return STATUS_OK or STATUS_KEEP_SEARCHING.
* On error return STATUS_ERROR.
*/
static int ntfs_ir_make_space(ntfs_index_context *icx, int data_size)
-{
+{
int ret;
ntfs_log_trace("Entering.\n");
-
+
ret = ntfs_ir_truncate(icx, data_size);
if (ret == STATUS_RESIDENT_ATTRIBUTE_FILLED_MFT) {
ret = ntfs_ir_reparent(icx);
@@ -1178,7 +1178,7 @@ static int ntfs_ir_make_space(ntfs_index
ret = STATUS_KEEP_SEARCHING;
else
ntfs_log_perror("Failed to nodify INDEX_ROOT");
- }
+ }
return ret;
}
@@ -1188,30 +1188,30 @@ static int ntfs_ir_make_space(ntfs_index
static int ntfs_ie_add_vcn(INDEX_ENTRY **ie)
{
INDEX_ENTRY *p, *old = *ie;
-
+
old->length += sizeof(VCN);
p = realloc(old, old->length);
if (!p)
return STATUS_ERROR;
-
+
p->flags |= INDEX_ENTRY_NODE;
*ie = p;
return STATUS_OK;
}
-static int ntfs_ih_insert(INDEX_HEADER *ih, INDEX_ENTRY *orig_ie, VCN new_vcn,
+static int ntfs_ih_insert(INDEX_HEADER *ih, INDEX_ENTRY *orig_ie, VCN new_vcn,
int pos)
{
INDEX_ENTRY *ie_node, *ie;
int ret = STATUS_ERROR;
VCN old_vcn;
-
+
ntfs_log_trace("Entering.\n");
-
+
ie = ntfs_ie_dup(orig_ie);
if (!ie)
return STATUS_ERROR;
-
+
if (!(ie->flags & INDEX_ENTRY_NODE))
if (ntfs_ie_add_vcn(&ie))
goto out;
@@ -1219,11 +1219,11 @@ static int ntfs_ih_insert(INDEX_HEADER *
ie_node = ntfs_ie_get_by_pos(ih, pos);
old_vcn = ntfs_ie_get_vcn(ie_node);
ntfs_ie_set_vcn(ie_node, new_vcn);
-
+
ntfs_ie_insert(ih, ie, ie_node);
ntfs_ie_set_vcn(ie_node, old_vcn);
ret = STATUS_OK;
-out:
+out:
free(ie);
return ret;
}
@@ -1243,9 +1243,9 @@ static int ntfs_ir_insert_median(ntfs_in
{
u32 new_size;
int ret;
-
+
ntfs_log_trace("Entering.\n");
-
+
new_size = le32_to_cpu(icx->ir->index.index_length) + median->length;
if (!(median->flags & INDEX_ENTRY_NODE))
new_size += sizeof(VCN);
@@ -1254,7 +1254,7 @@ static int ntfs_ir_insert_median(ntfs_in
if (ret != STATUS_OK)
return ret;
- return ntfs_ih_insert(&icx->ir->index, median, new_vcn,
+ return ntfs_ih_insert(&icx->ir->index, median, new_vcn,
ntfs_icx_parent_pos(icx));
}
@@ -1267,20 +1267,20 @@ static int ntfs_ib_split(ntfs_index_cont
* On error return STATUS_ERROR.
*/
static int ntfs_ib_insert(ntfs_index_context *icx, INDEX_ENTRY *ie, VCN new_vcn)
-{
+{
INDEX_BLOCK *ib;
u32 idx_size, allocated_size;
int err = STATUS_ERROR;
VCN old_vcn;
ntfs_log_trace("Entering.\n");
-
+
ib = ntfs_malloc(icx->block_size);
if (!ib)
return -1;
-
+
old_vcn = ntfs_icx_parent_vcn(icx);
-
+
if (ntfs_ib_read(icx, old_vcn, ib))
goto err_out;
@@ -1293,65 +1293,65 @@ static int ntfs_ib_insert(ntfs_index_con
err = STATUS_KEEP_SEARCHING;
goto err_out;
}
-
+
if (ntfs_ih_insert(&ib->index, ie, new_vcn, ntfs_icx_parent_pos(icx)))
goto err_out;
-
+
if (ntfs_ib_write(icx, old_vcn, ib))
goto err_out;
-
+
err = STATUS_OK;
-err_out:
+err_out:
free(ib);
return err;
}
/**
* ntfs_ib_split - Split index allocation attribute
- *
+ *
* On success return STATUS_OK or STATUS_KEEP_SEARCHING.
* On error return is STATUS_ERROR.
*/
static int ntfs_ib_split(ntfs_index_context *icx, INDEX_BLOCK *ib)
-{
+{
INDEX_BLOCK *ib_new;
INDEX_ENTRY *median;
VCN new_vcn;
int ret, err = STATUS_ERROR;
ntfs_log_trace("Entering.\n");
-
+
if (ntfs_icx_parent_dec(icx))
return STATUS_ERROR;
-
+
median = ntfs_ie_get_median(&ib->index);
new_vcn = ntfs_ibm_get_free(icx);
if (new_vcn == -1)
return STATUS_ERROR;
-
+
if (ntfs_icx_parent_vcn(icx) == VCN_INDEX_ROOT_PARENT)
ret = ntfs_ir_insert_median(icx, median, new_vcn);
else
ret = ntfs_ib_insert(icx, median, new_vcn);
-
+
ntfs_inode_mark_dirty(icx->actx->ntfs_ino);
-
+
if (ret != STATUS_OK) {
ntfs_ibm_clear(icx, new_vcn);
return ret;
}
-
- ib_new = ntfs_ib_alloc(new_vcn, icx->block_size,
+
+ ib_new = ntfs_ib_alloc(new_vcn, icx->block_size,
ib->index.flags & NODE_MASK);
if (!ib_new)
return STATUS_ERROR;
-
+
if (ntfs_ib_copy_tail(icx, ib, ib_new, median, new_vcn))
goto free_ib_new;
-
+
if (ntfs_ib_cut_tail(icx, ib, median))
goto free_ib_new;
-
+
err = STATUS_OK;
free_ib_new:
free(ib_new);
@@ -1364,10 +1364,10 @@ static int ntfs_ie_add(ntfs_index_contex
INDEX_HEADER *ih;
int allocated_size, new_size;
int ret = STATUS_ERROR;
-
+
fn = ntfs_ie_filename_get(ie);
ntfs_log_trace("file: '%s'\n", fn);
-
+
while (1) {
if (!ntfs_index_lookup(&ie->key, le16_to_cpu(ie->key_length),
icx)) {
@@ -1379,22 +1379,22 @@ static int ntfs_ie_add(ntfs_index_contex
ntfs_log_perror("Failed to find place for new entry");
goto err_out;
}
-
+
if (icx->is_in_root)
ih = &icx->ir->index;
else
ih = &icx->ib->index;
-
+
allocated_size = le32_to_cpu(ih->allocated_size);
new_size = le32_to_cpu(ih->index_length) +
le16_to_cpu(ie->length);
-
+
if (new_size <= allocated_size)
break;
-
+
ntfs_log_trace("index block sizes: allocated: %d needed: %d\n",
allocated_size, new_size);
-
+
if (icx->is_in_root) {
if (ntfs_ir_make_space(icx, new_size) == STATUS_ERROR)
goto err_out;
@@ -1405,10 +1405,10 @@ static int ntfs_ie_add(ntfs_index_contex
ntfs_inode_mark_dirty(icx->actx->ntfs_ino);
ntfs_index_ctx_reinit(icx);
}
-
+
ntfs_ie_insert(ih, ie, icx->entry);
ntfs_index_entry_mark_dirty(icx);
-
+
ret = STATUS_OK;
err_out:
free(fn);
@@ -1431,17 +1431,17 @@ int ntfs_index_add_filename(ntfs_inode *
int fn_size, ie_size, ret = -1;
ntfs_log_trace("Entering.\n");
-
+
if (!ni || !fn) {
ntfs_log_error("Invalid arguments.\n");
errno = EINVAL;
return -1;
}
-
+
fn_size = (fn->file_name_length * sizeof(ntfschar)) +
sizeof(FILE_NAME_ATTR);
ie_size = (sizeof(INDEX_ENTRY_HEADER) + fn_size + 7) & ~7;
-
+
ie = ntfs_calloc(ie_size);
if (!ie)
return -1;
@@ -1450,13 +1450,13 @@ int ntfs_index_add_filename(ntfs_inode *
ie->length = cpu_to_le16(ie_size);
ie->key_length = cpu_to_le16(fn_size);
memcpy(&ie->key, fn, fn_size);
-
+
icx = ntfs_index_ctx_get(ni, NTFS_INDEX_I30, 4);
if (!icx)
goto out;
-
+
ret = ntfs_ie_add(icx, ie);
-
+
ntfs_index_ctx_put(icx);
out:
free(ie);
@@ -1468,9 +1468,9 @@ static int ntfs_ih_takeout(ntfs_index_co
{
INDEX_ENTRY *ie_roam;
int ret = STATUS_ERROR;
-
+
ntfs_log_trace("Entering.\n");
-
+
ie_roam = ntfs_ie_dup_novcn(ie);
if (!ie_roam)
return STATUS_ERROR;
@@ -1482,7 +1482,7 @@ static int ntfs_ih_takeout(ntfs_index_co
else
if (ntfs_ib_write(icx, ntfs_icx_parent_vcn(icx), ib))
goto out;
-
+
ntfs_index_ctx_reinit(icx);
ret = ntfs_ie_add(icx, ie_roam);
@@ -1493,26 +1493,26 @@ out:
/**
* ntfs_ir_leafify -
- *
+ *
* Used if an empty index block to be deleted has END entry as the parent
* in the INDEX_ROOT which is the only one there.
*/
static void ntfs_ir_leafify(ntfs_index_context *icx, INDEX_HEADER *ih)
{
INDEX_ENTRY *ie;
-
+
ntfs_log_trace("Entering.\n");
-
+
ie = ntfs_ie_get_first(ih);
ie->flags &= ~INDEX_ENTRY_NODE;
ie->length -= sizeof(VCN);
-
+
ih->index_length -= sizeof(VCN);
ih->flags &= ~LARGE_INDEX;
-
+
/* Not fatal error */
ntfs_ir_truncate(icx, le32_to_cpu(ih->index_length));
-
+
ntfs_inode_mark_dirty(icx->actx->ntfs_ino);
ntfs_index_ctx_reinit(icx);
}
@@ -1520,19 +1520,19 @@ static void ntfs_ir_leafify(ntfs_index_c
/**
* ntfs_ih_reparent_end -
*
- * Used if an empty index block to be deleted has END entry as the parent
+ * Used if an empty index block to be deleted has END entry as the parent
* in the INDEX_ROOT which is not the only one there.
*/
static int ntfs_ih_reparent_end(ntfs_index_context *icx, INDEX_HEADER *ih,
INDEX_BLOCK *ib)
{
INDEX_ENTRY *ie, *ie_prev;
-
+
ntfs_log_trace("Entering.\n");
-
+
ie = ntfs_ie_get_by_pos(ih, ntfs_icx_parent_pos(icx));
ie_prev = ntfs_ie_prev(ih, ie);
-
+
ntfs_ie_set_vcn(ie, ntfs_ie_get_vcn(ie_prev));
return ntfs_ih_takeout(icx, ih, ie_prev, ib);
}
@@ -1543,48 +1543,48 @@ static int ntfs_index_rm_leaf(ntfs_index
INDEX_HEADER *parent_ih;
INDEX_ENTRY *ie;
int ret = STATUS_ERROR;
-
+
ntfs_log_trace("pindex: %d\n", icx->pindex);
-
+
if (ntfs_icx_parent_dec(icx))
return STATUS_ERROR;
if (ntfs_ibm_clear(icx, icx->parent_vcn[icx->pindex + 1]))
return STATUS_ERROR;
-
+
if (ntfs_icx_parent_vcn(icx) == VCN_INDEX_ROOT_PARENT)
parent_ih = &icx->ir->index;
else {
ib = ntfs_malloc(icx->block_size);
if (!ib)
return STATUS_ERROR;
-
+
if (ntfs_ib_read(icx, ntfs_icx_parent_vcn(icx), ib))
goto out;
-
+
parent_ih = &ib->index;
}
-
+
ie = ntfs_ie_get_by_pos(parent_ih, ntfs_icx_parent_pos(icx));
if (!ntfs_ie_end(ie)) {
ret = ntfs_ih_takeout(icx, parent_ih, ie, ib);
goto out;
}
-
+
if (ntfs_ih_zero_entry(parent_ih)) {
-
+
if (ntfs_icx_parent_vcn(icx) == VCN_INDEX_ROOT_PARENT) {
ntfs_ir_leafify(icx, parent_ih);
goto ok;
}
-
+
ret = ntfs_index_rm_leaf(icx);
goto out;
}
-
+
if (ntfs_ih_reparent_end(icx, parent_ih, ib))
goto out;
-ok:
+ok:
ret = STATUS_OK;
out:
free(ib);
@@ -1602,7 +1602,7 @@ static int ntfs_index_rm_node(ntfs_index
int delta, ret = STATUS_ERROR;
ntfs_log_trace("Entering.\n");
-
+
if (!icx->ia_na) {
icx->ia_na = ntfs_ia_open(icx, icx->ni);
if (!icx->ia_na)
@@ -1612,19 +1612,19 @@ static int ntfs_index_rm_node(ntfs_index
ib = ntfs_malloc(icx->block_size);
if (!ib)
return STATUS_ERROR;
-
+
ie_succ = ntfs_ie_get_next(icx->entry);
entry_pos = icx->parent_pos[icx->pindex]++;
descend:
vcn = ntfs_ie_get_vcn(ie_succ);
if (ntfs_ib_read(icx, vcn, ib))
goto out;
-
+
ie_succ = ntfs_ie_get_first(&ib->index);
if (ntfs_icx_parent_inc(icx))
goto out;
-
+
icx->parent_vcn[icx->pindex] = vcn;
icx->parent_pos[icx->pindex] = 0;
@@ -1641,7 +1641,7 @@ descend:
ie = ntfs_ie_dup(ie_succ);
if (!ie)
goto out;
-
+
if (ntfs_ie_add_vcn(&ie))
goto out2;
@@ -1662,10 +1662,10 @@ descend:
" during entry removal");
goto out2;
}
-
+
ih = &icx->ir->index;
entry = ntfs_ie_get_by_pos(ih, entry_pos);
-
+
} else if (new_size > ih->allocated_size) {
errno = EOPNOTSUPP;
ntfs_log_perror("Denied to split INDEX_BLOCK during "
@@ -1676,7 +1676,7 @@ descend:
ntfs_ie_delete(ih, entry);
ntfs_ie_insert(ih, ie, entry);
-
+
if (icx->is_in_root) {
if (ntfs_ir_truncate(icx, new_size))
goto out2;
@@ -1684,13 +1684,13 @@ descend:
} else
if (ntfs_icx_ib_write(icx))
goto out2;
-
+
ntfs_ie_delete(&ib->index, ie_succ);
-
+
if (ntfs_ih_zero_entry(&ib->index)) {
if (ntfs_index_rm_leaf(icx))
goto out2;
- } else
+ } else
if (ntfs_ib_write(icx, vcn, ib))
goto out2;
@@ -1706,8 +1706,8 @@ out:
* ntfs_index_rm - remove entry from the index
* @icx: index context describing entry to delete
*
- * Delete entry described by @icx from the index. Index context is always
- * reinitialized after use of this function, so it can be used for index
+ * Delete entry described by @icx from the index. 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.
@@ -1718,7 +1718,7 @@ int ntfs_index_rm(ntfs_index_context *ic
int err;
ntfs_log_trace("Entering.\n");
-
+
if (!icx || (!icx->ib && !icx->ir) || ntfs_ie_end(icx->entry)) {
ntfs_log_error("Invalid arguments.\n");
errno = EINVAL;
@@ -1728,16 +1728,16 @@ int ntfs_index_rm(ntfs_index_context *ic
ih = &icx->ir->index;
else
ih = &icx->ib->index;
-
+
if (icx->entry->flags & INDEX_ENTRY_NODE) {
-
+
if (ntfs_index_rm_node(icx))
goto err_out;
} else if (icx->is_in_root || !ntfs_ih_one_entry(ih)) {
-
+
ntfs_ie_delete(ih, icx->entry);
-
+
if (icx->is_in_root) {
err = ntfs_ir_truncate(icx,
le32_to_cpu(ih->index_length));
@@ -1750,7 +1750,7 @@ int ntfs_index_rm(ntfs_index_context *ic
if (ntfs_index_rm_leaf(icx))
goto err_out;
}
-
+
ntfs_index_ctx_reinit(icx);
ntfs_log_trace("Done.\n");
return 0;
@@ -1765,7 +1765,7 @@ err_out:
/**
* ntfs_index_root_get - read the index root of an attribute
* @ni: open ntfs inode in which the ntfs attribute resides
- * @attr: attribute for which we want its index root
+ * @attr: attribute for which we want its index root
*
* This function will read the related index root an ntfs attribute.
*
@@ -1784,14 +1784,14 @@ INDEX_ROOT *ntfs_index_root_get(ntfs_ino
if (!ntfs_ir_lookup(ni, name, attr->name_length, &ctx))
return NULL;
-
+
root = ntfs_malloc(sizeof(INDEX_ROOT));
if (!root)
goto out;
-
+
*root = *((INDEX_ROOT *)((u8 *)ctx->attr +
le16_to_cpu(ctx->attr->value_offset)));
-out:
+out:
ntfs_attr_put_search_ctx(ctx);
return root;
}
Index: inode.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/inode.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- inode.c 26 Oct 2006 19:10:05 -0000 1.86
+++ inode.c 27 Oct 2006 12:24:30 -0000 1.87
@@ -1111,7 +1111,7 @@ void ntfs_inode_update_time(ntfs_inode *
* Check if the mft record given by @mft_no and @attr contains the bad sector
* list. Please note that mft record numbers describing $Badclus extent inodes
* will not match the current $Badclus:$Bad check.
- *
+ *
* On success return 1 if the file is $Badclus:$Bad, otherwise return 0.
* On error return -1 with errno set to the error code.
*/
@@ -1125,7 +1125,7 @@ int ntfs_inode_badclus_bad(u64 mft_no, A
errno = EINVAL;
return -1;
}
-
+
if (mft_no != FILE_BadClus)
return 0;
Index: runlist.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/runlist.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- runlist.c 27 Oct 2006 09:05:56 -0000 1.72
+++ runlist.c 27 Oct 2006 12:24:30 -0000 1.73
@@ -1586,31 +1586,31 @@ int ntfs_rl_truncate(runlist **arl, cons
ntfs_log_perror("rl_truncate error: arl: %p *arl: %p", arl, *arl);
return -1;
}
-
+
rl = *arl;
-
+
if (start_vcn < rl->vcn) {
errno = EINVAL;
ntfs_log_perror("Start_vcn lies outside front of runlist");
return -1;
}
-
+
/* Find the starting vcn in the run list. */
while (rl->length) {
if (start_vcn < rl[1].vcn)
break;
rl++;
}
-
+
if (!rl->length) {
errno = EIO;
ntfs_log_trace("Truncating already truncated runlist?\n");
return -1;
}
-
+
/* Truncate the run. */
rl->length = start_vcn - rl->vcn;
-
+
/*
* If a run was partially truncated, make the following runlist
* element a terminator instead of the truncated runlist
Index: unistr.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/unistr.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- unistr.c 25 Sep 2006 16:58:38 -0000 1.35
+++ unistr.c 27 Oct 2006 12:24:30 -0000 1.36
@@ -708,12 +708,12 @@ void ntfs_upcase_table_build(ntfschar *u
* @len: length of output buffer in Unicode characters
*
* Convert the input @s string into the corresponding little endian,
- * 2-byte Unicode string. The length of the converted string is less
+ * 2-byte Unicode string. The length of the converted string is less
* or equal to the maximum length allowed by the NTFS format (255).
*
* If @s is NULL then return AT_UNNAMED.
*
- * On success the function returns the Unicode string in an allocated
+ * On success the function returns the Unicode string in an allocated
* buffer and the caller is responsible to free it when it's not needed
* anymore.
*
Index: unix_io.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/unix_io.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- unix_io.c 4 Feb 2006 02:42:42 -0000 1.12
+++ unix_io.c 27 Oct 2006 12:24:30 -0000 1.13
@@ -91,7 +91,7 @@ static int ntfs_device_unix_io_open(stru
/*
* Open the device/file obtaining the file descriptor for exclusive
* access (but only if mounting r/w).
- */
+ */
if ((flags & O_RDWR) == O_RDWR)
flags |= O_EXCL;
*(int*)dev->d_private = open(dev->d_name, flags);
Index: volume.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/volume.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- volume.c 27 Jul 2006 18:44:08 -0000 1.71
+++ volume.c 27 Oct 2006 12:24:30 -0000 1.72
@@ -217,7 +217,7 @@ static int ntfs_mft_load(ntfs_volume *vo
}
mft_has_no_attr_list:
/* Receive attributes from STANDARD_INFORMATION. */
- std_info = ntfs_attr_readall(vol->mft_ni, AT_STANDARD_INFORMATION,
+ std_info = ntfs_attr_readall(vol->mft_ni, AT_STANDARD_INFORMATION,
AT_UNNAMED, 0, NULL);
vol->mft_ni->flags = std_info->file_attributes;
@@ -815,7 +815,7 @@ ntfs_volume *ntfs_device_mount(struct nt
ntfs_log_perror("Failed to read $MFTMirr");
else {
ntfs_log_debug("Failed to read $MFTMirr, unexpected "
- "length (%d != %lld).\n",
+ "length (%d != %lld).\n",
vol->mftmirr_size, l);
errno = EIO;
}
|
|
From: Yuval <uv...@de...> - 2006-10-27 12:25:03
|
Changes by: uvman
Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357:/tmp/cvs-serv10841/ntfsprogs
Modified Files:
mkntfs.c ntfsclone.c ntfscmp.c ntfsinfo.c ntfsresize.c
Log Message:
Whitespace cleanup
Index: mkntfs.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -p -r1.149 -r1.150
--- mkntfs.c 20 Oct 2006 19:55:50 -0000 1.149
+++ mkntfs.c 27 Oct 2006 12:24:30 -0000 1.150
@@ -2861,7 +2861,7 @@ static int initialize_quota(MFT_RECORD *
INDEX_ENTRY *idx_entry_o, *idx_entry_q1, *idx_entry_q2;
QUOTA_O_INDEX_DATA *idx_entry_o_data;
QUOTA_CONTROL_ENTRY *idx_entry_q1_data, *idx_entry_q2_data;
-
+
err = 0;
/* q index entry num 1 */
q1_size = 0x48;
@@ -3790,7 +3790,7 @@ static BOOL mkntfs_initialize_bitmaps(vo
g_rl_mft_bmp = ntfs_malloc(2 * sizeof(runlist));
if (!g_rl_mft_bmp)
return FALSE;
-
+
g_rl_mft_bmp[0].vcn = 0LL;
/* Mft bitmap is right after $Boot's data. */
i = (8192 + g_vol->cluster_size - 1) / g_vol->cluster_size;
@@ -3855,7 +3855,7 @@ static BOOL mkntfs_initialize_rl_mft(voi
g_rl_mft = ntfs_malloc(2 * sizeof(runlist));
if (!g_rl_mft)
return FALSE;
-
+
g_rl_mft[0].vcn = 0LL;
g_rl_mft[0].lcn = g_mft_lcn;
/* rounded up division by cluster size */
@@ -3876,7 +3876,7 @@ static BOOL mkntfs_initialize_rl_mft(voi
g_rl_mftmirr = ntfs_malloc(2 * sizeof(runlist));
if (!g_rl_mftmirr)
return FALSE;
-
+
g_rl_mftmirr[0].vcn = 0LL;
g_rl_mftmirr[0].lcn = g_mftmirr_lcn;
/*
@@ -3912,7 +3912,7 @@ static BOOL mkntfs_initialize_rl_logfile
g_rl_logfile = ntfs_malloc(2 * sizeof(runlist));
if (!g_rl_logfile)
return FALSE;
-
+
volume_size = g_vol->nr_clusters << g_vol->cluster_size_bits;
@@ -3935,7 +3935,7 @@ static BOOL mkntfs_initialize_rl_logfile
g_logfile_size = (volume_size / 100) &
~(g_vol->cluster_size - 1);
} else {
- /*
+ /*
* FIXME: The $LogFile size is 64 MiB upwards from 12GiB but
* the "200" divider below apparently approximates "100" or
* some other value as the volume size decreases. For example:
@@ -3996,7 +3996,7 @@ static BOOL mkntfs_initialize_rl_boot(vo
g_rl_boot = ntfs_malloc(2 * sizeof(runlist));
if (!g_rl_boot)
return FALSE;
-
+
g_rl_boot[0].vcn = 0LL;
g_rl_boot[0].lcn = 0LL;
/*
@@ -4023,7 +4023,7 @@ static BOOL mkntfs_initialize_rl_bad(voi
g_rl_bad = ntfs_malloc(2 * sizeof(runlist));
if (!g_rl_bad)
return FALSE;
-
+
g_rl_bad[0].vcn = 0LL;
g_rl_bad[0].lcn = -1LL;
/*
@@ -4498,7 +4498,7 @@ static BOOL mkntfs_create_root_structure
buf_log = ntfs_malloc(g_logfile_size);
if (!buf_log)
return FALSE;
-
+
memset(buf_log, -1, g_logfile_size);
err = add_attr_data_positioned(m, NULL, 0, 0, 0, g_rl_logfile, buf_log,
g_logfile_size);
@@ -4969,7 +4969,7 @@ static int mkntfs_redirect(struct mkntfs
g_vol->upcase = ntfs_malloc(g_vol->upcase_len * sizeof(ntfschar));
if (!g_vol->upcase)
goto done;
-
+
init_upcase_table(g_vol->upcase, g_vol->upcase_len * sizeof(ntfschar));
if (g_vol->major_ver < 3) {
g_vol->attrdef = ntfs_calloc(36000);
Index: ntfsclone.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -p -r1.91 -r1.92
--- ntfsclone.c 18 Oct 2006 14:41:41 -0000 1.91
+++ ntfsclone.c 27 Oct 2006 12:24:30 -0000 1.92
@@ -755,9 +755,9 @@ static void wipe_index_entry_timestams(I
e->key.file_name.last_data_change_time = timestamp;
e->key.file_name.last_mft_change_time = timestamp;
e->key.file_name.last_access_time = timestamp;
-
+
wiped_timestamp_data += 32;
-
+
e = (INDEX_ENTRY *)((u8 *)e + le16_to_cpu(e->length));
}
}
@@ -785,7 +785,7 @@ static void wipe_index_allocation_timest
name = (ntfschar *)((u8 *)attr + le16_to_cpu(attr->name_offset));
name_len = attr->name_length;
-
+
byte = bitmap = ntfs_attr_readall(ni, AT_BITMAP, name, name_len, NULL);
if (!byte) {
perr_printf("Failed to read $BITMAP attribute");
@@ -812,7 +812,7 @@ static void wipe_index_allocation_timest
bit = 0;
while ((u8 *)tmp_indexa < (u8 *)indexa + na->data_size) {
- if (*byte & (1 << bit)) {
+ if (*byte & (1 << bit)) {
if (ntfs_mst_post_read_fixup((NTFS_RECORD *)tmp_indexa,
le32_to_cpu(
indexr->index_block_size))) {
@@ -834,7 +834,7 @@ static void wipe_index_allocation_timest
goto out_indexa;
}
}
- tmp_indexa = (INDEX_ALLOCATION *)((u8 *)tmp_indexa +
+ tmp_indexa = (INDEX_ALLOCATION *)((u8 *)tmp_indexa +
le32_to_cpu(indexr->index_block_size));
bit++;
if (bit > 7) {
@@ -842,7 +842,7 @@ static void wipe_index_allocation_timest
byte++;
}
}
-
+
if (ntfs_rl_pwrite(vol, na->rl, 0, na->data_size, indexa) != na->data_size)
perr_printf("ntfs_rl_pwrite failed for inode %lld", ni->mft_no);
out_indexa:
@@ -924,7 +924,7 @@ static void wipe_timestamps(ntfs_walk_cl
else if (a->type == AT_STANDARD_INFORMATION)
WIPE_TIMESTAMPS(STANDARD_INFORMATION, a, timestamp);
-
+
else if (a->type == AT_INDEX_ROOT)
wipe_index_root_timestamps(a, timestamp);
}
@@ -1168,7 +1168,7 @@ static void mft_record_write_with_same_u
{
if (ntfs_mft_usn_dec(ni->mrec))
perr_exit("ntfs_mft_usn_dec");
-
+
if (ntfs_mft_record_write(volume, ni->mft_no, ni->mrec))
perr_exit("ntfs_mft_record_write");
}
@@ -1176,12 +1176,12 @@ static void mft_record_write_with_same_u
static void mft_inode_write_with_same_usn(ntfs_volume *volume, ntfs_inode *ni)
{
s32 i;
-
+
mft_record_write_with_same_usn(volume, ni);
-
+
if (ni->nr_extents <= 0)
return;
-
+
for (i = 0; i < ni->nr_extents; ++i) {
ntfs_inode *eni = ni->extent_nis[i];
mft_record_write_with_same_usn(volume, eni);
@@ -1719,7 +1719,7 @@ static void check_dest_free_space(u64 sr
if (opt.metadata || opt.blkdev_out || opt.std_out)
return;
- /*
+ /*
* TODO: save_image needs a bit more space than src_bytes
* due to the free space encoding overhead.
*/
@@ -1732,7 +1732,7 @@ static void check_dest_free_space(u64 sr
dest_bytes = (u64)stvfs.f_frsize * stvfs.f_bfree;
if (!dest_bytes)
dest_bytes = (u64)stvfs.f_bsize * stvfs.f_bfree;
-
+
if (dest_bytes < src_bytes)
err_exit("Destination doesn't have enough free space: "
"%llu MB < %llu MB\n",
Index: ntfscmp.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfscmp.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- ntfscmp.c 18 Oct 2006 14:41:41 -0000 1.19
+++ ntfscmp.c 27 Oct 2006 12:24:30 -0000 1.20
@@ -496,7 +496,7 @@ static int setup_cmp_ia(ntfs_attr *na, s
perr_println("Failed to readall BITMAP");
return -1;
}
- cia->byte = cia->bitmap;
+ cia->byte = cia->bitmap;
cia->tmp_ia = cia->ia = ntfs_malloc(na->data_size);
if (!cia->tmp_ia)
@@ -506,7 +506,7 @@ static int setup_cmp_ia(ntfs_attr *na, s
perr_println("Failed to pread INDEX_ALLOCATION");
goto free_ia;
}
-
+
return 0;
free_ia:
free(cia->ia);
@@ -520,28 +520,28 @@ static void cmp_index_allocation(ntfs_at
struct cmp_ia cia1, cia2;
int bit, ret1, ret2;
u32 ib_size;
-
+
if (setup_cmp_ia(na1, &cia1))
return;
if (setup_cmp_ia(na2, &cia2))
return;
- /*
+ /*
* FIXME: ia can be the same even if the bitmap sizes are different.
*/
if (cia1.bm_size != cia1.bm_size)
goto out;
-
+
if (cmp_buffer(cia1.bitmap, cia2.bitmap, cia1.bm_size, na1))
goto out;
-
+
if (cmp_buffer((u8 *)cia1.ia, (u8 *)cia2.ia, 0x18, na1))
goto out;
ib_size = cia1.ia->index.allocated_size + 0x18;
-
+
bit = 0;
while ((u8 *)cia1.tmp_ia < (u8 *)cia1.ia + na1->data_size) {
- if (*cia1.byte & (1 << bit)) {
+ if (*cia1.byte & (1 << bit)) {
ret1 = ntfs_mst_post_read_fixup((NTFS_RECORD *)cia1.tmp_ia,
ib_size);
ret2 = ntfs_mst_post_read_fixup((NTFS_RECORD *)cia2.tmp_ia,
@@ -550,19 +550,19 @@ static void cmp_index_allocation(ntfs_at
print_differ(na1);
goto out;
}
-
+
if (ret1 == -1)
continue;
-
- if (cmp_buffer(((u8 *)cia1.tmp_ia) + 0x18,
+
+ if (cmp_buffer(((u8 *)cia1.tmp_ia) + 0x18,
((u8 *)cia2.tmp_ia) + 0x18,
cia1.ia->index.index_length, na1))
goto out;
}
-
+
cia1.tmp_ia = (INDEX_ALLOCATION *)((u8 *)cia1.tmp_ia + ib_size);
cia2.tmp_ia = (INDEX_ALLOCATION *)((u8 *)cia2.tmp_ia + ib_size);
-
+
bit++;
if (bit > 7) {
bit = 0;
@@ -615,7 +615,7 @@ static void cmp_attribute_data(ntfs_attr
printf("%lld != %lld\n", pos + count1, na1->data_size);
exit(1);
}
-
+
if (cmp_buffer(buf1, buf2, count1, na1))
return;
}
Index: ntfsinfo.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -p -r1.148 -r1.149
--- ntfsinfo.c 16 Aug 2006 09:24:19 -0000 1.148
+++ ntfsinfo.c 27 Oct 2006 12:24:30 -0000 1.149
@@ -617,7 +617,7 @@ static void ntfs_dump_attr_standard_info
(unsigned)value_length);
}
}
-
+
static void ntfs_dump_bytes(u8 *buf, int start, int stop)
{
int i;
@@ -647,7 +647,7 @@ static void ntfs_dump_attr_list(ATTR_REC
value = ntfs_malloc(l);
if (!value)
return;
-
+
l = ntfs_get_attribute_value(vol, attr, value);
if (!l) {
ntfs_log_perror("ntfs_get_attribute_value failed");
@@ -698,7 +698,7 @@ static void ntfs_dump_attr_list(ATTR_REC
} else
printf("unnamed\n");
printf("\t\tPadding:\t");
- ntfs_dump_bytes((u8 *)entry, entry->name_offset +
+ ntfs_dump_bytes((u8 *)entry, entry->name_offset +
sizeof(ntfschar) * entry->name_length,
le16_to_cpu(entry->length));
printf("\n");
@@ -864,7 +864,7 @@ static void ntfs_dump_acl(const char *pr
printf("%sRevision\t %u\n", prefix, acl->revision);
- /*
+ /*
* Do not recalculate le16_to_cpu every iteration (minor speedup on
* big-endian machines.
*/
@@ -913,7 +913,7 @@ static void ntfs_dump_security_descripto
const char *indent)
{
char *sid;
-
+
printf("%s\tRevision:\t\t %u\n", indent, sec_desc->revision);
/* TODO: parse the flags */
@@ -921,17 +921,16 @@ static void ntfs_dump_security_descripto
le16_to_cpu(sec_desc->control));
if (~sec_desc->control & SE_SELF_RELATIVE) {
-
SECURITY_DESCRIPTOR *sd = (SECURITY_DESCRIPTOR *)sec_desc;
-
+
printf("%s\tOwner SID pointer:\t %p\n", indent, sd->owner);
printf("%s\tGroup SID pointer:\t %p\n", indent, sd->group);
printf("%s\tSACL pointer:\t\t %p\n", indent, sd->sacl);
printf("%s\tDACL pointer:\t\t %p\n", indent, sd->dacl);
-
+
return;
}
-
+
if (sec_desc->owner) {
sid = ntfs_sid_to_mbs((SID *)((char *)sec_desc +
le32_to_cpu(sec_desc->owner)), NULL, 0);
@@ -1017,8 +1016,8 @@ static void ntfs_dump_attr_security_desc
}
ntfs_dump_security_descriptor(sec_desc_attr, "");
-
- if (attr->non_resident)
+
+ if (attr->non_resident)
free(sec_desc_attr);
}
@@ -1099,7 +1098,7 @@ static void ntfs_dump_attr_volume_inform
}
static ntfschar NTFS_DATA_SDS[5] = { const_cpu_to_le16('$'),
- const_cpu_to_le16('S'), const_cpu_to_le16('D'),
+ const_cpu_to_le16('S'), const_cpu_to_le16('D'),
const_cpu_to_le16('S'), const_cpu_to_le16('\0') };
static void ntfs_dump_sds_entry(SECURITY_DESCRIPTOR_HEADER *sds)
@@ -1117,10 +1116,10 @@ static void ntfs_dump_sds_entry(SECURITY
ntfs_log_verbose("\t\tLength:\t\t\t %u (0x%x)\n",
(unsigned)le32_to_cpu(sds->length),
(unsigned)le32_to_cpu(sds->length));
-
+
sd = (SECURITY_DESCRIPTOR_RELATIVE *)((char *)sds +
sizeof(SECURITY_DESCRIPTOR_HEADER));
-
+
ntfs_dump_security_descriptor(sd, "\t");
}
@@ -1131,22 +1130,22 @@ static void ntfs_dump_sds(ATTR_RECORD *a
int name_len;
s64 data_size;
u64 inode;
-
+
inode = ni->mft_no;
if (ni->nr_extents < 0)
inode = ni->base_ni->mft_no;
if (FILE_Secure != inode)
return;
-
+
name_len = attr->name_length;
if (!name_len)
return;
-
+
name = (ntfschar *)((u8 *)attr + le16_to_cpu(attr->name_offset));
if (!ntfs_names_are_equal(NTFS_DATA_SDS, sizeof(NTFS_DATA_SDS) / 2 - 1,
name, name_len, 0, NULL, 0))
return;
-
+
sd = sds = ntfs_attr_readall(ni, AT_DATA, name, name_len, &data_size);
if (!sd) {
ntfs_log_perror("Failed to read $SDS attribute");
@@ -1156,10 +1155,10 @@ static void ntfs_dump_sds(ATTR_RECORD *a
* FIXME: The right way is based on the indexes, so we couldn't
* miss real entries. For now, dump until it makes sense.
*/
- while (sd->length && sd->hash &&
+ while (sd->length && sd->hash &&
le64_to_cpu(sd->offset) < (u64)data_size &&
le32_to_cpu(sd->length) < (u64)data_size &&
- le64_to_cpu(sd->offset) +
+ le64_to_cpu(sd->offset) +
le32_to_cpu(sd->length) < (u64)data_size) {
ntfs_dump_sds_entry(sd);
sd = (SECURITY_DESCRIPTOR_HEADER *)((char*)sd +
@@ -1193,10 +1192,10 @@ static const char *get_attribute_type_na
return "$UNKNOWN";
}
-
+
static void ntfs_dump_attribute_header(ATTR_RECORD *a, ntfs_volume *vol)
{
- printf("Dumping attribute %s (0x%x)\n",
+ printf("Dumping attribute %s (0x%x)\n",
get_attribute_type_name(a->type),
(unsigned)le32_to_cpu(a->type));
@@ -1274,7 +1273,7 @@ static void ntfs_dump_attribute_header(A
sle64_to_cpu(a->initialized_size));
if (a->compression_unit || a->flags & ATTR_IS_COMPRESSED ||
a->flags & ATTR_IS_SPARSE)
- printf("\tCompressed size:\t %llu (0x%llx)\n",
+ printf("\tCompressed size:\t %llu (0x%llx)\n",
(signed long long)
sle64_to_cpu(a->compressed_size),
(signed long long)
@@ -1324,7 +1323,7 @@ static void ntfs_dump_index_key(INDEX_EN
{
char *sid;
char printable_GUID[37];
-
+
switch (type) {
case INDEX_ATTR_SECURE_SII:
ntfs_log_verbose("\t\tKey security id:\t %u (0x%x)\n",
@@ -1382,9 +1381,9 @@ typedef union {
static void ntfs_dump_index_data(INDEX_ENTRY *entry, INDEX_ATTR_TYPE type)
{
INDEX_ENTRY_DATA *data;
-
+
data = (INDEX_ENTRY_DATA *)((u8 *)entry + entry->data_offset);
-
+
switch (type) {
case INDEX_ATTR_SECURE_SII:
ntfs_log_verbose("\t\tHash:\t\t\t 0x%08x\n",
@@ -1580,7 +1579,7 @@ static INDEX_ATTR_TYPE get_index_attr_ty
if (!attr->name_length)
return INDEX_ATTR_UNKNOWN;
-
+
if (index_root->type) {
if (index_root->type == AT_FILE_NAME)
return INDEX_ATTR_DIRECTORY_I30;
@@ -1590,12 +1589,12 @@ static INDEX_ATTR_TYPE get_index_attr_ty
index_root->type);
return INDEX_ATTR_UNKNOWN;
}
-
+
if (utils_is_metadata(ni) <= 0)
return INDEX_ATTR_UNKNOWN;
if (utils_inode_get_name(ni, file_name, sizeof(file_name)) <= 0)
return INDEX_ATTR_UNKNOWN;
-
+
if (COMPARE_INDEX_NAMES(attr, NTFS_INDEX_SDH))
return INDEX_ATTR_SECURE_SDH;
else if (COMPARE_INDEX_NAMES(attr, NTFS_INDEX_SII))
@@ -1612,7 +1611,7 @@ static INDEX_ATTR_TYPE get_index_attr_ty
else if (!strcmp(file_name, "/$Extend/$ObjId"))
return INDEX_ATTR_OBJID_O;
}
-
+
return INDEX_ATTR_UNKNOWN;
}
@@ -1649,7 +1648,7 @@ static void ntfs_dump_index_header(const
(unsigned)le32_to_cpu(idx->allocated_size),
(unsigned)le32_to_cpu(idx->allocated_size));
printf("%sIndex header flags:\t 0x%02x\n", indent, idx->flags);
-
+
/* FIXME: there are 3 reserved bytes here */
}
@@ -1670,7 +1669,7 @@ static void ntfs_dump_attr_index_root(AT
type = get_index_attr_type(ni, attr, index_root);
printf("\tIndexed Attr Type:\t ");
ntfs_dump_index_attr_type(type);
-
+
/* collation rule dumping */
printf("\tCollation Rule:\t\t %u (0x%x)\n",
(unsigned)le32_to_cpu(index_root->collation_rule),
@@ -1717,7 +1716,7 @@ static s32 ntfs_dump_index_block(INDEX_B
u32 ib_size)
{
INDEX_ENTRY *entry;
-
+
if (ntfs_mst_post_read_fixup((NTFS_RECORD*)ib, ib_size)) {
ntfs_log_perror("Damaged INDX record");
return -1;
@@ -1729,15 +1728,15 @@ static s32 ntfs_dump_index_block(INDEX_B
ntfs_log_verbose("\t\tNode VCN:\t\t %lld (0x%llx)\n",
(unsigned long long)sle64_to_cpu(ib->index_block_vcn),
(unsigned long long)sle64_to_cpu(ib->index_block_vcn));
-
- entry = (INDEX_ENTRY*)((u8*)ib +
+
+ entry = (INDEX_ENTRY*)((u8*)ib +
le32_to_cpu(ib->index.entries_offset) + 0x18);
-
+
if (opts.verbose) {
ntfs_dump_index_header("\t\t", &ib->index);
printf("\n");
}
-
+
return ntfs_dump_index_entries(entry, type);
}
@@ -1764,19 +1763,19 @@ static void ntfs_dump_attr_index_allocat
ntfs_log_perror("Failed to read $INDEX_ROOT attribute");
return;
}
-
+
type = get_index_attr_type(ni, attr, ir);
-
+
name = (ntfschar *)((u8 *)attr + le16_to_cpu(attr->name_offset));
name_len = attr->name_length;
-
+
byte = bitmap = ntfs_attr_readall(ni, AT_BITMAP, name, name_len, NULL);
if (!byte) {
ntfs_log_perror("Failed to read $BITMAP attribute");
goto out_index_root;
}
- tmp_alloc = allocation = ntfs_attr_readall(ni, AT_INDEX_ALLOCATION,
+ tmp_alloc = allocation = ntfs_attr_readall(ni, AT_INDEX_ALLOCATION,
name, name_len, &data_size);
if (!tmp_alloc) {
ntfs_log_perror("Failed to read $INDEX_ALLOCATION attribute");
@@ -1787,7 +1786,7 @@ static void ntfs_dump_attr_index_allocat
while ((u8 *)tmp_alloc < (u8 *)allocation + data_size) {
if (*byte & (1 << bit)) {
int entries;
-
+
entries = ntfs_dump_index_block(tmp_alloc, type,
le32_to_cpu(
ir->index_block_size));
@@ -1797,7 +1796,7 @@ static void ntfs_dump_attr_index_allocat
printf("\tIndex entries:\t\t %d\n", entries);
}
}
- tmp_alloc = (INDEX_ALLOCATION *)((u8 *)tmp_alloc +
+ tmp_alloc = (INDEX_ALLOCATION *)((u8 *)tmp_alloc +
le32_to_cpu(
ir->index_block_size));
bit++;
@@ -1809,7 +1808,7 @@ static void ntfs_dump_attr_index_allocat
printf("\tIndex entries total:\t %d\n", total_entries);
printf("\tINDX blocks total:\t %d\n", total_indx_blocks);
-
+
free(allocation);
out_bitmap:
free(bitmap);
@@ -2083,9 +2082,9 @@ static void ntfs_dump_inode_general_info
printf("Next Attribute Instance: %u (0x%x)\n",
(unsigned)le16_to_cpu(mrec->next_attr_instance),
(unsigned)le16_to_cpu(mrec->next_attr_instance));
-
+
printf("MFT Padding:\t");
- ntfs_dump_bytes((u8 *)mrec, le16_to_cpu(mrec->usa_ofs) +
+ ntfs_dump_bytes((u8 *)mrec, le16_to_cpu(mrec->usa_ofs) +
2 * le16_to_cpu(mrec->usa_count),
le16_to_cpu(mrec->attrs_offset));
printf("\n");
@@ -2102,7 +2101,6 @@ static void ntfs_dump_file_attributes(nt
see ntfs_attr_lookup documentation for detailed explanation */
ctx = ntfs_attr_get_search_ctx(inode, NULL);
while (!ntfs_attr_lookup(AT_UNUSED, NULL, 0, 0, 0, NULL, 0, ctx)) {
-
if (ctx->attr->type == AT_END || ctx->attr->type == AT_UNUSED) {
printf("Weird: %s attribute type was found, please "
"report this.\n",
@@ -2110,9 +2108,9 @@ static void ntfs_dump_file_attributes(nt
ctx->attr->type));
continue;
}
-
+
ntfs_dump_attribute_header(ctx->attr, inode->vol);
-
+
switch (ctx->attr->type) {
case AT_STANDARD_INFORMATION:
ntfs_dump_attr_standard_information(ctx->attr);
@@ -2194,7 +2192,7 @@ int main(int argc, char **argv)
ntfs_volume *vol;
setlinebuf(stdout);
-
+
ntfs_log_set_handler(ntfs_log_handler_outerr);
if (!parse_options(argc, argv)) {
Index: ntfsresize.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -p -r1.121 -r1.122
--- ntfsresize.c 18 Oct 2006 14:43:04 -0000 1.121
+++ ntfsresize.c 27 Oct 2006 12:24:30 -0000 1.122
@@ -2028,7 +2028,7 @@ static int check_bad_sectors(ntfs_volume
if (!ctx->attr->non_resident)
err_exit("Resident attribute in $BadClust! Please report to "
"%s\n", NTFS_DEV_LIST);
- /*
+ /*
* FIXME: The below would be partial for non-base records in the
* not yet supported multi-record case. Alternatively use audited
* ntfs_attr_truncate after an umount & mount.
|
|
From: Yuval <uv...@de...> - 2006-10-27 12:25:03
|
Changes by: uvman
Update of /cvs/linux-ntfs/ntfsprogs/include/ntfs
In directory delta357:/tmp/cvs-serv10841/include/ntfs
Modified Files:
layout.h list.h support.h
Log Message:
Whitespace cleanup
Index: layout.h
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/include/ntfs/layout.h,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- layout.h 20 Oct 2006 19:54:22 -0000 1.58
+++ layout.h 27 Oct 2006 12:24:29 -0000 1.59
@@ -244,7 +244,7 @@ typedef enum {
*
* These are the so far known MFT_RECORD_* flags (16-bit) which contain
* information about the mft record in which they are present.
- *
+ *
* MFT_RECORD_IS_4 exists on all $Extend sub-files.
* It seems that it marks it is a metadata file with MFT record >24, however,
* it is unknown if it is limited to metadata files only.
@@ -480,7 +480,7 @@ typedef struct {
* Each attribute type has a corresponding attribute name (Unicode string of
* maximum 64 character length) as described by the attribute definitions
* present in the data attribute of the $AttrDef system file.
- *
+ *
* On NTFS 3.0 volumes the names are just as the types are named in the below
* enum exchanging AT_ for the dollar sign ($). If that isn't a revealing
* choice of symbol... (-;
@@ -867,15 +867,15 @@ typedef enum {
* This is a copy of the MFT_RECORD_IS_DIRECTORY bit from the mft
* record, telling us whether this is a directory or not, i.e. whether
* it has an index root attribute named "$I30" or not.
- *
- * This flag is only present in the FILE_NAME attribute (in the
+ *
+ * This flag is only present in the FILE_NAME attribute (in the
* file_attributes field).
*/
FILE_ATTR_I30_INDEX_PRESENT = const_cpu_to_le32(0x10000000),
-
+
/**
* FILE_ATTR_VIEW_INDEX_PRESENT - Does have a non-directory index?
- *
+ *
* This is a copy of the MFT_RECORD_IS_VIEW_INDEX bit from the mft
* record, telling us whether this file has a view index present (eg.
* object id index, quota index, one of the security indexes and the
Index: list.h
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/include/ntfs/list.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- list.h 3 Nov 2005 19:20:14 -0000 1.4
+++ list.h 27 Oct 2006 12:24:30 -0000 1.5
@@ -24,7 +24,7 @@
/**
* struct list_head - Simple doubly linked list implementation.
- *
+ *
* Copied from Linux kernel 2.4.2-ac18 into Linux-NTFS (with minor
* modifications). - AIA
*
Index: support.h
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/include/ntfs/support.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- support.h 3 Aug 2006 02:49:00 -0000 1.11
+++ support.h 27 Oct 2006 12:24:30 -0000 1.12
@@ -98,13 +98,13 @@
/**
* ntfs_calloc, ntfs_malloc
- *
+ *
* Return a pointer to the allocated memory or NULL if the request fails.
*/
static inline void *ntfs_calloc(size_t size)
{
void *p;
-
+
p = calloc(1, size);
if (!p)
ntfs_log_perror("Failed to calloc %lld bytes", (long long)size);
@@ -114,7 +114,7 @@ static inline void *ntfs_calloc(size_t s
static inline void *ntfs_malloc(size_t size)
{
void *p;
-
+
p = malloc(size);
if (!p)
ntfs_log_perror("Failed to malloc %lld bytes", (long long)size);
|
|
From: Anton A. <ai...@de...> - 2006-10-27 09:06:25
|
Changes by: aia21
Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357:/tmp/cvs-serv12613
Modified Files:
runlist.c
Log Message:
Revert part of 1.71: Gratuituous API/ABI change.
Index: runlist.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/runlist.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- runlist.c 26 Oct 2006 19:10:05 -0000 1.71
+++ runlist.c 27 Oct 2006 09:05:56 -0000 1.72
@@ -1220,7 +1220,7 @@ rl_err_out:
*
* Return the number of bytes written. This function cannot fail.
*/
-static int ntfs_get_nr_significant_bytes(const s64 n)
+int ntfs_get_nr_significant_bytes(const s64 n)
{
s64 l = n;
int i;
@@ -1363,8 +1363,7 @@ err_out:
* Return the number of bytes written on success. On error, i.e. the
* destination buffer @dst is too small, return -1 with errno set ENOSPC.
*/
-static int ntfs_write_significant_bytes(u8 *dst, const u8 *dst_max,
- const s64 n)
+int ntfs_write_significant_bytes(u8 *dst, const u8 *dst_max, const s64 n)
{
s64 l = n;
int i;
|
|
From: Anton A. <ai...@de...> - 2006-10-27 09:04:40
|
Changes by: aia21 Update of /cvs/linux-ntfs/ntfsprogs/include/ntfs In directory delta357:/tmp/cvs-serv12501 Modified Files: runlist.h Log Message: Revert 1.13 commit from Yuval: Gratuitous API/ABI change. Index: runlist.h =================================================================== RCS file: /cvs/linux-ntfs/ntfsprogs/include/ntfs/runlist.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- runlist.h 26 Oct 2006 19:10:05 -0000 1.13 +++ runlist.h 27 Oct 2006 09:04:08 -0000 1.14 @@ -62,9 +62,14 @@ extern runlist_element *ntfs_runlists_me extern runlist_element *ntfs_mapping_pairs_decompress(const ntfs_volume *vol, const ATTR_RECORD *attr, runlist_element *old_rl); +extern int ntfs_get_nr_significant_bytes(const s64 n); + extern int ntfs_get_size_for_mapping_pairs(const ntfs_volume *vol, const runlist_element *rl, const VCN start_vcn); +extern int ntfs_write_significant_bytes(u8 *dst, const u8 *dst_max, + const s64 n); + extern int ntfs_mapping_pairs_build(const ntfs_volume *vol, u8 *dst, const int dst_len, const runlist_element *rl, const VCN start_vcn, VCN *const stop_vcn); |
|
From: Yuval <uv...@de...> - 2006-10-26 20:46:07
|
Changes by: uvman
Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357:/tmp/cvs-serv347/ntfsprogs
Modified Files:
utils.c
Log Message:
trace output updates. (Szaka, Yuval)
Index: utils.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/utils.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- utils.c 13 Aug 2006 16:06:57 -0000 1.65
+++ utils.c 26 Oct 2006 20:45:28 -0000 1.66
@@ -668,15 +668,15 @@ int utils_mftrec_in_use(ntfs_volume *vol
{
static u8 buffer[512];
static s64 bmpmref = -sizeof(buffer) - 1; /* Which bit of $BITMAP is in the buffer */
-
int byte, bit;
+ ntfs_log_trace("Entering.\n");
+
if (!vol) {
errno = EINVAL;
return -1;
}
- ntfs_log_trace("entering\n");
/* Does mref lie in the section of $Bitmap we already have cached? */
if (((s64)MREF(mref) < bmpmref) || ((s64)MREF(mref) >= (bmpmref +
(sizeof(buffer) << 3)))) {
|
|
From: Yuval <uv...@de...> - 2006-10-26 20:46:05
|
Changes by: uvman
Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357:/tmp/cvs-serv347/libntfs
Modified Files:
attrib.c dir.c
Log Message:
trace output updates. (Szaka, Yuval)
Index: attrib.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -p -r1.225 -r1.226
--- attrib.c 26 Oct 2006 19:10:05 -0000 1.225
+++ attrib.c 26 Oct 2006 20:45:28 -0000 1.226
@@ -1625,7 +1625,7 @@ static int ntfs_attr_find(const ATTR_TYP
ntfschar *upcase;
u32 upcase_len;
- ntfs_log_trace("Entering.\n");
+ ntfs_log_trace("Entering for attribute type 0x%x.\n", type);
if (ctx->ntfs_ino) {
vol = ctx->ntfs_ino->vol;
@@ -2461,6 +2461,7 @@ int ntfs_attr_can_be_non_resident(const
return -1;
/* Check the flags and return the result. */
if (ad->flags & ATTR_DEF_RESIDENT) {
+ ntfs_log_trace("Attribute can't be non-resident\n");
errno = EPERM;
return -1;
}
@@ -2497,6 +2498,8 @@ int ntfs_attr_can_be_resident(const ntfs
}
if (type != AT_INDEX_ALLOCATION)
return 0;
+
+ ntfs_log_trace("Attribute can't be resident\n");
errno = EPERM;
return -1;
}
@@ -2543,6 +2546,7 @@ int ntfs_make_room_for_attr(MFT_RECORD *
biu = le32_to_cpu(m->bytes_in_use);
/* Do we have enough space? */
if (biu + size > le32_to_cpu(m->bytes_allocated)) {
+ ntfs_log_trace("Not enough space in the MFT record\n");
errno = ENOSPC;
return -1;
}
@@ -2929,7 +2933,7 @@ int ntfs_attr_record_rm(ntfs_attr_search
ctx->attr, NULL);
if (!al_rl) {
ntfs_log_trace("Couldn't decompress attribute "
- "list runlist. Return success "
+ "list runlist. Succeed "
"anyway.\n");
return 0;
}
@@ -2948,7 +2952,7 @@ int ntfs_attr_record_rm(ntfs_attr_search
* but without extents.
*/
ntfs_log_trace("Couldn't remove attribute list. "
- "Return success anyway.\n");
+ "Succeed anyway.\n");
return 0;
}
}
@@ -3717,8 +3721,9 @@ static int ntfs_resident_attr_resize(ntf
ntfs_inode *ni;
int err;
- ntfs_log_trace("Entering for inode 0x%llx, attr 0x%x.\n", (unsigned long
- long)na->ni->mft_no, na->type);
+ ntfs_log_trace("Entering for inode 0x%llx, attr 0x%x, new size %lld.\n",
+ (unsigned long long)na->ni->mft_no, na->type,
+ (long long)newsize);
/* Get the attribute record that needs modification. */
ctx = ntfs_attr_get_search_ctx(na->ni, NULL);
@@ -4012,6 +4017,7 @@ static int ntfs_attr_make_resident(ntfs_
/* Sanity check the size before we start modifying the attribute. */
if (le32_to_cpu(ctx->mrec->bytes_in_use) - le32_to_cpu(a->length) +
arec_size > le32_to_cpu(ctx->mrec->bytes_allocated)) {
+ ntfs_log_trace("Not enough space to make attribute resident\n");
errno = ENOSPC;
return -1;
}
@@ -4588,8 +4594,9 @@ static int ntfs_non_resident_attr_shrink
s64 nr_freed_clusters;
int err;
- ntfs_log_trace("Entering for inode 0x%llx, attr 0x%x.\n", (unsigned long
- long)na->ni->mft_no, na->type);
+ ntfs_log_trace("Entering for inode 0x%llx, attr 0x%x, newsize %lld.\n",
+ (unsigned long long)na->ni->mft_no, na->type,
+ (long long)newsize);
vol = na->ni->vol;
Index: dir.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/dir.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- dir.c 26 Oct 2006 19:10:05 -0000 1.68
+++ dir.c 26 Oct 2006 20:45:28 -0000 1.69
@@ -515,6 +515,8 @@ ntfs_inode *ntfs_pathname_to_inode(ntfs_
return NULL;
}
+ ntfs_log_trace("Path: '%s'\n", pathname);
+
if (parent) {
ni = parent;
} else {
@@ -636,6 +638,8 @@ static int ntfs_filldir(ntfs_inode *dir_
FILE_NAME_ATTR *fn = &ie->key.file_name;
unsigned dt_type;
+ ntfs_log_trace("Entering.\n");
+
/* Advance the position even if going to skip the entry. */
if (index_type == INDEX_TYPE_ALLOCATION)
*pos = (u8*)ie - (u8*)iu.ia + (sle64_to_cpu(
@@ -680,6 +684,8 @@ static MFT_REF ntfs_mft_get_parent_ref(n
FILE_NAME_ATTR *fn;
int eo;
+ ntfs_log_trace("Entering.\n");
+
if (!ni) {
errno = EINVAL;
return ERR_MREF(-1);
@@ -749,6 +755,8 @@ int ntfs_readdir(ntfs_inode *dir_ni, s64
u32 index_block_size, index_vcn_size;
u8 index_block_size_bits, index_vcn_size_bits;
+ ntfs_log_trace("Entering.\n");
+
if (!dir_ni || !pos || !filldir) {
errno = EINVAL;
return -1;
@@ -1119,6 +1127,7 @@ static ntfs_inode *__ntfs_create(ntfs_in
int err, fn_len, si_len, sd_len;
ntfs_log_trace("Entering.\n");
+
/* Sanity checks. */
if (!dir_ni || !name || !name_len) {
ntfs_log_error("Invalid arguments.\n");
@@ -1462,6 +1471,7 @@ int ntfs_delete(ntfs_inode *ni, ntfs_ino
int err = 0;
ntfs_log_trace("Entering.\n");
+
if (!ni || !dir_ni || !name || !name_len) {
ntfs_log_error("Invalid arguments.\n");
errno = EINVAL;
@@ -1694,6 +1704,7 @@ int ntfs_link(ntfs_inode *ni, ntfs_inode
int fn_len, err;
ntfs_log_trace("Entering.\n");
+
if (!ni || !dir_ni || !name || !name_len ||
ni->mft_no == dir_ni->mft_no) {
err = errno;
|
|
From: Yuval <uv...@de...> - 2006-10-26 19:10:38
|
Changes by: uvman Update of /cvs/linux-ntfs/ntfsprogs/include/ntfs In directory delta357:/tmp/cvs-serv17281/include/ntfs Modified Files: runlist.h Log Message: Remove inline keywords from static non-one-liners of '.c' files. Index: runlist.h =================================================================== RCS file: /cvs/linux-ntfs/ntfsprogs/include/ntfs/runlist.h,v retrieving revision 1.12 retrieving revision 1.13 diff -u -p -r1.12 -r1.13 --- runlist.h 3 Nov 2005 19:20:14 -0000 1.12 +++ runlist.h 26 Oct 2006 19:10:05 -0000 1.13 @@ -62,14 +62,9 @@ extern runlist_element *ntfs_runlists_me extern runlist_element *ntfs_mapping_pairs_decompress(const ntfs_volume *vol, const ATTR_RECORD *attr, runlist_element *old_rl); -extern int ntfs_get_nr_significant_bytes(const s64 n); - extern int ntfs_get_size_for_mapping_pairs(const ntfs_volume *vol, const runlist_element *rl, const VCN start_vcn); -extern int ntfs_write_significant_bytes(u8 *dst, const u8 *dst_max, - const s64 n); - extern int ntfs_mapping_pairs_build(const ntfs_volume *vol, u8 *dst, const int dst_len, const runlist_element *rl, const VCN start_vcn, VCN *const stop_vcn); |
|
From: Yuval <uv...@de...> - 2006-10-26 19:10:37
|
Changes by: uvman Update of /cvs/linux-ntfs/ntfsprogs In directory delta357:/tmp/cvs-serv17281 Modified Files: ChangeLog Log Message: Remove inline keywords from static non-one-liners of '.c' files. Index: ChangeLog =================================================================== RCS file: /cvs/linux-ntfs/ntfsprogs/ChangeLog,v retrieving revision 1.403 retrieving revision 1.404 diff -u -p -r1.403 -r1.404 --- ChangeLog 25 Oct 2006 18:57:15 -0000 1.403 +++ ChangeLog 26 Oct 2006 19:10:05 -0000 1.404 @@ -55,6 +55,7 @@ xx/xx/2006 - x.xx.x - . - Fix some byte-order conversion for u32 variables that used le16 conversion macros. (zhanglinbao, Yuval) - Spelling mistake fixes in debug logging strings. (Yuval) + - Remove inline keywords from static non-one-liners. (Szaka, Yuval) 21/06/2006 - 1.13.1 - Various fixes. |
Changes by: uvman
Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357:/tmp/cvs-serv17281/libntfs
Modified Files:
attrib.c bitmap.c compress.c device.c dir.c inode.c runlist.c
win32_io.c
Log Message:
Remove inline keywords from static non-one-liners of '.c' files.
Index: attrib.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.224
retrieving revision 1.225
diff -u -p -r1.224 -r1.225
--- attrib.c 25 Oct 2006 18:57:15 -0000 1.224
+++ attrib.c 26 Oct 2006 19:10:05 -0000 1.225
@@ -274,7 +274,7 @@ s64 ntfs_get_attribute_value(const ntfs_
*
* Initialize the ntfs attribute @na with @ni, @type, @name, and @name_len.
*/
-static __inline__ void __ntfs_attr_init(ntfs_attr *na, ntfs_inode *ni,
+static void __ntfs_attr_init(ntfs_attr *na, ntfs_inode *ni,
const ATTR_TYPES type, ntfschar *name, const u32 name_len)
{
na->rl = NULL;
@@ -2264,7 +2264,7 @@ int ntfs_attr_lookup(const ATTR_TYPES ty
*
* Initialize the attribute search context @ctx with @ni and @mrec.
*/
-static __inline__ void ntfs_attr_init_search_ctx(ntfs_attr_search_ctx *ctx,
+static void ntfs_attr_init_search_ctx(ntfs_attr_search_ctx *ctx,
ntfs_inode *ni, MFT_RECORD *mrec)
{
if (!mrec)
Index: bitmap.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/bitmap.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- bitmap.c 17 Jul 2006 11:49:52 -0000 1.24
+++ bitmap.c 26 Oct 2006 19:10:05 -0000 1.25
@@ -55,7 +55,7 @@
*
* On success return 0 and on error return -1 with errno set to the error code.
*/
-static __inline__ int ntfs_bitmap_set_bits_in_run(ntfs_attr *na, s64 start_bit,
+static int ntfs_bitmap_set_bits_in_run(ntfs_attr *na, s64 start_bit,
s64 count, int value)
{
s64 bufsize, br;
Index: compress.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/compress.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- compress.c 31 Oct 2005 01:19:27 -0000 1.15
+++ compress.c 26 Oct 2006 19:10:05 -0000 1.16
@@ -261,7 +261,7 @@ return_overflow:
* code. Might be a bit confusing to debug but there really should never be
* errors coming from here.
*/
-static __inline__ BOOL ntfs_is_cb_compressed(ntfs_attr *na,
+static BOOL ntfs_is_cb_compressed(ntfs_attr *na,
runlist_element *rl, VCN cb_start_vcn, int cb_clusters)
{
/*
Index: device.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/device.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- device.c 24 Feb 2006 15:49:59 -0000 1.29
+++ device.c 26 Oct 2006 19:10:05 -0000 1.30
@@ -469,7 +469,7 @@ s64 ntfs_cluster_write(const ntfs_volume
*
* Return 0 if it is valid and -1 if it is not valid.
*/
-static inline int ntfs_device_offset_valid(struct ntfs_device *dev, s64 ofs)
+static int ntfs_device_offset_valid(struct ntfs_device *dev, s64 ofs)
{
char ch;
Index: dir.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/dir.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- dir.c 25 Oct 2006 18:57:15 -0000 1.67
+++ dir.c 26 Oct 2006 19:10:05 -0000 1.68
@@ -629,7 +629,7 @@ typedef enum {
* Pass information specifying the current directory entry @ie to the @filldir
* callback.
*/
-static inline int ntfs_filldir(ntfs_inode *dir_ni, s64 *pos, u8 ivcn_bits,
+static int ntfs_filldir(ntfs_inode *dir_ni, s64 *pos, u8 ivcn_bits,
const INDEX_TYPE index_type, index_union iu, INDEX_ENTRY *ie,
void *dirent, ntfs_filldir_t filldir)
{
Index: inode.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/inode.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- inode.c 22 Oct 2006 00:23:29 -0000 1.85
+++ inode.c 26 Oct 2006 19:10:05 -0000 1.86
@@ -57,7 +57,7 @@
*
* Returns:
*/
-static __inline__ ntfs_inode *__ntfs_inode_allocate(ntfs_volume *vol)
+static ntfs_inode *__ntfs_inode_allocate(ntfs_volume *vol)
{
ntfs_inode *ni;
@@ -88,7 +88,7 @@ ntfs_inode *ntfs_inode_allocate(ntfs_vol
*
* Returns:
*/
-static __inline__ int __ntfs_inode_release(ntfs_inode *ni)
+static int __ntfs_inode_release(ntfs_inode *ni)
{
if (NInoDirty(ni))
ntfs_log_debug("Eeek. Discarding dirty inode!\n");
Index: runlist.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/runlist.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- runlist.c 25 Sep 2006 17:03:48 -0000 1.70
+++ runlist.c 26 Oct 2006 19:10:05 -0000 1.71
@@ -100,7 +100,7 @@ static __inline__ void ntfs_rl_mc(runlis
* On success, return a pointer to the newly allocated, or recycled, memory.
* On error, return NULL with errno set to the error code.
*/
-static __inline__ runlist_element *ntfs_rl_realloc(runlist_element *rl,
+static runlist_element *ntfs_rl_realloc(runlist_element *rl,
int old_size, int new_size)
{
old_size = (old_size * sizeof(runlist_element) + 0xfff) & ~0xfff;
@@ -121,7 +121,7 @@ static __inline__ runlist_element *ntfs_
* Return: TRUE Success, the runlists can be merged.
* FALSE Failure, the runlists cannot be merged.
*/
-static __inline__ BOOL ntfs_rl_are_mergeable(runlist_element *dst,
+static BOOL ntfs_rl_are_mergeable(runlist_element *dst,
runlist_element *src)
{
if (!dst || !src) {
@@ -182,7 +182,7 @@ static __inline__ void __ntfs_rl_merge(r
* On error, return NULL, with errno set to the error code. Both runlists are
* left unmodified.
*/
-static __inline__ runlist_element *ntfs_rl_append(runlist_element *dst,
+static runlist_element *ntfs_rl_append(runlist_element *dst,
int dsize, runlist_element *src, int ssize, int loc)
{
BOOL right = FALSE; /* Right end of @src needs merging */
@@ -249,7 +249,7 @@ static __inline__ runlist_element *ntfs_
* On error, return NULL, with errno set to the error code. Both runlists are
* left unmodified.
*/
-static __inline__ runlist_element *ntfs_rl_insert(runlist_element *dst,
+static runlist_element *ntfs_rl_insert(runlist_element *dst,
int dsize, runlist_element *src, int ssize, int loc)
{
BOOL left = FALSE; /* Left end of @src needs merging */
@@ -345,7 +345,7 @@ static __inline__ runlist_element *ntfs_
* On error, return NULL, with errno set to the error code. Both runlists are
* left unmodified.
*/
-static __inline__ runlist_element *ntfs_rl_replace(runlist_element *dst,
+static runlist_element *ntfs_rl_replace(runlist_element *dst,
int dsize, runlist_element *src, int ssize, int loc)
{
signed delta;
@@ -432,7 +432,7 @@ static __inline__ runlist_element *ntfs_
* On error, return NULL, with errno set to the error code. Both runlists are
* left unmodified.
*/
-static __inline__ runlist_element *ntfs_rl_split(runlist_element *dst,
+static runlist_element *ntfs_rl_split(runlist_element *dst,
int dsize, runlist_element *src, int ssize, int loc)
{
if (!dst || !src) {
@@ -1220,7 +1220,7 @@ rl_err_out:
*
* Return the number of bytes written. This function cannot fail.
*/
-__inline__ int ntfs_get_nr_significant_bytes(const s64 n)
+static int ntfs_get_nr_significant_bytes(const s64 n)
{
s64 l = n;
int i;
@@ -1363,7 +1363,7 @@ err_out:
* Return the number of bytes written on success. On error, i.e. the
* destination buffer @dst is too small, return -1 with errno set ENOSPC.
*/
-__inline__ int ntfs_write_significant_bytes(u8 *dst, const u8 *dst_max,
+static int ntfs_write_significant_bytes(u8 *dst, const u8 *dst_max,
const s64 n)
{
s64 l = n;
Index: win32_io.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/win32_io.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- win32_io.c 18 Oct 2006 14:44:23 -0000 1.47
+++ win32_io.c 26 Oct 2006 19:10:05 -0000 1.48
@@ -222,7 +222,7 @@ static void ntfs_device_win32_init_impor
*
* Supported flags are O_RDONLY, O_WRONLY and O_RDWR.
*/
-static __inline__ int ntfs_device_unix_status_flags_to_win32(int flags)
+static int ntfs_device_unix_status_flags_to_win32(int flags)
{
int win_mode;
@@ -508,7 +508,7 @@ static int ntfs_device_win32_getgeo(HAND
* Return 0 if o.k.
* -1 if not, and errno set.
*/
-static __inline__ int ntfs_device_win32_open_file(char *filename, win32_fd *fd,
+static int ntfs_device_win32_open_file(char *filename, win32_fd *fd,
int flags)
{
HANDLE handle;
@@ -538,7 +538,7 @@ static __inline__ int ntfs_device_win32_
* return 0 if o.k.
* -1 if not, and errno set.
*/
-static __inline__ int ntfs_device_win32_open_drive(int drive_id, win32_fd *fd,
+static int ntfs_device_win32_open_drive(int drive_id, win32_fd *fd,
int flags)
{
HANDLE handle;
@@ -1360,7 +1360,7 @@ static int ntfs_device_win32_stat(struct
* Return 0 if o.k.
* -1 if not, and errno set. Note if error fd->handle is trashed.
*/
-static __inline__ int ntfs_win32_hdio_getgeo(struct ntfs_device *dev,
+static int ntfs_win32_hdio_getgeo(struct ntfs_device *dev,
struct hd_geometry *argp)
{
win32_fd *fd = (win32_fd *)dev->d_private;
@@ -1382,7 +1382,7 @@ static __inline__ int ntfs_win32_hdio_ge
* Return 0 if o.k.
* -1 if not, and errno set. Note if error fd->handle is trashed.
*/
-static __inline__ int ntfs_win32_blksszget(struct ntfs_device *dev,int *argp)
+static int ntfs_win32_blksszget(struct ntfs_device *dev,int *argp)
{
win32_fd *fd = (win32_fd *)dev->d_private;
DWORD bytesReturned;
|
|
From: Yuval <uv...@de...> - 2006-10-25 18:57:47
|
Changes by: uvman Update of /cvs/linux-ntfs/ntfsprogs In directory delta357:/tmp/cvs-serv9049 Modified Files: ChangeLog Log Message: [Inconstant,Damaged] metadata -> Inconsistent metadata Index: ChangeLog =================================================================== RCS file: /cvs/linux-ntfs/ntfsprogs/ChangeLog,v retrieving revision 1.402 retrieving revision 1.403 diff -u -p -r1.402 -r1.403 --- ChangeLog 25 Oct 2006 16:49:00 -0000 1.402 +++ ChangeLog 25 Oct 2006 18:57:15 -0000 1.403 @@ -53,7 +53,8 @@ xx/xx/2006 - x.xx.x - . exists by calling ntfs_create(). (Hil) - Fix GUID to string conversion. (Anton) - Fix some byte-order conversion for u32 variables that used le16 - conversion macros. (zhanglinbao, Yuval) + conversion macros. (zhanglinbao, Yuval) + - Spelling mistake fixes in debug logging strings. (Yuval) 21/06/2006 - 1.13.1 - Various fixes. |
|
From: Yuval <uv...@de...> - 2006-10-25 18:57:47
|
Changes by: uvman
Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357:/tmp/cvs-serv9049/libntfs
Modified Files:
attrib.c dir.c
Log Message:
[Inconstant,Damaged] metadata -> Inconsistent metadata
Index: attrib.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -p -r1.223 -r1.224
--- attrib.c 22 Oct 2006 01:11:48 -0000 1.223
+++ attrib.c 25 Oct 2006 18:57:15 -0000 1.224
@@ -1246,7 +1246,7 @@ s64 ntfs_attr_pwrite(ntfs_attr *na, cons
if (ntfs_cluster_free_from_rl(vol, rlc)) {
ntfs_log_trace("Failed to free just "
"allocated clusters. Leaving "
- "inconstant metadata. "
+ "inconsistent metadata. "
"Run chkdsk\n");
}
errno = eo;
@@ -2809,11 +2809,10 @@ int ntfs_non_resident_attr_record_add(nt
lowest_vcn, NULL, 0, ctx)) {
err = errno;
ntfs_log_trace("Attribute lookup failed. Probably leaving "
- "inconstant metadata.\n");
+ "inconsistent metadata.\n");
ntfs_attr_put_search_ctx(ctx);
errno = err;
return -1;
-
}
offset = (u8*)ctx->attr - (u8*)ctx->mrec;
ntfs_attr_put_search_ctx(ctx);
@@ -2864,7 +2863,7 @@ int ntfs_attr_record_rm(ntfs_attr_search
if (NInoAttrList(base_ni) && type != AT_ATTRIBUTE_LIST)
if (ntfs_attrlist_entry_add(ni, ctx->attr))
ntfs_log_trace("Rollback failed. Leaving "
- "inconstant metadata.\n");
+ "inconsistent metadata.\n");
err = EIO;
return -1;
}
@@ -3149,7 +3148,8 @@ add_attr_record:
ntfs_log_trace("Failed to initialize just added attribute.\n");
if (ntfs_attr_rm(na)) {
ntfs_log_trace("Failed to remove just added attribute. "
- "Probably leaving damaged metadata.\n");
+ "Probably leaving inconsistent "
+ "metadata.\n");
ntfs_attr_close(na);
}
goto err_out;
@@ -3170,7 +3170,7 @@ free_err_out:
le32_to_cpu(attr_ni->mrec->attrs_offset) == 8) {
if (ntfs_mft_record_free(attr_ni->vol, attr_ni)) {
ntfs_log_trace("Failed to free MFT record. Leaving "
- "inconstant metadata.\n");
+ "inconsistent metadata.\n");
}
}
err_out:
@@ -3207,7 +3207,7 @@ int ntfs_attr_rm(ntfs_attr *na)
return -1;
if (ntfs_cluster_free(na->ni->vol, na, 0, -1) < 0) {
ntfs_log_trace("Failed to free cluster allocation. "
- "Leaving inconstant metadata.\n");
+ "Leaving inconsistent metadata.\n");
ret = -1;
}
}
@@ -3220,14 +3220,14 @@ int ntfs_attr_rm(ntfs_attr *na)
CASE_SENSITIVE, 0, NULL, 0, ctx)) {
if (ntfs_attr_record_rm(ctx)) {
ntfs_log_trace("Failed to remove attribute extent. "
- "Leaving inconstant metadata.\n");
+ "Leaving inconsistent metadata.\n");
ret = -1;
}
ntfs_attr_reinit_search_ctx(ctx);
}
if (errno != ENOENT) {
ntfs_log_trace("Attribute lookup failed. "
- "Probably leaving inconstant metadata.\n");
+ "Probably leaving inconsistent metadata.\n");
ret = -1;
}
@@ -4067,7 +4067,7 @@ static int ntfs_attr_make_resident(ntfs_
if (bytes_read >= 0)
errno = EIO;
ntfs_log_trace("Eeek! Failed to read attribute data. Leaving "
- "inconstant metadata. Run chkdsk. "
+ "inconsistent metadata. Run chkdsk. "
"Aborting...\n");
return -1;
}
@@ -4327,8 +4327,9 @@ retry:
na->ni->vol, na->rl);
if (new_compr_size == -1) {
err = errno;
- ntfs_log_trace("BUG! Leaving inconstant"
- " metadata.\n");
+ ntfs_log_trace("BUG! Leaving "
+ "inconsistent "
+ "metadata.\n");
goto put_err_out;
}
na->compressed_size = new_compr_size;
@@ -4646,7 +4647,7 @@ static int ntfs_non_resident_attr_shrink
/* Write mapping pairs for new runlist. */
if (ntfs_attr_update_mapping_pairs(na, 0 /*first_free_vcn*/)) {
ntfs_log_trace("Eeek! Mapping pairs update failed. "
- "Leaving inconstant metadata. "
+ "Leaving inconsistent metadata. "
"Run chkdsk.\n");
return -1;
}
@@ -4664,7 +4665,7 @@ static int ntfs_non_resident_attr_shrink
if (err == ENOENT)
err = EIO;
ntfs_log_trace("Eeek! Lookup of first attribute extent failed. "
- "Leaving inconstant metadata.\n");
+ "Leaving inconsistent metadata.\n");
goto put_err_out;
}
Index: dir.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/dir.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- dir.c 22 Oct 2006 00:23:29 -0000 1.66
+++ dir.c 25 Oct 2006 18:57:15 -0000 1.67
@@ -1622,13 +1622,15 @@ search:
if (!rl) {
err = errno;
ntfs_log_error("Failed to decompress runlist. "
- "Leaving damaged metadata.\n");
+ "Leaving inconsistent "
+ "metadata.\n");
continue;
}
if (ntfs_cluster_free_from_rl(ni->vol, rl)) {
err = errno;
ntfs_log_error("Failed to free clusters. "
- "Leaving damaged metadata.\n");
+ "Leaving inconsistent "
+ "metadata.\n");
continue;
}
free(rl);
|
|
From: Yuval <uv...@de...> - 2006-10-25 16:49:39
|
Changes by: uvman
Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357:/tmp/cvs-serv11368/libntfs
Modified Files:
index.c
Log Message:
Use le32 conversion macros for u32 variables of INDEX_HEADER. (zhanglinbao2000, Yuval)
Index: index.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/index.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- index.c 25 Sep 2006 16:58:38 -0000 1.30
+++ index.c 25 Oct 2006 16:49:00 -0000 1.31
@@ -1145,7 +1145,7 @@ static int ntfs_ir_truncate(ntfs_index_c
if (!icx->ir)
return STATUS_ERROR;
- icx->ir->index.allocated_size = cpu_to_le16(data_size);
+ icx->ir->index.allocated_size = cpu_to_le32(data_size);
ntfs_attr_put_search_ctx(ctx);
} else {
@@ -1246,7 +1246,7 @@ static int ntfs_ir_insert_median(ntfs_in
ntfs_log_trace("Entering.\n");
- new_size = le16_to_cpu(icx->ir->index.index_length) + median->length;
+ new_size = le32_to_cpu(icx->ir->index.index_length) + median->length;
if (!(median->flags & INDEX_ENTRY_NODE))
new_size += sizeof(VCN);
@@ -1284,8 +1284,8 @@ static int ntfs_ib_insert(ntfs_index_con
if (ntfs_ib_read(icx, old_vcn, ib))
goto err_out;
- idx_size = le16_to_cpu(ib->index.index_length);
- allocated_size = le16_to_cpu(ib->index.allocated_size);
+ idx_size = le32_to_cpu(ib->index.index_length);
+ allocated_size = le32_to_cpu(ib->index.allocated_size);
/* FIXME: sizeof(VCN) should be included only if ie has no VCN */
if (idx_size + ie->length + sizeof(VCN) > allocated_size) {
err = ntfs_ib_split(icx, ib);
@@ -1385,8 +1385,8 @@ static int ntfs_ie_add(ntfs_index_contex
else
ih = &icx->ib->index;
- allocated_size = le16_to_cpu(ih->allocated_size);
- new_size = le16_to_cpu(ih->index_length) +
+ allocated_size = le32_to_cpu(ih->allocated_size);
+ new_size = le32_to_cpu(ih->index_length) +
le16_to_cpu(ie->length);
if (new_size <= allocated_size)
|
|
From: Yuval <uv...@de...> - 2006-10-25 16:49:34
|
Changes by: uvman Update of /cvs/linux-ntfs/ntfsprogs In directory delta357:/tmp/cvs-serv11368 Modified Files: ChangeLog Log Message: Use le32 conversion macros for u32 variables of INDEX_HEADER. (zhanglinbao2000, Yuval) Index: ChangeLog =================================================================== RCS file: /cvs/linux-ntfs/ntfsprogs/ChangeLog,v retrieving revision 1.401 retrieving revision 1.402 diff -u -p -r1.401 -r1.402 --- ChangeLog 10 Oct 2006 10:29:53 -0000 1.401 +++ ChangeLog 25 Oct 2006 16:49:00 -0000 1.402 @@ -52,6 +52,8 @@ xx/xx/2006 - x.xx.x - . - Allow ntfscp to create the destination file if it does not already exists by calling ntfs_create(). (Hil) - Fix GUID to string conversion. (Anton) + - Fix some byte-order conversion for u32 variables that used le16 + conversion macros. (zhanglinbao, Yuval) 21/06/2006 - 1.13.1 - Various fixes. |
|
From: Yuval <uv...@de...> - 2006-10-22 01:12:14
|
Changes by: uvman
Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357:/tmp/cvs-serv9297/libntfs
Modified Files:
attrib.c
Log Message:
One more errno save/restore.
Index: attrib.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -p -r1.222 -r1.223
--- attrib.c 22 Oct 2006 00:23:29 -0000 1.222
+++ attrib.c 22 Oct 2006 01:11:48 -0000 1.223
@@ -3834,11 +3834,9 @@ static int ntfs_resident_attr_resize(ntf
ntfs_attr_put_search_ctx(ctx);
if (ntfs_inode_free_space(na->ni, offsetof(ATTR_RECORD,
non_resident_end) + 8)) {
- err = errno;
ntfs_log_trace("Couldn't free space in the MFT record "
"to make attribute list non "
"resident.\n");
- errno = err;
return -1;
}
return ntfs_resident_attr_resize(na, newsize);
|
|
From: Yuval <uv...@de...> - 2006-10-22 00:23:51
|
Changes by: uvman
Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357:/tmp/cvs-serv732/libntfs
Modified Files:
attrib.c dir.c inode.c
Log Message:
Remove saving and restoring errno around logging calls as these will not change errno anyway. Remove save/restore only if the saved value will not be used.
Index: attrib.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.221
retrieving revision 1.222
diff -u -p -r1.221 -r1.222
--- attrib.c 14 Aug 2006 03:52:56 -0000 1.221
+++ attrib.c 22 Oct 2006 00:23:29 -0000 1.222
@@ -588,13 +588,11 @@ int ntfs_attr_map_whole_runlist(ntfs_att
}
}
if (!a) {
- err = errno;
- if (err == ENOENT)
+ if (errno == ENOENT)
ntfs_log_trace("Attribute not found. "
"Inode is corrupt.\n");
else
ntfs_log_trace("Inode is corrupt.\n");
- errno = err;
goto err_out;
}
if (highest_vcn && highest_vcn != last_vcn - 1) {
@@ -1050,9 +1048,7 @@ s64 ntfs_attr_pwrite(ntfs_attr *na, cons
buf = malloc(NTFS_BUF_SIZE);
if (!buf) {
- err = errno;
ntfs_log_trace("Not enough memory.\n");
- errno = err;
goto err_out;
}
memset(buf, 0, NTFS_BUF_SIZE);
@@ -2594,12 +2590,10 @@ int ntfs_resident_attr_record_add(ntfs_i
}
if (ntfs_attr_can_be_resident(ni->vol, type)) {
- err = errno;
if (errno == EPERM)
ntfs_log_trace("Attribute can't be resident.\n");
else
ntfs_log_trace("ntfs_attr_can_be_resident failed.\n");
- errno = err;
return -1;
}
@@ -2722,13 +2716,11 @@ int ntfs_non_resident_attr_record_add(nt
}
if (ntfs_attr_can_be_non_resident(ni->vol, type)) {
- err = errno;
if (errno == EPERM)
ntfs_log_trace("Attribute can't be non resident.\n");
else
ntfs_log_trace("ntfs_attr_can_be_non_resident() "
"failed.\n");
- errno = err;
return -1;
}
@@ -2884,10 +2876,8 @@ int ntfs_attr_record_rm(ntfs_attr_search
*/
if (NInoAttrList(base_ni) && type != AT_ATTRIBUTE_LIST) {
if (ntfs_attrlist_entry_rm(ctx)) {
- err = errno;
ntfs_log_trace("Couldn't delete record from "
"$ATTRIBUTE_LIST.\n");
- errno = err;
return -1;
}
}
@@ -3015,14 +3005,12 @@ int ntfs_attr_add(ntfs_inode *ni, ATTR_T
/* Check the attribute type and the size. */
if (ntfs_attr_size_bounds_check(ni->vol, type, size)) {
- err = errno;
- if (err == ERANGE) {
+ if (errno == ERANGE) {
ntfs_log_trace("Size bounds check failed.\n");
- } else if (err == ENOENT) {
+ } else if (errno == ENOENT) {
ntfs_log_trace("Invalid attribute type. Aborting...\n");
- err = EIO;
+ errno = EIO;
}
- errno = err;
return -1;
}
@@ -3389,9 +3377,7 @@ int ntfs_attr_record_move_to(ntfs_attr_s
a = ctx->attr;
nctx = ntfs_attr_get_search_ctx(ni, NULL);
if (!nctx) {
- err = errno;
ntfs_log_trace("Couldn't obtain search context.\n");
- errno = err;
return -1;
}
/*
@@ -3459,7 +3445,7 @@ int ntfs_attr_record_move_away(ntfs_attr
{
ntfs_inode *base_ni, *ni;
MFT_RECORD *m;
- int i, err;
+ int i;
if (!ctx || !ctx->attr || !ctx->ntfs_ino || extra < 0) {
ntfs_log_trace("Invalid arguments passed.\n");
@@ -3484,9 +3470,7 @@ int ntfs_attr_record_move_away(ntfs_attr
}
if (ntfs_inode_attach_all_extents(ctx->ntfs_ino)) {
- err = errno;
ntfs_log_trace("Couldn't attach extent inode.\n");
- errno = err;
return -1;
}
@@ -3518,15 +3502,11 @@ int ntfs_attr_record_move_away(ntfs_attr
*/
ni = ntfs_mft_record_alloc(base_ni->vol, base_ni);
if (!ni) {
- err = errno;
ntfs_log_trace("Couldn't allocate new MFT record.\n");
- errno = err;
return -1;
}
if (ntfs_attr_record_move_to(ctx, ni)) {
- err = errno;
ntfs_log_trace("Couldn't move attribute to new MFT record.\n");
- errno = err;
return -1;
}
return 0;
@@ -3558,7 +3538,7 @@ static int ntfs_attr_make_non_resident(n
ntfs_volume *vol = na->ni->vol;
ATTR_REC *a = ctx->attr;
runlist *rl;
- int mp_size, mp_ofs, name_ofs, arec_size, err;
+ int mp_size, mp_ofs, name_ofs, arec_size;
ntfs_log_trace("Entering for inode 0x%llx, attr 0x%x.\n", (unsigned long
long)na->ni->mft_no, na->type);
@@ -3596,11 +3576,8 @@ static int ntfs_attr_make_non_resident(n
vol->cluster_size_bits, -1, DATA_ZONE);
if (!rl) {
if (errno != ENOSPC) {
- int eo = errno;
-
ntfs_log_trace("Eeek! Failed to allocate "
"cluster(s). Aborting...\n");
- errno = eo;
}
return -1;
}
@@ -3627,19 +3604,17 @@ static int ntfs_attr_make_non_resident(n
bw = ntfs_attr_pwrite(na, 0, le32_to_cpu(a->value_length),
(u8*)a + le16_to_cpu(a->value_offset));
if (bw != le32_to_cpu(a->value_length)) {
- err = errno;
ntfs_log_debug("Failed to write out attribute value "
"(bw = %lli, errno = %i). "
- "Aborting...\n", (long long)bw, err);
+ "Aborting...\n", (long long)bw, errno);
if (bw >= 0)
- err = EIO;
+ errno = EIO;
goto cluster_free_err_out;
}
}
/* Determine the size of the mapping pairs array. */
mp_size = ntfs_get_size_for_mapping_pairs(vol, rl, 0);
if (mp_size < 0) {
- err = errno;
ntfs_log_debug("Failed to get size for mapping pairs array. "
"Aborting...\n");
goto cluster_free_err_out;
@@ -3656,8 +3631,7 @@ static int ntfs_attr_make_non_resident(n
/* Resize the resident part of the attribute record. */
if (ntfs_attr_record_resize(ctx->mrec, a, arec_size) < 0) {
- err = errno;
- if (err != ENOSPC) {
+ if (errno != ENOSPC) {
ntfs_log_trace("Failed to resize attribute record. "
"Aborting...\n");
}
@@ -3697,13 +3671,11 @@ static int ntfs_attr_make_non_resident(n
/* Generate the mapping pairs array in the attribute record. */
if (ntfs_mapping_pairs_build(vol, (u8*)a + mp_ofs, arec_size - mp_ofs,
rl, 0, NULL) < 0) {
- err = errno;
// FIXME: Eeek! We need rollback! (AIA)
ntfs_log_trace("Eeek! Failed to build mapping pairs. Leaving "
"corrupt attribute record on disk. In memory "
"runlist is still intact! Error code is %i. "
- "FIXME: Need to rollback instead!\n", err);
- errno = err;
+ "FIXME: Need to rollback instead!\n", errno);
return -1;
}
@@ -3718,7 +3690,6 @@ cluster_free_err_out:
na->allocated_size = na->data_size;
na->rl = NULL;
free(rl);
- errno = err;
return -1;
}
@@ -3984,7 +3955,7 @@ static int ntfs_attr_make_resident(ntfs_
{
ntfs_volume *vol = na->ni->vol;
ATTR_REC *a = ctx->attr;
- int name_ofs, val_ofs, err = EIO;
+ int name_ofs, val_ofs;
s64 arec_size, bytes_read;
ntfs_log_trace("Entering for inode 0x%llx, attr 0x%x.\n", (unsigned long
@@ -3994,7 +3965,7 @@ static int ntfs_attr_make_resident(ntfs_
if (sle64_to_cpu(a->lowest_vcn)) {
ntfs_log_trace("Should be called for the first extent of the "
"attribute. Aborting...\n");
- err = EINVAL;
+ errno = EINVAL;
return -1;
}
@@ -4095,12 +4066,11 @@ static int ntfs_attr_make_resident(ntfs_
bytes_read = ntfs_rl_pread(vol, na->rl, 0, na->initialized_size,
(u8*)a + val_ofs);
if (bytes_read != na->initialized_size) {
- if (bytes_read < 0)
- err = errno;
+ if (bytes_read >= 0)
+ errno = EIO;
ntfs_log_trace("Eeek! Failed to read attribute data. Leaving "
"inconstant metadata. Run chkdsk. "
"Aborting...\n");
- errno = err;
return -1;
}
@@ -4117,7 +4087,6 @@ static int ntfs_attr_make_resident(ntfs_
* record is in a transiently corrupted state at this moment in time.
*/
if (ntfs_cluster_free(vol, na, 0, -1) < 0) {
- err = errno;
ntfs_log_perror("Eeek! Failed to release allocated clusters");
ntfs_log_trace("Ignoring error and leaving behind wasted "
"clusters.\n");
@@ -4198,9 +4167,7 @@ retry:
ctx = ntfs_attr_get_search_ctx(base_ni, NULL);
if (!ctx) {
- err = errno;
ntfs_log_trace("Couldn't get search context.\n");
- errno = err;
return -1;
}
@@ -4434,10 +4401,8 @@ retry:
if (!NInoAttrList(base_ni)) {
ntfs_attr_put_search_ctx(ctx);
if (ntfs_inode_add_attrlist(base_ni)) {
- err = errno;
ntfs_log_trace("Couldn't add attribute "
"list.\n");
- errno = err;
return -1;
}
goto retry;
@@ -4634,13 +4599,11 @@ static int ntfs_non_resident_attr_shrink
* against @newsize and fail if @newsize is too small.
*/
if (ntfs_attr_size_bounds_check(vol, na->type, newsize) < 0) {
- err = errno;
- if (err == ERANGE) {
+ if (errno == ERANGE) {
ntfs_log_trace("Eeek! Size bounds check failed. "
"Aborting...\n");
- } else if (err == ENOENT)
- err = EIO;
- errno = err;
+ } else if (errno == ENOENT)
+ errno = EIO;
return -1;
}
@@ -4653,20 +4616,16 @@ static int ntfs_non_resident_attr_shrink
*/
if ((na->allocated_size >> vol->cluster_size_bits) != first_free_vcn) {
if (ntfs_attr_map_whole_runlist(na)) {
- err = errno;
ntfs_log_trace("Eeek! ntfs_attr_map_whole_runlist "
"failed.\n");
- errno = err;
return -1;
}
/* Deallocate all clusters starting with the first free one. */
nr_freed_clusters = ntfs_cluster_free(vol, na, first_free_vcn,
-1);
if (nr_freed_clusters < 0) {
- err = errno;
ntfs_log_trace("Eeek! Freeing of clusters failed. "
"Aborting...\n");
- errno = err;
return -1;
}
@@ -4688,11 +4647,9 @@ static int ntfs_non_resident_attr_shrink
na->allocated_size = first_free_vcn << vol->cluster_size_bits;
/* Write mapping pairs for new runlist. */
if (ntfs_attr_update_mapping_pairs(na, 0 /*first_free_vcn*/)) {
- err = errno;
ntfs_log_trace("Eeek! Mapping pairs update failed. "
"Leaving inconstant metadata. "
"Run chkdsk.\n");
- errno = err;
return -1;
}
}
@@ -4700,9 +4657,7 @@ static int ntfs_non_resident_attr_shrink
/* Get the first attribute record. */
ctx = ntfs_attr_get_search_ctx(na->ni, NULL);
if (!ctx) {
- err = errno;
ntfs_log_trace("Couldn't get attribute search context.\n");
- errno = err;
return -1;
}
if (ntfs_attr_lookup(na->type, na->name, na->name_len, CASE_SENSITIVE,
@@ -4785,13 +4740,11 @@ static int ntfs_non_resident_attr_expand
* against @newsize and fail if @newsize is too big.
*/
if (ntfs_attr_size_bounds_check(vol, na->type, newsize) < 0) {
- err = errno;
- if (err == ERANGE) {
+ if (errno == ERANGE) {
ntfs_log_trace("Eeek! Size bounds check failed. "
"Aborting...\n");
- } else if (err == ENOENT)
- err = EIO;
- errno = err;
+ } else if (errno == ENOENT)
+ errno = EIO;
return -1;
}
@@ -4806,10 +4759,8 @@ static int ntfs_non_resident_attr_expand
*/
if ((na->allocated_size >> vol->cluster_size_bits) < first_free_vcn) {
if (ntfs_attr_map_whole_runlist(na)) {
- err = errno;
ntfs_log_trace("Eeek! ntfs_attr_map_whole_runlist "
"failed.\n");
- errno = err;
return -1;
}
@@ -4864,9 +4815,7 @@ static int ntfs_non_resident_attr_expand
vol->cluster_size_bits), lcn_seek_from,
DATA_ZONE);
if (!rl) {
- err = errno;
ntfs_log_trace("Cluster allocation failed.\n");
- errno = err;
return -1;
}
}
@@ -4897,13 +4846,12 @@ static int ntfs_non_resident_attr_expand
ctx = ntfs_attr_get_search_ctx(na->ni, NULL);
if (!ctx) {
- err = errno;
ntfs_log_trace("Failed to get search context.\n");
if (na->allocated_size == org_alloc_size) {
- errno = err;
return -1;
- } else
- goto rollback;
+ }
+ err = errno;
+ goto rollback;
}
if (ntfs_attr_lookup(na->type, na->name, na->name_len, CASE_SENSITIVE,
Index: dir.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/dir.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- dir.c 25 Sep 2006 16:58:38 -0000 1.65
+++ dir.c 22 Oct 2006 00:23:29 -0000 1.66
@@ -1128,10 +1128,8 @@ static ntfs_inode *__ntfs_create(ntfs_in
/* Allocate MFT record for new file. */
ni = ntfs_mft_record_alloc(dir_ni->vol, NULL);
if (!ni) {
- err = errno;
ntfs_log_error("Failed to allocate new MFT record: %s.\n",
- strerror(err));
- errno = err;
+ strerror(errno));
return NULL;
}
/*
Index: inode.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/inode.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- inode.c 21 Jul 2006 22:04:44 -0000 1.84
+++ inode.c 22 Oct 2006 00:23:29 -0000 1.85
@@ -971,9 +971,7 @@ int ntfs_inode_free_space(ntfs_inode *ni
ctx = ntfs_attr_get_search_ctx(ni, NULL);
if (!ctx) {
- err = errno;
ntfs_log_trace("Failed to get attribute search context.\n");
- errno = err;
return -1;
}
|
|
From: Anton A. <ai...@de...> - 2006-10-20 19:56:14
|
Changes by: aia21
Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs
In directory delta357:/tmp/cvs-serv14122
Modified Files:
mkntfs.c
Log Message:
fix for large sector sizes
Index: mkntfs.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -p -r1.148 -r1.149
--- mkntfs.c 25 Sep 2006 16:58:38 -0000 1.148
+++ mkntfs.c 20 Oct 2006 19:55:50 -0000 1.149
@@ -4245,6 +4245,8 @@ static int create_backup_boot_sector(u8
size = 512;
if (size < opts.sector_size)
size = opts.sector_size;
+ if (size < opts.cluster_size)
+ size = opts.cluster_size;
if (g_vol->dev->d_ops->seek(g_vol->dev, (opts.num_sectors + 1) *
opts.sector_size - size, SEEK_SET) == (off_t)-1) {
ntfs_log_perror("Seek failed");
|
|
From: Anton A. <ai...@de...> - 2006-10-20 19:54:40
|
Changes by: aia21
Update of /cvs/linux-ntfs/ntfsprogs/include/ntfs
In directory delta357:/tmp/cvs-serv13724
Modified Files:
layout.h
Log Message:
fix a packing bug
Index: layout.h
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/include/ntfs/layout.h,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -p -r1.57 -r1.58
--- layout.h 10 Oct 2006 10:29:11 -0000 1.57
+++ layout.h 20 Oct 2006 19:54:22 -0000 1.58
@@ -1158,7 +1158,7 @@ typedef union {
u8 data4[8]; /* The first two bytes are the third group of
four hexadecimal digits. The remaining six
bytes are the final 12 hexadecimal digits. */
- };
+ } __attribute__((__packed__));
u8 raw[16]; /* Raw binary for ease of access. */
} __attribute__((__packed__)) GUID;
|
|
From: Anton A. <ai...@de...> - 2006-10-20 19:54:15
|
Changes by: aia21
Update of /cvs/linux-ntfs/ntfsprogs/libntfs
In directory delta357:/tmp/cvs-serv13568
Modified Files:
security.c
Log Message:
fix a silly bug.
Index: security.c
===================================================================
RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/security.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- security.c 10 Oct 2006 10:29:11 -0000 1.17
+++ security.c 20 Oct 2006 19:53:50 -0000 1.18
@@ -43,7 +43,7 @@
/*
* The zero GUID.
*/
-static const GUID __zero_guid = { 0, 0, 0, { 0, 0, 0, 0, 0, 0, 0, 0 } };
+static const GUID __zero_guid = { { 0, 0, 0, { 0, 0, 0, 0, 0, 0, 0, 0 } } };
const GUID *const zero_guid = &__zero_guid;
/**
@@ -95,7 +95,7 @@ char *ntfs_guid_to_mbs(const GUID *guid,
guid->raw[5], guid->raw[6], guid->raw[7], guid->raw[8],
guid->raw[9], guid->raw[10], guid->raw[11],
guid->raw[12], guid->raw[13], guid->raw[14],
- guid->raw[15], guid->raw[16]);
+ guid->raw[15]);
if (res == 36)
return _guid_str;
if (!guid_str)
|
|
From: Yuval <uv...@de...> - 2006-10-18 14:44:40
|
Changes by: uvman Update of /cvs/linux-ntfs/ntfsprogs/libntfs In directory delta357.server4you.de:/tmp/cvs-serv5942/libntfs Modified Files: win32_io.c Log Message: Allow reusing ntfs_device after close. Index: win32_io.c =================================================================== RCS file: /cvs/linux-ntfs/ntfsprogs/libntfs/win32_io.c,v retrieving revision 1.46 retrieving revision 1.47 diff -u -p -r1.46 -r1.47 --- win32_io.c 3 Feb 2006 22:19:20 -0000 1.46 +++ win32_io.c 18 Oct 2006 14:44:23 -0000 1.47 @@ -1113,11 +1113,13 @@ static int ntfs_device_win32_close(struc } rvl = CloseHandle(fd->handle); free(fd); + fd = NULL; if (!rvl) { errno = ntfs_w32error_to_errno(GetLastError()); ntfs_log_trace("CloseHandle() failed.\n"); return -1; } + NDevClearOpen(dev); return 0; } |
|
From: Yuval <uv...@de...> - 2006-10-18 14:43:20
|
Changes by: uvman Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs In directory delta357.server4you.de:/tmp/cvs-serv5681/ntfsprogs Modified Files: ntfsresize.c Log Message: Spelling fix. Index: ntfsresize.c =================================================================== RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v retrieving revision 1.120 retrieving revision 1.121 diff -u -p -r1.120 -r1.121 --- ntfsresize.c 18 Oct 2006 14:41:41 -0000 1.120 +++ ntfsresize.c 18 Oct 2006 14:43:04 -0000 1.121 @@ -801,11 +801,9 @@ static void build_lcn_usage_bitmap(ntfs_ lcn_length); for (j = 0; j < lcn_length; j++) { - u64 k = (u64)lcn + j; if (k >= (u64)vol->nr_clusters) { - long long outsiders = lcn_length - j; fsck->outsider += outsiders; @@ -821,7 +819,7 @@ static void build_lcn_usage_bitmap(ntfs_ if (ntfs_bit_get_and_set(lcn_bitmap->bm, k, 1)) { if (++fsck->multi_ref <= 10 || opt.verbose) printf("Cluster %lld is referenced " - "multiply times!\n", + "multiple times!\n", (long long)k); continue; } |
|
From: Yuval <uv...@de...> - 2006-10-18 14:42:01
|
Changes by: uvman Update of /cvs/linux-ntfs/ntfsprogs/ntfsprogs In directory delta357.server4you.de:/tmp/cvs-serv5404/ntfsprogs Modified Files: ntfsclone.c ntfscluster.h ntfscmp.c ntfsmove.h ntfsresize.c ntfsundelete.h Log Message: Remove unneeded padding. The compiler will pad if it wan't to. Index: ntfsclone.c =================================================================== RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.c,v retrieving revision 1.90 retrieving revision 1.91 diff -u -p -r1.90 -r1.91 --- ntfsclone.c 23 Aug 2006 13:21:04 -0000 1.90 +++ ntfsclone.c 18 Oct 2006 14:41:41 -0000 1.91 @@ -116,7 +116,6 @@ struct { struct bitmap { s64 size; u8 *bm; - u8 padding[4]; /* Unused: padding to 64 bit. */ }; struct progress_bar { Index: ntfscluster.h =================================================================== RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfscluster.h,v retrieving revision 1.10 retrieving revision 1.11 diff -u -p -r1.10 -r1.11 --- ntfscluster.h 19 Jun 2005 21:09:41 -0000 1.10 +++ ntfscluster.h 18 Oct 2006 14:41:41 -0000 1.11 @@ -56,7 +56,6 @@ struct match { ATTR_TYPES type; /* Attribute type */ ntfschar *name; /* Attribute name */ int name_len; /* Length of attribute name */ - u8 padding[4]; /* Unused: padding to 64 bit. */ }; #endif /* _NTFSCLUSTER_H_ */ Index: ntfscmp.c =================================================================== RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfscmp.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -p -r1.18 -r1.19 --- ntfscmp.c 13 Aug 2006 15:50:12 -0000 1.18 +++ ntfscmp.c 18 Oct 2006 14:41:41 -0000 1.19 @@ -57,7 +57,6 @@ struct progress_bar { int resolution; int flags; float unit; - u8 padding[4]; /* Unused: padding to 64 bit. */ }; /* WARNING: don't modify the text, external tools grep for it */ Index: ntfsmove.h =================================================================== RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmove.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -p -r1.5 -r1.6 --- ntfsmove.h 21 Oct 2005 18:05:14 -0000 1.5 +++ ntfsmove.h 18 Oct 2006 14:41:41 -0000 1.6 @@ -39,7 +39,6 @@ struct options { int verbose; /* Extra output */ int noaction; /* Do not write to disk */ int nodirty; /* Do not mark volume dirty */ - u8 padding[4]; /* Unused: alignment to 64 bit. */ }; #endif /* _NTFSMOVE_H_ */ Index: ntfsresize.c =================================================================== RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v retrieving revision 1.119 retrieving revision 1.120 diff -u -p -r1.119 -r1.120 --- ntfsresize.c 13 Aug 2006 16:06:57 -0000 1.119 +++ ntfsresize.c 18 Oct 2006 14:41:41 -0000 1.120 @@ -140,7 +140,6 @@ struct { struct bitmap { s64 size; u8 *bm; - u8 padding[4]; /* Unused: padding to 64 bit. */ }; #define NTFS_PROGBAR 0x0001 @@ -152,7 +151,6 @@ struct progress_bar { int resolution; int flags; float unit; - u8 padding[4]; /* Unused: padding to 64 bit. */ }; struct llcn_t { Index: ntfsundelete.h =================================================================== RCS file: /cvs/linux-ntfs/ntfsprogs/ntfsprogs/ntfsundelete.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -p -r1.13 -r1.14 --- ntfsundelete.h 21 Oct 2005 18:05:14 -0000 1.13 +++ ntfsundelete.h 18 Oct 2006 14:41:41 -0000 1.14 @@ -57,7 +57,6 @@ struct options { s64 mft_begin; /* Range for mft copy */ s64 mft_end; char fillbyte; /* Use for unrecoverable sections */ - char padding[7]; /* Unused: padding to 64 bit. */ }; struct filename { @@ -75,7 +74,6 @@ struct filename { FILE_NAME_TYPE_FLAGS name_space; long long parent_mref; char *parent_name; - char padding[7]; /* Unused: padding to 64 bit. */ }; struct data { @@ -93,7 +91,6 @@ struct data { runlist_element *runlist; /* Decoded data runs */ int percent; /* Amount potentially recoverable */ void *data; /* If resident, a pointer to the data */ - char padding[4]; /* Unused: padding to 64 bit. */ }; struct ufile { @@ -107,7 +104,6 @@ struct ufile { int attr_list; /* MFT record may be one of many */ int directory; /* MFT record represents a directory */ MFT_RECORD *mft; /* Raw MFT record */ - char padding[4]; /* Unused: padding to 64 bit. */ }; #endif /* _NTFSUNDELETE_H_ */ |
|
From: Anton A. <ai...@de...> - 2006-10-10 10:29:58
|
Changes by: aia21 Update of /cvs/linux-ntfs/ntfsprogs In directory delta357.server4you.de:/tmp/cvs-serv13759 Modified Files: ChangeLog Log Message: Update ChangeLog... Index: ChangeLog =================================================================== RCS file: /cvs/linux-ntfs/ntfsprogs/ChangeLog,v retrieving revision 1.400 retrieving revision 1.401 diff -u -p -r1.400 -r1.401 --- ChangeLog 4 Oct 2006 20:57:03 -0000 1.400 +++ ChangeLog 10 Oct 2006 10:29:53 -0000 1.401 @@ -51,6 +51,7 @@ xx/xx/2006 - x.xx.x - . - ntfsclone: Fix endianness problems. (Anton) - Allow ntfscp to create the destination file if it does not already exists by calling ntfs_create(). (Hil) + - Fix GUID to string conversion. (Anton) 21/06/2006 - 1.13.1 - Various fixes. |
