X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fdentry.c;h=32c83570b7575744b74008b061a64df3398d2304;hp=a24e620ad98e90df88f03914e94ee5448db8c7f8;hb=63a5804943519281f206ca0fefacfe2b99fc9958;hpb=d9d4b6b3e0462d3419bb8a9964b5da38a72da02f diff --git a/src/dentry.c b/src/dentry.c index a24e620a..32c83570 100644 --- a/src/dentry.c +++ b/src/dentry.c @@ -10,24 +10,21 @@ */ /* - * - * Copyright (C) 2010 Carl Thijssen * Copyright (C) 2012 Eric Biggers * * This file is part of wimlib, a library for working with WIM files. * * wimlib is free software; you can redistribute it and/or modify it under the - * terms of the GNU Lesser General Public License as published by the Free - * Software Foundation; either version 2.1 of the License, or (at your option) - * any later version. + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 3 of the License, or (at your option) any later + * version. * * wimlib is distributed in the hope that it will be useful, but WITHOUT ANY * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more - * details. + * A PARTICULAR PURPOSE. See the GNU General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public License - * along with wimlib; if not, see http://www.gnu.org/licenses/. + * You should have received a copy of the GNU General Public License along with + * wimlib; if not, see http://www.gnu.org/licenses/. */ #include @@ -54,143 +51,157 @@ static bool dentry_has_name(const struct dentry *dentry, const char *name, return memcmp(dentry->file_name_utf8, name, name_len) == 0; } +static u64 __dentry_correct_length_unaligned(u16 file_name_len, + u16 short_name_len) +{ + u64 length = WIM_DENTRY_DISK_SIZE; + if (file_name_len) + length += file_name_len + 2; + if (short_name_len) + length += short_name_len + 2; + return length; +} + +static u64 dentry_correct_length_unaligned(const struct dentry *dentry) +{ + return __dentry_correct_length_unaligned(dentry->file_name_len, + dentry->short_name_len); +} + +/* Return the "correct" value to write in the length field of the dentry, based + * on the file name length and short name length */ +static u64 dentry_correct_length(const struct dentry *dentry) +{ + return (dentry_correct_length_unaligned(dentry) + 7) & ~7; +} + +static u64 __dentry_total_length(const struct dentry *dentry, u64 length) +{ + const struct inode *inode = dentry->inode; + for (u16 i = 0; i < inode->num_ads; i++) + length += ads_entry_total_length(inode->ads_entries[i]); + return (length + 7) & ~7; +} + +u64 dentry_correct_total_length(const struct dentry *dentry) +{ + return __dentry_total_length(dentry, + dentry_correct_length_unaligned(dentry)); +} + /* Real length of a dentry, including the alternate data stream entries, which * are not included in the dentry->length field... */ u64 dentry_total_length(const struct dentry *dentry) { - u64 length = (dentry->length + 7) & ~7; - for (u16 i = 0; i < dentry->num_ads; i++) - length += ads_entry_total_length(&dentry->ads_entries[i]); - return length; + return __dentry_total_length(dentry, dentry->length); } -/* Transfers file attributes from a `stat' buffer to a struct dentry. */ -void stbuf_to_dentry(const struct stat *stbuf, struct dentry *dentry) +/* Transfers file attributes from a `stat' buffer to an inode. */ +void stbuf_to_inode(const struct stat *stbuf, struct inode *inode) { if (S_ISLNK(stbuf->st_mode)) { - dentry->attributes = FILE_ATTRIBUTE_REPARSE_POINT; - dentry->reparse_tag = WIM_IO_REPARSE_TAG_SYMLINK; + inode->attributes = FILE_ATTRIBUTE_REPARSE_POINT; + inode->reparse_tag = WIM_IO_REPARSE_TAG_SYMLINK; } else if (S_ISDIR(stbuf->st_mode)) { - dentry->attributes = FILE_ATTRIBUTE_DIRECTORY; + inode->attributes = FILE_ATTRIBUTE_DIRECTORY; } else { - dentry->attributes = FILE_ATTRIBUTE_NORMAL; + inode->attributes = FILE_ATTRIBUTE_NORMAL; } if (sizeof(ino_t) >= 8) - dentry->hard_link = (u64)stbuf->st_ino; + inode->ino = (u64)stbuf->st_ino; else - dentry->hard_link = (u64)stbuf->st_ino | + inode->ino = (u64)stbuf->st_ino | ((u64)stbuf->st_dev << (sizeof(ino_t) * 8)); /* Set timestamps */ - dentry->creation_time = timespec_to_wim_timestamp(&stbuf->st_mtim); - dentry->last_write_time = timespec_to_wim_timestamp(&stbuf->st_mtim); - dentry->last_access_time = timespec_to_wim_timestamp(&stbuf->st_atim); + inode->creation_time = timespec_to_wim_timestamp(&stbuf->st_mtim); + inode->last_write_time = timespec_to_wim_timestamp(&stbuf->st_mtim); + inode->last_access_time = timespec_to_wim_timestamp(&stbuf->st_atim); } /* Sets all the timestamp fields of the dentry to the current time. */ -void dentry_update_all_timestamps(struct dentry *dentry) +void inode_update_all_timestamps(struct inode *inode) { u64 now = get_wim_timestamp(); - dentry->creation_time = now; - dentry->last_access_time = now; - dentry->last_write_time = now; + inode->creation_time = now; + inode->last_access_time = now; + inode->last_write_time = now; } -/* Returns the alternate data stream entry belonging to @dentry that has the +/* Returns the alternate data stream entry belonging to @inode that has the * stream name @stream_name. */ -struct ads_entry *dentry_get_ads_entry(struct dentry *dentry, - const char *stream_name) +struct ads_entry *inode_get_ads_entry(struct inode *inode, + const char *stream_name, + u16 *idx_ret) { size_t stream_name_len; if (!stream_name) return NULL; - if (dentry->num_ads) { + if (inode->num_ads) { u16 i = 0; stream_name_len = strlen(stream_name); do { - if (ads_entry_has_name(&dentry->ads_entries[i], + if (ads_entry_has_name(inode->ads_entries[i], stream_name, stream_name_len)) - return &dentry->ads_entries[i]; - } while (++i != dentry->num_ads); + { + if (idx_ret) + *idx_ret = i; + return inode->ads_entries[i]; + } + } while (++i != inode->num_ads); } return NULL; } -static void ads_entry_init(struct ads_entry *ads_entry) + +static struct ads_entry *new_ads_entry(const char *name) { - memset(ads_entry, 0, sizeof(struct ads_entry)); - INIT_LIST_HEAD(&ads_entry->lte_group_list.list); - ads_entry->lte_group_list.type = STREAM_TYPE_ADS; + struct ads_entry *ads_entry = CALLOC(1, sizeof(struct ads_entry)); + if (!ads_entry) + return NULL; + if (name && *name) { + if (change_ads_name(ads_entry, name)) { + FREE(ads_entry); + return NULL; + } + } + return ads_entry; } /* - * Add an alternate stream entry to a dentry and return a pointer to it, or NULL + * Add an alternate stream entry to an inode and return a pointer to it, or NULL * if memory could not be allocated. */ -struct ads_entry *dentry_add_ads(struct dentry *dentry, const char *stream_name) +struct ads_entry *inode_add_ads(struct inode *inode, const char *stream_name) { u16 num_ads; - struct ads_entry *ads_entries; + 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) + if (inode->num_ads >= 0xfffe) { + ERROR("Too many alternate data streams in one inode!"); return NULL; - num_ads = dentry->num_ads + 1; - ads_entries = REALLOC(dentry->ads_entries, - num_ads * sizeof(struct ads_entry)); - if (!ads_entries) + } + num_ads = inode->num_ads + 1; + ads_entries = REALLOC(inode->ads_entries, + num_ads * sizeof(inode->ads_entries[0])); + if (!ads_entries) { + ERROR("Failed to allocate memory for new alternate data stream"); return NULL; - if (ads_entries != dentry->ads_entries) { - /* We moved the ADS entries. Adjust the stream lists. */ - for (u16 i = 0; i < dentry->num_ads; i++) { - struct list_head *cur = &ads_entries[i].lte_group_list.list; - cur->prev->next = cur; - cur->next->prev = cur; - } } + inode->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) + new_entry = new_ads_entry(stream_name); + if (new_entry) return NULL; - dentry->ads_entries = ads_entries; - dentry->num_ads = num_ads; + inode->num_ads = num_ads; + ads_entries[num_ads - 1] = new_entry; +#ifdef WITH_FUSE + new_entry->stream_id = inode->next_stream_id++; +#endif return new_entry; } -/* Remove an alternate data stream from a dentry. - * - * The corresponding lookup table entry for the stream is NOT changed. - * - * @dentry: The dentry - * @ads_entry: The alternate data stream entry (it MUST be one of the - * ads_entry's in the array dentry->ads_entries). - */ -void dentry_remove_ads(struct dentry *dentry, struct ads_entry *ads_entry) -{ - u16 idx; - u16 following; - - wimlib_assert(dentry->num_ads); - idx = ads_entry - dentry->ads_entries; - wimlib_assert(idx < dentry->num_ads); - following = dentry->num_ads - idx - 1; - - destroy_ads_entry(ads_entry); - memcpy(ads_entry, ads_entry + 1, following * sizeof(struct ads_entry)); - - /* We moved the ADS entries. Adjust the stream lists. */ - for (u16 i = 0; i < following; i++) { - struct list_head *cur = &ads_entry[i].lte_group_list.list; - cur->prev->next = cur; - cur->next->prev = cur; - } - - dentry->num_ads--; -} /* * Calls a function on all directory entries in a directory tree. It is called @@ -207,7 +218,7 @@ int for_dentry_in_tree(struct dentry *root, if (ret != 0) return ret; - child = root->children; + child = root->inode->children; if (!child) return 0; @@ -217,7 +228,7 @@ int for_dentry_in_tree(struct dentry *root, if (ret != 0) return ret; child = child->next; - } while (child != root->children); + } while (child != root->inode->children); return 0; } @@ -232,7 +243,7 @@ int for_dentry_in_tree_depth(struct dentry *root, struct dentry *child; struct dentry *next; - child = root->children; + child = root->inode->children; if (child) { do { next = child->next; @@ -240,7 +251,7 @@ int for_dentry_in_tree_depth(struct dentry *root, if (ret != 0) return ret; child = next; - } while (child != root->children); + } while (child != root->inode->children); } return visitor(root, arg); } @@ -306,16 +317,16 @@ void calculate_subdir_offsets(struct dentry *dentry, u64 *subdir_offset_p) { struct dentry *child; - child = dentry->children; + child = dentry->inode->children; dentry->subdir_offset = *subdir_offset_p; if (child) { /* Advance the subdir offset by the amount of space the children * of this dentry take up. */ do { - *subdir_offset_p += dentry_total_length(child); + *subdir_offset_p += dentry_correct_total_length(child); child = child->next; - } while (child != dentry->children); + } while (child != dentry->inode->children); /* End-of-directory dentry on disk. */ *subdir_offset_p += 8; @@ -325,7 +336,7 @@ void calculate_subdir_offsets(struct dentry *dentry, u64 *subdir_offset_p) do { calculate_subdir_offsets(child, subdir_offset_p); child = child->next; - } while (child != dentry->children); + } while (child != dentry->inode->children); } else { /* On disk, childless directories have a valid subdir_offset * that points to an 8-byte end-of-directory dentry. Regular @@ -346,14 +357,14 @@ struct dentry *get_dentry_child_with_name(const struct dentry *dentry, struct dentry *child; size_t name_len; - child = dentry->children; + child = dentry->inode->children; if (child) { name_len = strlen(name); do { if (dentry_has_name(child, name, name_len)) return child; child = child->next; - } while (child != dentry->children); + } while (child != dentry->inode->children); } return NULL; } @@ -370,14 +381,14 @@ static struct dentry *get_dentry_relative_path(struct dentry *cur_dir, if (*path == '\0') return cur_dir; - child = cur_dir->children; + child = cur_dir->inode->children; if (child) { new_path = path_next_part(path, &base_len); do { if (dentry_has_name(child, path, base_len)) return get_dentry_relative_path(child, new_path); child = child->next; - } while (child != cur_dir->children); + } while (child != cur_dir->inode->children); } return NULL; } @@ -392,6 +403,16 @@ struct dentry *get_dentry(WIMStruct *w, const char *path) return get_dentry_relative_path(root, path); } +struct inode *wim_pathname_to_inode(WIMStruct *w, const char *path) +{ + struct dentry *dentry; + dentry = get_dentry(w, path); + if (!dentry) + return NULL; + else + return dentry->inode; +} + /* Returns the dentry that corresponds to the parent directory of @path, or NULL * if the dentry is not found. */ struct dentry *get_parent_dentry(WIMStruct *w, const char *path) @@ -445,37 +466,40 @@ int print_dentry(struct dentry *dentry, void *lookup_table) { const u8 *hash; struct lookup_table_entry *lte; + const struct inode *inode = dentry->inode; + time_t time; + char *p; printf("[DENTRY]\n"); printf("Length = %"PRIu64"\n", dentry->length); - printf("Attributes = 0x%x\n", dentry->attributes); + printf("Attributes = 0x%x\n", inode->attributes); for (unsigned i = 0; i < ARRAY_LEN(file_attr_flags); i++) - if (file_attr_flags[i].flag & dentry->attributes) + if (file_attr_flags[i].flag & inode->attributes) printf(" FILE_ATTRIBUTE_%s is set\n", file_attr_flags[i].name); - printf("Security ID = %d\n", dentry->security_id); + printf("Security ID = %d\n", inode->security_id); printf("Subdir offset = %"PRIu64"\n", dentry->subdir_offset); -#if 0 - printf("Unused1 = 0x%"PRIu64"\n", dentry->unused1); - printf("Unused2 = %"PRIu64"\n", dentry->unused2); -#endif -#if 0 - printf("Creation Time = 0x%"PRIx64"\n"); - printf("Last Access Time = 0x%"PRIx64"\n"); - printf("Last Write Time = 0x%"PRIx64"\n"); -#endif /* Translate the timestamps into something readable */ - time_t creat_time = wim_timestamp_to_unix(dentry->creation_time); - time_t access_time = wim_timestamp_to_unix(dentry->last_access_time); - time_t mod_time = wim_timestamp_to_unix(dentry->last_write_time); - printf("Creation Time = %s", asctime(gmtime(&creat_time))); - printf("Last Access Time = %s", asctime(gmtime(&access_time))); - printf("Last Write Time = %s", asctime(gmtime(&mod_time))); - - printf("Reparse Tag = 0x%"PRIx32"\n", dentry->reparse_tag); - printf("Hard Link Group = 0x%"PRIx64"\n", dentry->hard_link); - printf("Number of Alternate Data Streams = %hu\n", dentry->num_ads); + time = wim_timestamp_to_unix(inode->creation_time); + p = asctime(gmtime(&time)); + *(strrchr(p, '\n')) = '\0'; + printf("Creation Time = %s UTC\n", p); + + time = wim_timestamp_to_unix(inode->last_access_time); + p = asctime(gmtime(&time)); + *(strrchr(p, '\n')) = '\0'; + printf("Last Access Time = %s UTC\n", p); + + time = wim_timestamp_to_unix(inode->last_write_time); + p = asctime(gmtime(&time)); + *(strrchr(p, '\n')) = '\0'; + printf("Last Write Time = %s UTC\n", p); + + printf("Reparse Tag = 0x%"PRIx32"\n", inode->reparse_tag); + printf("Hard Link Group = 0x%"PRIx64"\n", inode->ino); + printf("Hard Link Group Size = %"PRIu32"\n", inode->link_count); + printf("Number of Alternate Data Streams = %hu\n", inode->num_ads); printf("Filename = \""); print_string(dentry->file_name, dentry->file_name_len); puts("\""); @@ -487,11 +511,11 @@ int print_dentry(struct dentry *dentry, void *lookup_table) puts("\""); printf("Short Name Length = %hu\n", dentry->short_name_len); printf("Full Path (UTF-8) = \"%s\"\n", dentry->full_path_utf8); - lte = dentry_stream_lte(dentry, 0, lookup_table); + lte = inode_stream_lte(dentry->inode, 0, lookup_table); if (lte) { print_lookup_table_entry(lte); } else { - hash = dentry_stream_hash(dentry, 0); + hash = inode_stream_hash(inode, 0); if (hash) { printf("Hash = 0x"); print_hash(hash); @@ -499,19 +523,19 @@ int print_dentry(struct dentry *dentry, void *lookup_table) putchar('\n'); } } - for (u16 i = 0; i < dentry->num_ads; i++) { + for (u16 i = 0; i < inode->num_ads; i++) { printf("[Alternate Stream Entry %u]\n", i); - printf("Name = \"%s\"\n", dentry->ads_entries[i].stream_name_utf8); + printf("Name = \"%s\"\n", inode->ads_entries[i]->stream_name_utf8); printf("Name Length (UTF-16) = %u\n", - dentry->ads_entries[i].stream_name_len); - hash = dentry_stream_hash(dentry, i + 1); + inode->ads_entries[i]->stream_name_len); + hash = inode_stream_hash(inode, i + 1); if (hash) { printf("Hash = 0x"); print_hash(hash); putchar('\n'); } - print_lookup_table_entry(dentry_stream_lte(dentry, i + 1, - lookup_table)); + print_lookup_table_entry(inode_stream_lte(inode, i + 1, + lookup_table)); } return 0; } @@ -521,9 +545,29 @@ static void dentry_common_init(struct dentry *dentry) { memset(dentry, 0, sizeof(struct dentry)); dentry->refcnt = 1; - dentry->security_id = -1; - dentry->ads_entries_status = ADS_ENTRIES_DEFAULT; - dentry->lte_group_list.type = STREAM_TYPE_NORMAL; +} + +struct inode *new_timeless_inode() +{ + struct inode *inode = CALLOC(1, sizeof(struct inode)); + if (!inode) + return NULL; + inode->security_id = -1; + inode->link_count = 1; + INIT_LIST_HEAD(&inode->dentry_list); + return inode; +} + +struct inode *new_inode() +{ + struct inode *inode = new_timeless_inode(); + if (!inode) + return NULL; + u64 now = get_wim_timestamp(); + inode->creation_time = now; + inode->last_access_time = now; + inode->last_write_time = now; + return inode; } /* @@ -545,11 +589,10 @@ struct dentry *new_dentry(const char *name) if (change_dentry_name(dentry, name) != 0) goto err; - dentry_update_all_timestamps(dentry); dentry->next = dentry; dentry->prev = dentry; dentry->parent = dentry; - INIT_LIST_HEAD(&dentry->link_group_list); + return dentry; err: FREE(dentry); @@ -557,65 +600,106 @@ err: return NULL; } -void dentry_free_ads_entries(struct dentry *dentry) +struct dentry *new_dentry_with_inode(const char *name) { - for (u16 i = 0; i < dentry->num_ads; i++) - destroy_ads_entry(&dentry->ads_entries[i]); - FREE(dentry->ads_entries); - dentry->ads_entries = NULL; - dentry->num_ads = 0; + struct dentry *dentry; + dentry = new_dentry(name); + if (dentry) { + dentry->inode = new_inode(); + if (dentry->inode) { + inode_add_dentry(dentry, dentry->inode); + } else { + free_dentry(dentry); + dentry = NULL; + } + } + return dentry; } -static void __destroy_dentry(struct dentry *dentry) +void free_ads_entry(struct ads_entry *entry) { - FREE(dentry->file_name); - FREE(dentry->file_name_utf8); - FREE(dentry->short_name); - FREE(dentry->full_path_utf8); - FREE(dentry->extracted_file); + if (entry) { + FREE(entry->stream_name); + FREE(entry->stream_name_utf8); + FREE(entry); + } } -/* Frees a WIM dentry. */ -void free_dentry(struct dentry *dentry) +void inode_free_ads_entries(struct inode *inode) { - wimlib_assert(dentry); - __destroy_dentry(dentry); - /* Don't destroy the ADS entries if they "belong" to a different dentry - * */ - if (dentry->ads_entries_status != ADS_ENTRIES_USER) - dentry_free_ads_entries(dentry); - FREE(dentry); + if (inode->ads_entries) { + for (u16 i = 0; i < inode->num_ads; i++) + free_ads_entry(inode->ads_entries[i]); + FREE(inode->ads_entries); + } } -/* Like free_dentry(), but assigns a new ADS entries owner if this dentry was - * the previous owner, and also deletes the dentry from its link_group_list */ -void put_dentry(struct dentry *dentry) +/* Frees an inode. */ +void free_inode(struct inode *inode) { - if (dentry->ads_entries_status == ADS_ENTRIES_OWNER) { - struct dentry *new_owner; - list_for_each_entry(new_owner, &dentry->link_group_list, - link_group_list) - { - if (new_owner->ads_entries_status == ADS_ENTRIES_USER) { - new_owner->ads_entries_status = ADS_ENTRIES_OWNER; - break; + if (inode) { + inode_free_ads_entries(inode); + #ifdef WITH_FUSE + wimlib_assert(inode->num_opened_fds == 0); + FREE(inode->fds); + #endif + FREE(inode); + } +} + +/* Decrements link count on an inode and frees it if the link count reaches 0. + * */ +struct inode *put_inode(struct inode *inode) +{ + if (inode) { + wimlib_assert(inode->link_count); + if (--inode->link_count == 0) { + #ifdef WITH_FUSE + if (inode->num_opened_fds == 0) + #endif + { + free_inode(inode); + inode = NULL; } } - dentry->ads_entries_status = ADS_ENTRIES_USER; } - struct list_head *next; - list_del(&dentry->link_group_list); - free_dentry(dentry); + return inode; +} + +/* Frees a WIM dentry. + * + * The inode is freed only if its link count is decremented to 0. + */ +struct inode *free_dentry(struct dentry *dentry) +{ + wimlib_assert(dentry); + struct inode *inode; + + FREE(dentry->file_name); + FREE(dentry->file_name_utf8); + FREE(dentry->short_name); + FREE(dentry->full_path_utf8); + inode = put_inode(dentry->inode); + FREE(dentry); + return inode; } +void put_dentry(struct dentry *dentry) +{ + wimlib_assert(dentry); + wimlib_assert(dentry->refcnt); + if (--dentry->refcnt == 0) + free_dentry(dentry); +} + +#if 0 /* Partically clones a dentry. * * Beware: * - memory for file names is not cloned (the pointers are all set to NULL * and the lengths are set to zero) * - next, prev, and children pointers and not touched - * - stream entries are not cloned (pointer left untouched). */ struct dentry *clone_dentry(struct dentry *old) { @@ -631,6 +715,7 @@ struct dentry *clone_dentry(struct dentry *old) new->short_name_len = 0; return new; } +#endif /* * This function is passed as an argument to for_dentry_in_tree_depth() in order @@ -640,11 +725,13 @@ static int do_free_dentry(struct dentry *dentry, void *__lookup_table) { struct lookup_table *lookup_table = __lookup_table; struct lookup_table_entry *lte; + struct inode *inode = dentry->inode; unsigned i; if (lookup_table) { - for (i = 0; i <= dentry->num_ads; i++) { - lte = dentry_stream_lte(dentry, i, lookup_table); + wimlib_assert(inode->link_count); + for (i = 0; i <= inode->num_ads; i++) { + lte = inode_stream_lte(inode, i, lookup_table); lte_decrement_refcnt(lte, lookup_table); } } @@ -687,52 +774,40 @@ void link_dentry(struct dentry *dentry, struct dentry *parent) { wimlib_assert(dentry_is_directory(parent)); dentry->parent = parent; - if (parent->children) { + if (parent->inode->children) { /* Not an only child; link to siblings. */ - dentry->next = parent->children; - dentry->prev = parent->children->prev; + dentry->next = parent->inode->children; + dentry->prev = parent->inode->children->prev; dentry->next->prev = dentry; dentry->prev->next = dentry; } else { /* Only child; link to parent. */ - parent->children = dentry; + parent->inode->children = dentry; dentry->next = dentry; dentry->prev = dentry; } } -/* Unlink a dentry from the directory tree. +/* + * Unlink a dentry from the directory tree. * - * Note: This merely removes it from the in-memory tree structure. See - * remove_dentry() in mount.c for a function implemented on top of this one that - * frees the dentry and implements reference counting for the lookup table - * entries. */ + * Note: This merely removes it from the in-memory tree structure. + */ void unlink_dentry(struct dentry *dentry) { if (dentry_is_root(dentry)) return; if (dentry_is_only_child(dentry)) { - dentry->parent->children = NULL; + dentry->parent->inode->children = NULL; } else { if (dentry_is_first_sibling(dentry)) - dentry->parent->children = dentry->next; + dentry->parent->inode->children = dentry->next; dentry->next->prev = dentry->prev; dentry->prev->next = dentry->next; } } - -/* Recalculates the length of @dentry based on its file name length and short - * name length. */ -static inline void recalculate_dentry_size(struct dentry *dentry) -{ - dentry->length = WIM_DENTRY_DISK_SIZE + dentry->file_name_len + - 2 + dentry->short_name_len; - /* Must be multiple of 8. */ - dentry->length = (dentry->length + 7) & ~7; -} - /* Duplicates a UTF-8 name into UTF-8 and UTF-16 strings and returns the strings * and their lengths in the pointer arguments */ int get_names(char **name_utf16_ret, char **name_utf8_ret, @@ -775,8 +850,10 @@ int change_dentry_name(struct dentry *dentry, const char *new_name) ret = get_names(&dentry->file_name, &dentry->file_name_utf8, &dentry->file_name_len, &dentry->file_name_utf8_len, new_name); + FREE(dentry->short_name); + dentry->short_name_len = 0; if (ret == 0) - recalculate_dentry_size(dentry); + dentry->length = dentry_correct_length(dentry); return ret; } @@ -811,8 +888,8 @@ static int calculate_dentry_statistics(struct dentry *dentry, void *arg) else ++*stats->file_count; - for (unsigned i = 0; i <= dentry->num_ads; i++) { - lte = dentry_stream_lte(dentry, i, stats->lookup_table); + for (unsigned i = 0; i <= dentry->inode->num_ads; i++) { + lte = inode_stream_lte(dentry->inode, i, stats->lookup_table); if (lte) { *stats->total_bytes += wim_resource_size(lte); if (++lte->out_refcnt == 1) @@ -838,7 +915,7 @@ void calculate_dir_tree_statistics(struct dentry *root, struct lookup_table *tab stats.file_count = file_count_ret; stats.total_bytes = total_bytes_ret; stats.hard_link_bytes = hard_link_bytes_ret; - for_lookup_table_entry(table, zero_out_refcnts, NULL); + for_lookup_table_entry(table, lte_zero_out_refcnt, NULL); for_dentry_in_tree(root, calculate_dentry_statistics, &stats); } @@ -848,9 +925,9 @@ void calculate_dir_tree_statistics(struct dentry *root, struct lookup_table *tab * * @p: Pointer to buffer that starts with the first alternate stream entry. * - * @dentry: Dentry to load the alternate data streams into. - * @dentry->num_ads must have been set to the number of - * data streams that are expected. + * @inode: Inode to load the alternate data streams into. + * @inode->num_ads must have been set to the number of + * alternate data streams that are expected. * * @remaining_size: Number of bytes of data remaining in the buffer pointed * to by @p. @@ -858,31 +935,40 @@ void calculate_dir_tree_statistics(struct dentry *root, struct lookup_table *tab * The format of the on-disk alternate stream entries is as follows: * * struct ads_entry_on_disk { - * u64 length; // Length of the entry, in bytes + * u64 length; // Length of the entry, in bytes. This includes + * all fields (including the stream name and + * null terminator if present, AND the padding!). * u64 reserved; // Seems to be unused * u8 hash[20]; // SHA1 message digest of the uncompressed stream * u16 stream_name_len; // Length of the stream name, in bytes * char stream_name[]; // Stream name in UTF-16LE, @stream_name_len bytes long, - * // not including null terminator + * not including null terminator * u16 zero; // UTF-16 null terminator for the stream name, NOT - * // included in @stream_name_len + * included in @stream_name_len. Based on what + * I've observed from filenames in dentries, + * this field should not exist when + * (@stream_name_len == 0), but you can't + * actually tell because of the padding anyway + * (provided that the padding is zeroed, which + * it always seems to be). + * char padding[]; // Padding to make the size a multiple of 8 bytes. * }; * * In addition, the entries are 8-byte aligned. * - * Return 0 on success or nonzero on failure. On success, dentry->ads_entries - * is set to an array of `struct ads_entry's of length dentry->num_ads. On - * failure, @dentry is not modified. + * Return 0 on success or nonzero on failure. On success, inode->ads_entries + * is set to an array of `struct ads_entry's of length inode->num_ads. On + * failure, @inode is not modified. */ -static int read_ads_entries(const u8 *p, struct dentry *dentry, +static int read_ads_entries(const u8 *p, struct inode *inode, u64 remaining_size) { u16 num_ads; - struct ads_entry *ads_entries; + struct ads_entry **ads_entries; int ret; - num_ads = dentry->num_ads; - ads_entries = CALLOC(num_ads, sizeof(struct ads_entry)); + num_ads = inode->num_ads; + ads_entries = CALLOC(num_ads, sizeof(inode->ads_entries[0])); if (!ads_entries) { ERROR("Could not allocate memory for %"PRIu16" " "alternate data stream entries", num_ads); @@ -890,10 +976,24 @@ static int read_ads_entries(const u8 *p, struct dentry *dentry, } for (u16 i = 0; i < num_ads; i++) { - struct ads_entry *cur_entry = &ads_entries[i]; + struct ads_entry *cur_entry; u64 length; + u64 length_no_padding; + u64 total_length; size_t utf8_len; - const char *p_save = p; + const u8 *p_save = p; + + cur_entry = new_ads_entry(NULL); + if (!cur_entry) { + ret = WIMLIB_ERR_NOMEM; + goto out_free_ads_entries; + } + + ads_entries[i] = cur_entry; + + #ifdef WITH_FUSE + ads_entries[i]->stream_id = i + 1; + #endif /* Read the base stream entry, excluding the stream name. */ if (remaining_size < WIM_ADS_ENTRY_DISK_SIZE) { @@ -902,51 +1002,90 @@ static int read_ads_entries(const u8 *p, struct dentry *dentry, ret = WIMLIB_ERR_INVALID_DENTRY; goto out_free_ads_entries; } - remaining_size -= WIM_ADS_ENTRY_DISK_SIZE; - p = get_u64(p, &length); /* ADS entry length */ - p += 8; /* Unused */ + p = get_u64(p, &length); + p += 8; /* Skip the reserved field */ p = get_bytes(p, SHA1_HASH_SIZE, (u8*)cur_entry->hash); p = get_u16(p, &cur_entry->stream_name_len); cur_entry->stream_name = NULL; cur_entry->stream_name_utf8 = NULL; - if (remaining_size < cur_entry->stream_name_len + 2) { + /* Length including neither the null terminator nor the padding + * */ + length_no_padding = WIM_ADS_ENTRY_DISK_SIZE + + cur_entry->stream_name_len; + + /* Length including the null terminator and the padding */ + total_length = ((length_no_padding + 2) + 7) & ~7; + + wimlib_assert(total_length == ads_entry_total_length(cur_entry)); + + if (remaining_size < length_no_padding) { ERROR("Stream entries go past end of metadata resource"); - ERROR("(remaining_size = %"PRIu64" bytes, stream_name_len " - "= %"PRIu16" bytes", remaining_size, - cur_entry->stream_name_len); + ERROR("(remaining_size = %"PRIu64" bytes, " + "length_no_padding = %"PRIu64" bytes)", + remaining_size, length_no_padding); ret = WIMLIB_ERR_INVALID_DENTRY; goto out_free_ads_entries; } - remaining_size -= cur_entry->stream_name_len + 2; - cur_entry->stream_name = MALLOC(cur_entry->stream_name_len); - if (!cur_entry->stream_name) { - ret = WIMLIB_ERR_NOMEM; + /* The @length field in the on-disk ADS entry is expected to be + * equal to @total_length, which includes all of the entry and + * the padding that follows it to align the next ADS entry to an + * 8-byte boundary. However, to be safe, we'll accept the + * length field as long as it's not less than the un-padded + * total length and not more than the padded total length. */ + if (length < length_no_padding || length > total_length) { + ERROR("Stream entry has unexpected length " + "field (length field = %"PRIu64", " + "unpadded total length = %"PRIu64", " + "padded total length = %"PRIu64")", + length, length_no_padding, total_length); + ret = WIMLIB_ERR_INVALID_DENTRY; goto out_free_ads_entries; } - get_bytes(p, cur_entry->stream_name_len, - (u8*)cur_entry->stream_name); - cur_entry->stream_name_utf8 = utf16_to_utf8(cur_entry->stream_name, - cur_entry->stream_name_len, - &utf8_len); - cur_entry->stream_name_utf8_len = utf8_len; - - if (!cur_entry->stream_name_utf8) { - ret = WIMLIB_ERR_NOMEM; - goto out_free_ads_entries; + + if (cur_entry->stream_name_len) { + cur_entry->stream_name = MALLOC(cur_entry->stream_name_len); + if (!cur_entry->stream_name) { + ret = WIMLIB_ERR_NOMEM; + goto out_free_ads_entries; + } + get_bytes(p, cur_entry->stream_name_len, + (u8*)cur_entry->stream_name); + cur_entry->stream_name_utf8 = utf16_to_utf8(cur_entry->stream_name, + cur_entry->stream_name_len, + &utf8_len); + cur_entry->stream_name_utf8_len = utf8_len; + + if (!cur_entry->stream_name_utf8) { + ret = WIMLIB_ERR_NOMEM; + goto out_free_ads_entries; + } } - p = p_save + ads_entry_total_length(cur_entry); + /* It's expected that the size of every ADS entry is a multiple + * of 8. However, to be safe, I'm allowing the possibility of + * an ADS entry at the very end of the metadata resource ending + * un-aligned. So although we still need to increment the input + * pointer by @total_length to reach the next ADS entry, it's + * possible that less than @total_length is actually remaining + * in the metadata resource. We should set the remaining size to + * 0 bytes if this happens. */ + p = p_save + total_length; + if (remaining_size < total_length) + remaining_size = 0; + else + remaining_size -= total_length; } - dentry->ads_entries = ads_entries; + inode->ads_entries = ads_entries; +#ifdef WITH_FUSE + inode->next_stream_id = inode->num_ads + 1; +#endif return 0; out_free_ads_entries: - for (u16 i = 0; i < num_ads; i++) { - FREE(ads_entries[i].stream_name); - FREE(ads_entries[i].stream_name_utf8); - } + for (u16 i = 0; i < num_ads; i++) + free_ads_entry(ads_entries[i]); FREE(ads_entries); return ret; } @@ -971,18 +1110,19 @@ int read_dentry(const u8 metadata_resource[], u64 metadata_resource_len, { const u8 *p; u64 calculated_size; - char *file_name; - char *file_name_utf8; - char *short_name; + char *file_name = NULL; + char *file_name_utf8 = NULL; + char *short_name = NULL; u16 short_name_len; u16 file_name_len; - size_t file_name_utf8_len; + size_t file_name_utf8_len = 0; int ret; + struct inode *inode = NULL; dentry_common_init(dentry); /*Make sure the dentry really fits into the metadata resource.*/ - if (offset + 8 > metadata_resource_len) { + if (offset + 8 > metadata_resource_len || offset + 8 < offset) { ERROR("Directory entry starting at %"PRIu64" ends past the " "end of the metadata resource (size %"PRIu64")", offset, metadata_resource_len); @@ -1006,7 +1146,9 @@ int read_dentry(const u8 metadata_resource[], u64 metadata_resource_len, * not too short, read the rest of it (excluding the alternate data * streams, but including the file name and short name variable-length * fields) into memory. */ - if (offset + dentry->length >= metadata_resource_len) { + if (offset + dentry->length >= metadata_resource_len + || offset + dentry->length < offset) + { ERROR("Directory entry at offset %"PRIu64" and with size " "%"PRIu64" ends past the end of the metadata resource " "(size %"PRIu64")", @@ -1020,8 +1162,12 @@ int read_dentry(const u8 metadata_resource[], u64 metadata_resource_len, return WIMLIB_ERR_INVALID_DENTRY; } - p = get_u32(p, &dentry->attributes); - p = get_u32(p, (u32*)&dentry->security_id); + inode = new_timeless_inode(); + if (!inode) + return WIMLIB_ERR_NOMEM; + + p = get_u32(p, &inode->attributes); + p = get_u32(p, (u32*)&inode->security_id); p = get_u64(p, &dentry->subdir_offset); /* 2 unused fields */ @@ -1029,11 +1175,11 @@ int read_dentry(const u8 metadata_resource[], u64 metadata_resource_len, /*p = get_u64(p, &dentry->unused1);*/ /*p = get_u64(p, &dentry->unused2);*/ - p = get_u64(p, &dentry->creation_time); - p = get_u64(p, &dentry->last_access_time); - p = get_u64(p, &dentry->last_write_time); + p = get_u64(p, &inode->creation_time); + p = get_u64(p, &inode->last_access_time); + p = get_u64(p, &inode->last_write_time); - p = get_bytes(p, SHA1_HASH_SIZE, dentry->hash); + p = get_bytes(p, SHA1_HASH_SIZE, inode->hash); /* * I don't know what's going on here. It seems like M$ screwed up the @@ -1041,103 +1187,118 @@ int read_dentry(const u8 metadata_resource[], u64 metadata_resource_len, * document it. The WIM_HDR_FLAG_RP_FIX flag in the WIM header might * have something to do with this, but it's not documented. */ - if (dentry->attributes & FILE_ATTRIBUTE_REPARSE_POINT) { + if (inode->attributes & FILE_ATTRIBUTE_REPARSE_POINT) { /* ??? */ p += 4; - p = get_u32(p, &dentry->reparse_tag); + p = get_u32(p, &inode->reparse_tag); p += 4; } else { - p = get_u32(p, &dentry->reparse_tag); - p = get_u64(p, &dentry->hard_link); + p = get_u32(p, &inode->reparse_tag); + p = get_u64(p, &inode->ino); } /* By the way, the reparse_reserved field does not actually exist (at * least when the file is not a reparse point) */ - p = get_u16(p, &dentry->num_ads); + p = get_u16(p, &inode->num_ads); p = get_u16(p, &short_name_len); p = get_u16(p, &file_name_len); - /* We now know the length of the file name and short name. These should - * be included in the dentry length, but make sure the numbers are - * consistent. */ - calculated_size = WIM_DENTRY_DISK_SIZE + file_name_len + 2 + - short_name_len; + /* We now know the length of the file name and short name. Make sure + * the length of the dentry is large enough to actually hold them. + * + * The calculated length here is unaligned to allow for the possibility + * that the dentry->length names an unaligned length, although this + * would be unexpected. */ + calculated_size = __dentry_correct_length_unaligned(file_name_len, + short_name_len); if (dentry->length < calculated_size) { ERROR("Unexpected end of directory entry! (Expected " - "%"PRIu64" bytes, got %"PRIu64" bytes. " + "at least %"PRIu64" bytes, got %"PRIu64" bytes. " "short_name_len = %hu, file_name_len = %hu)", calculated_size, dentry->length, short_name_len, file_name_len); return WIMLIB_ERR_INVALID_DENTRY; } - /* Read the filename. */ - file_name = MALLOC(file_name_len); - if (!file_name) { - ERROR("Failed to allocate %hu bytes for dentry file name", - file_name_len); - return WIMLIB_ERR_NOMEM; - } - p = get_bytes(p, file_name_len, file_name); + /* Read the filename if present. Note: if the filename is empty, there + * is no null terminator following it. */ + if (file_name_len) { + file_name = MALLOC(file_name_len); + if (!file_name) { + ERROR("Failed to allocate %hu bytes for dentry file name", + file_name_len); + return WIMLIB_ERR_NOMEM; + } + p = get_bytes(p, file_name_len, file_name); - /* Convert filename to UTF-8. */ - file_name_utf8 = utf16_to_utf8(file_name, file_name_len, - &file_name_utf8_len); + /* Convert filename to UTF-8. */ + file_name_utf8 = utf16_to_utf8(file_name, file_name_len, + &file_name_utf8_len); - if (!file_name_utf8) { - ERROR("Failed to allocate memory to convert UTF-16 " - "filename (%hu bytes) to UTF-8", file_name_len); - ret = WIMLIB_ERR_NOMEM; - goto out_free_file_name; + if (!file_name_utf8) { + ERROR("Failed to allocate memory to convert UTF-16 " + "filename (%hu bytes) to UTF-8", file_name_len); + ret = WIMLIB_ERR_NOMEM; + goto out_free_file_name; + } + if (*(u16*)p) + WARNING("Expected two zero bytes following the file name " + "`%s', but found non-zero bytes", file_name_utf8); + p += 2; } - /* Undocumented padding between file name and short name. This probably - * is supposed to be a terminating null character. */ - p += 2; - - /* Read the short filename. */ - short_name = MALLOC(short_name_len); - if (!short_name) { - ERROR("Failed to allocate %hu bytes for short filename", - short_name_len); - ret = WIMLIB_ERR_NOMEM; - goto out_free_file_name_utf8; + /* Align the calculated size */ + calculated_size = (calculated_size + 7) & ~7; + + if (dentry->length > calculated_size) { + /* Weird; the dentry says it's longer than it should be. Note + * that the length field does NOT include the size of the + * alternate stream entries. */ + + /* Strangely, some directory entries inexplicably have a little + * over 70 bytes of extra data. The exact amount of data seems + * to be 72 bytes, but it is aligned on the next 8-byte + * boundary. It does NOT seem to be alternate data stream + * entries. Here's an example of the aligned data: + * + * 01000000 40000000 6c786bba c58ede11 b0bb0026 1870892a b6adb76f + * e63a3e46 8fca8653 0d2effa1 6c786bba c58ede11 b0bb0026 1870892a + * 00000000 00000000 00000000 00000000 + * + * Here's one interpretation of how the data is laid out. + * + * struct unknown { + * u32 field1; (always 0x00000001) + * u32 field2; (always 0x40000000) + * u8 data[48]; (???) + * u64 reserved1; (always 0) + * u64 reserved2; (always 0) + * };*/ + DEBUG("Dentry for file or directory `%s' has %zu extra " + "bytes of data", + file_name_utf8, dentry->length - calculated_size); } - p = get_bytes(p, short_name_len, short_name); + /* Read the short filename if present. Note: if there is no short + * filename, there is no null terminator following it. */ + if (short_name_len) { + short_name = MALLOC(short_name_len); + if (!short_name) { + ERROR("Failed to allocate %hu bytes for short filename", + short_name_len); + ret = WIMLIB_ERR_NOMEM; + goto out_free_file_name_utf8; + } - /* Some directory entries inexplicably have a little over 70 bytes of - * extra data. The exact amount of data seems to be 72 bytes, but it is - * aligned on the next 8-byte boundary. It does NOT seem to be - * alternate data stream entries. Here's an example of the aligned - * data: - * - * 01000000 40000000 6c786bba c58ede11 b0bb0026 1870892a b6adb76f - * e63a3e46 8fca8653 0d2effa1 6c786bba c58ede11 b0bb0026 1870892a - * 00000000 00000000 00000000 00000000 - * - * Here's one interpretation of how the data is laid out. - * - * struct unknown { - * u32 field1; (always 0x00000001) - * u32 field2; (always 0x40000000) - * u8 data[48]; (???) - * u64 reserved1; (always 0) - * u64 reserved2; (always 0) - * };*/ -#if 0 - if (dentry->length - calculated_size >= WIM_ADS_ENTRY_DISK_SIZE) { - printf("%s: %lu / %lu (", file_name_utf8, - calculated_size, dentry->length); - print_string(p + WIM_ADS_ENTRY_DISK_SIZE, dentry->length - calculated_size - WIM_ADS_ENTRY_DISK_SIZE); - puts(")"); - print_byte_field(p, dentry->length - calculated_size); - putchar('\n'); + p = get_bytes(p, short_name_len, short_name); + if (*(u16*)p) + WARNING("Expected two zero bytes following the file name " + "`%s', but found non-zero bytes", file_name_utf8); + p += 2; } -#endif /* * Read the alternate data streams, if present. dentry->num_ads tells @@ -1148,8 +1309,7 @@ int read_dentry(const u8 metadata_resource[], u64 metadata_resource_len, * aligned boundary, and the alternate data stream entries are NOT * included in the dentry->length field for some reason. */ - if (dentry->num_ads != 0) { - calculated_size = (calculated_size + 7) & ~7; + if (inode->num_ads != 0) { if (calculated_size > metadata_resource_len - offset) { ERROR("Not enough space in metadata resource for " "alternate stream entries"); @@ -1157,7 +1317,7 @@ int read_dentry(const u8 metadata_resource[], u64 metadata_resource_len, goto out_free_short_name; } ret = read_ads_entries(&metadata_resource[offset + calculated_size], - dentry, + inode, metadata_resource_len - offset - calculated_size); if (ret != 0) goto out_free_short_name; @@ -1165,6 +1325,7 @@ int read_dentry(const u8 metadata_resource[], u64 metadata_resource_len, /* We've read all the data for this dentry. Set the names and their * lengths, and we've done. */ + dentry->inode = inode; dentry->file_name = file_name; dentry->file_name_utf8 = file_name_utf8; dentry->short_name = short_name; @@ -1178,6 +1339,140 @@ out_free_file_name_utf8: FREE(file_name_utf8); out_free_file_name: FREE(file_name); +out_free_inode: + free_inode(inode); + return ret; +} + +int verify_inode(struct inode *inode, const WIMStruct *w) +{ + const struct lookup_table *table = w->lookup_table; + const struct wim_security_data *sd = wim_const_security_data(w); + const struct dentry *first_dentry = inode_first_dentry(inode); + int ret = WIMLIB_ERR_INVALID_DENTRY; + + /* Check the security ID */ + if (inode->security_id < -1) { + ERROR("Dentry `%s' has an invalid security ID (%d)", + first_dentry->full_path_utf8, inode->security_id); + goto out; + } + if (inode->security_id >= sd->num_entries) { + ERROR("Dentry `%s' has an invalid security ID (%d) " + "(there are only %u entries in the security table)", + first_dentry->full_path_utf8, inode->security_id, + sd->num_entries); + goto out; + } + + /* Check that lookup table entries for all the resources exist, except + * if the SHA1 message digest is all 0's, which indicates there is + * intentionally no resource there. */ + if (w->hdr.total_parts == 1) { + for (unsigned i = 0; i <= inode->num_ads; i++) { + struct lookup_table_entry *lte; + const u8 *hash; + hash = inode_stream_hash_unresolved(inode, i); + lte = __lookup_resource(table, hash); + if (!lte && !is_zero_hash(hash)) { + ERROR("Could not find lookup table entry for stream " + "%u of dentry `%s'", i, first_dentry->full_path_utf8); + goto out; + } + if (lte && (lte->real_refcnt += inode->link_count) > lte->refcnt) + { + #ifdef ENABLE_ERROR_MESSAGES + WARNING("The following lookup table entry " + "has a reference count of %u, but", + lte->refcnt); + WARNING("We found %zu references to it", + lte->real_refcnt); + WARNING("(One dentry referencing it is at `%s')", + first_dentry->full_path_utf8); + + print_lookup_table_entry(lte); + #endif + /* Guess what! install.wim for Windows 8 + * contains a stream with 2 dentries referencing + * it, but the lookup table entry has reference + * count of 1. So we will need to handle this + * case and not just make it be an error... I'm + * just setting the reference count to the + * number of references we found. + * (Unfortunately, even after doing this, the + * reference count could be too low if it's also + * referenced in other WIM images) */ + + #if 1 + lte->refcnt = lte->real_refcnt; + WARNING("Fixing reference count"); + #else + goto out; + #endif + } + } + } + + /* Make sure there is only one un-named stream. */ + unsigned num_unnamed_streams = 0; + for (unsigned i = 0; i <= inode->num_ads; i++) { + const u8 *hash; + hash = inode_stream_hash_unresolved(inode, i); + if (!inode_stream_name_len(inode, i) && !is_zero_hash(hash)) + num_unnamed_streams++; + } + if (num_unnamed_streams > 1) { + ERROR("Dentry `%s' has multiple (%u) un-named streams", + first_dentry->full_path_utf8, num_unnamed_streams); + goto out; + } + inode->verified = true; + ret = 0; +out: + return ret; +} + + +/* Run some miscellaneous verifications on a WIM dentry */ +int verify_dentry(struct dentry *dentry, void *wim) +{ + const WIMStruct *w = wim; + const struct inode *inode = dentry->inode; + int ret = WIMLIB_ERR_INVALID_DENTRY; + + if (!dentry->inode->verified) { + ret = verify_inode(dentry->inode, w); + if (ret != 0) + goto out; + } + + /* Cannot have a short name but no long name */ + if (dentry->short_name_len && !dentry->file_name_len) { + ERROR("Dentry `%s' has a short name but no long name", + dentry->full_path_utf8); + goto out; + } + + /* Make sure root dentry is unnamed */ + if (dentry_is_root(dentry)) { + if (dentry->file_name_len) { + ERROR("The root dentry is named `%s', but it must " + "be unnamed", dentry->file_name_utf8); + goto out; + } + } + +#if 0 + /* Check timestamps */ + if (inode->last_access_time < inode->creation_time || + inode->last_write_time < inode->creation_time) { + WARNING("Dentry `%s' was created after it was last accessed or " + "written to", dentry->full_path_utf8); + } +#endif + + ret = 0; +out: return ret; } @@ -1192,67 +1487,75 @@ out_free_file_name: static u8 *write_dentry(const struct dentry *dentry, u8 *p) { u8 *orig_p = p; - unsigned padding; const u8 *hash; + const struct inode *inode = dentry->inode; - p = put_u64(p, dentry->length); - p = put_u32(p, dentry->attributes); - p = put_u32(p, dentry->security_id); + /* We calculate the correct length of the dentry ourselves because the + * dentry->length field may been set to an unexpected value from when we + * read the dentry in (for example, there may have been unknown data + * appended to the end of the dentry...) */ + u64 length = dentry_correct_length(dentry); + + p = put_u64(p, length); + p = put_u32(p, inode->attributes); + p = put_u32(p, inode->security_id); p = put_u64(p, dentry->subdir_offset); p = put_u64(p, 0); /* unused1 */ p = put_u64(p, 0); /* unused2 */ - p = put_u64(p, dentry->creation_time); - p = put_u64(p, dentry->last_access_time); - p = put_u64(p, dentry->last_write_time); - if (dentry->resolved && dentry->lte) - hash = dentry->lte->hash; - else - hash = dentry->hash; + p = put_u64(p, inode->creation_time); + p = put_u64(p, inode->last_access_time); + p = put_u64(p, inode->last_write_time); + hash = inode_stream_hash(inode, 0); p = put_bytes(p, SHA1_HASH_SIZE, hash); - if (dentry->attributes & FILE_ATTRIBUTE_REPARSE_POINT) { + if (inode->attributes & FILE_ATTRIBUTE_REPARSE_POINT) { p = put_zeroes(p, 4); - p = put_u32(p, dentry->reparse_tag); + p = put_u32(p, inode->reparse_tag); p = put_zeroes(p, 4); } else { - u64 hard_link; + u64 link_group_id; p = put_u32(p, 0); - if (dentry->link_group_list.next == &dentry->link_group_list) - hard_link = 0; + if (inode->link_count == 1) + link_group_id = 0; else - hard_link = dentry->hard_link; - p = put_u64(p, hard_link); + link_group_id = inode->ino; + p = put_u64(p, link_group_id); } - p = put_u16(p, dentry->num_ads); + p = put_u16(p, inode->num_ads); p = put_u16(p, dentry->short_name_len); p = put_u16(p, dentry->file_name_len); - p = put_bytes(p, dentry->file_name_len, (u8*)dentry->file_name); - p = put_u16(p, 0); /* filename padding, 2 bytes. */ - p = put_bytes(p, dentry->short_name_len, (u8*)dentry->short_name); - - wimlib_assert(p - orig_p <= dentry->length); - if (p - orig_p < dentry->length) - p = put_zeroes(p, dentry->length - (p - orig_p)); + if (dentry->file_name_len) { + p = put_bytes(p, dentry->file_name_len, (u8*)dentry->file_name); + p = put_u16(p, 0); /* filename padding, 2 bytes. */ + } + if (dentry->short_name) { + p = put_bytes(p, dentry->short_name_len, (u8*)dentry->short_name); + p = put_u16(p, 0); /* short name padding, 2 bytes */ + } /* Align to 8-byte boundary */ - p = put_zeroes(p, (8 - dentry->length % 8) % 8); + wimlib_assert(length >= (p - orig_p) + && length - (p - orig_p) <= 7); + p = put_zeroes(p, length - (p - orig_p)); /* Write the alternate data streams, if there are any. Please see * read_ads_entries() for comments about the format of the on-disk * alternate data stream entries. */ - for (u16 i = 0; i < dentry->num_ads; i++) { - p = put_u64(p, ads_entry_total_length(&dentry->ads_entries[i])); + for (u16 i = 0; i < inode->num_ads; i++) { + p = put_u64(p, ads_entry_total_length(inode->ads_entries[i])); p = put_u64(p, 0); /* Unused */ - if (dentry->resolved && dentry->ads_entries[i].lte) - hash = dentry->ads_entries[i].lte->hash; - else - hash = dentry->ads_entries[i].hash; + hash = inode_stream_hash(inode, i + 1); p = put_bytes(p, SHA1_HASH_SIZE, hash); - 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_u16(p, inode->ads_entries[i]->stream_name_len); + if (inode->ads_entries[i]->stream_name_len) { + p = put_bytes(p, inode->ads_entries[i]->stream_name_len, + (u8*)inode->ads_entries[i]->stream_name); + p = put_u16(p, 0); + } p = put_zeroes(p, (8 - (p - orig_p) % 8) % 8); } +#ifdef ENABLE_ASSERTIONS + wimlib_assert(p - orig_p == __dentry_total_length(dentry, length)); +#endif return p; } @@ -1272,12 +1575,12 @@ static u8 *write_dentry_tree_recursive(const struct dentry *parent, u8 *p) * recursively writing the directory trees rooted at each of the child * dentries, since the on-disk dentries for a dentry's children are * always located at consecutive positions in the metadata resource! */ - child = parent->children; + child = parent->inode->children; if (child) { do { p = write_dentry(child, p); child = child->next; - } while (child != parent->children); + } while (child != parent->inode->children); } /* write end of directory entry */ @@ -1288,7 +1591,7 @@ static u8 *write_dentry_tree_recursive(const struct dentry *parent, u8 *p) do { p = write_dentry_tree_recursive(child, p); child = child->next; - } while (child != parent->children); + } while (child != parent->inode->children); } return p; } @@ -1384,6 +1687,7 @@ int read_dentry_tree(const u8 metadata_resource[], u64 metadata_resource_len, child->parent = dentry; prev_child = child; + list_add(&child->inode_dentry_list, &child->inode->dentry_list); /* If there are children of this child, call this procedure * recursively. */ @@ -1394,7 +1698,11 @@ int read_dentry_tree(const u8 metadata_resource[], u64 metadata_resource_len, break; } - /* Advance to the offset of the next child. */ + /* Advance to the offset of the next child. Note: We need to + * advance by the TOTAL length of the dentry, not by the length + * child->length, which although it does take into account the + * padding, it DOES NOT take into account alternate stream + * entries. */ cur_offset += dentry_total_length(child); } @@ -1404,6 +1712,6 @@ int read_dentry_tree(const u8 metadata_resource[], u64 metadata_resource_len, prev_child->next = first_child; first_child->prev = prev_child; } - dentry->children = first_child; + dentry->inode->children = first_child; return ret; }