NTFS capture updates

[wimlib] / src / dentry.c

diff --git a/src/dentry.c b/src/dentry.c
index 27937ab42a55a933e6833e34d5325bec7fdbd757..a0d0febde3e9894c5e11b7d66e396ec1c82b7392 100644 (file)
--- a/src/dentry.c
+++ b/src/dentry.c
@@ -59,7 +59,7 @@ static bool dentry_has_name(const struct dentry *dentry, const char *name,
 u64 dentry_total_length(const struct dentry *dentry)
 {
        u64 length = (dentry->length + 7) & ~7;
-       for (u16 i = 0 ; i < dentry->num_ads; i++)
+       for (u16 i = 0; i < dentry->num_ads; i++)
                length += ads_entry_length(&dentry->ads_entries[i]);
        return length;
 }
@@ -99,13 +99,18 @@ void dentry_update_all_timestamps(struct dentry *dentry)
 struct ads_entry *dentry_get_ads_entry(struct dentry *dentry,
                                       const char *stream_name)
 {
-       size_t stream_name_len = strlen(stream_name);
+       size_t stream_name_len;
        if (!stream_name)
                return NULL;
-       for (u16 i = 0; i < dentry->num_ads; i++)
-               if (ads_entry_has_name(&dentry->ads_entries[i],
-                                      stream_name, stream_name_len))
-                       return &dentry->ads_entries[i];
+       if (dentry->num_ads) {
+               u16 i = 0;
+               stream_name_len = strlen(stream_name);
+               do {
+                       if (ads_entry_has_name(&dentry->ads_entries[i],
+                                              stream_name, stream_name_len))
+                               return &dentry->ads_entries[i];
+               } while (++i != dentry->num_ads);
+       }
        return NULL;
 }
 
@@ -124,6 +129,9 @@ struct ads_entry *dentry_add_ads(struct dentry *dentry, const char *stream_name)
        struct ads_entry *ads_entries;
        struct ads_entry *new_entry;
 
+       DEBUG("Add alternate data stream %s:%s",
+              dentry->file_name_utf8, stream_name);
+
        if (dentry->num_ads == 0xffff)
                return NULL;
        num_ads = dentry->num_ads + 1;
@@ -139,13 +147,13 @@ struct ads_entry *dentry_add_ads(struct dentry *dentry, const char *stream_name)
                        cur->next->prev = cur;
                }
        }
-       dentry->ads_entries = ads_entries;
 
        new_entry = &ads_entries[num_ads - 1];
+       ads_entry_init(new_entry);
        if (change_ads_name(new_entry, stream_name) != 0)
                return NULL;
+       dentry->ads_entries = ads_entries;
        dentry->num_ads = num_ads;
-       ads_entry_init(new_entry);
        return new_entry;
 }
 
@@ -470,6 +478,7 @@ int print_dentry(struct dentry *dentry, void *lookup_table)
                        printf("Hash              = 0x"); 
                        print_hash(hash);
                        putchar('\n');
+                       putchar('\n');
                }
        }
        for (u16 i = 0; i < dentry->num_ads; i++) {
@@ -751,7 +760,7 @@ int change_ads_name(struct ads_entry *entry, const char *new_name)
        return get_names(&entry->stream_name, &entry->stream_name_utf8,
                         &entry->stream_name_len,
                         &entry->stream_name_utf8_len,
-                         new_name);
+                        new_name);
 }
 
 /* Parameters for calculate_dentry_statistics(). */
@@ -1134,7 +1143,7 @@ static u8 *write_dentry(const struct dentry *dentry, u8 *p)
                p = put_zeroes(p, 4);
        } else {
                u64 hard_link;
-               p = put_u32(p, dentry->reparse_tag);
+               p = put_u32(p, 0);
                if (dentry->link_group_list.next == &dentry->link_group_list)
                        hard_link = 0;
                else
@@ -1152,7 +1161,7 @@ static u8 *write_dentry(const struct dentry *dentry, u8 *p)
        if (p - orig_p < dentry->length)
                p = put_zeroes(p, dentry->length - (p - orig_p));
 
-       p = put_zeroes(p, (8 - (p - orig_p) % 8) % 8);
+       p = put_zeroes(p, (8 - dentry->length % 8) % 8);
 
        for (u16 i = 0; i < dentry->num_ads; i++) {
                p = put_u64(p, ads_entry_length(&dentry->ads_entries[i]));
@@ -1165,6 +1174,7 @@ static u8 *write_dentry(const struct dentry *dentry, u8 *p)
                p = put_u16(p, dentry->ads_entries[i].stream_name_len);
                p = put_bytes(p, dentry->ads_entries[i].stream_name_len,
                                 (u8*)dentry->ads_entries[i].stream_name);
+               p = put_u16(p, 0);
                p = put_zeroes(p, (8 - (p - orig_p) % 8) % 8);
        }
        return p;