X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fdentry.c;h=27937ab42a55a933e6833e34d5325bec7fdbd757;hp=c389652ea157e6d6bc3ee1cee3a9aa7d4daaa9d3;hb=01efbb02603508a2272f859c87ec259560aa823d;hpb=885632f08c75c1d7bb5d25436231c78f6ad7e0c0 diff --git a/src/dentry.c b/src/dentry.c index c389652e..27937ab4 100644 --- a/src/dentry.c +++ b/src/dentry.c @@ -7,82 +7,169 @@ * resource with its own security data and dentry tree. Dentries in different * images may share file resources by referring to the same lookup table * entries. + */ + +/* * * Copyright (C) 2010 Carl Thijssen * Copyright (C) 2012 Eric Biggers * - * wimlib - Library for working with WIM files + * This file is part of wimlib, a library for working with WIM files. * - * This library 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. + * 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. * - * This library 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. + * 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. * - * You should have received a copy of the GNU Lesser General Public License along - * with this library; if not, write to the Free Software Foundation, Inc., 59 - * Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU Lesser General Public License + * along with wimlib; if not, see http://www.gnu.org/licenses/. */ +#include +#include +#include +#include + #include "wimlib_internal.h" #include "dentry.h" #include "io.h" #include "timestamp.h" #include "lookup_table.h" -#include -#include +#include "sha1.h" +/* + * Returns true if @dentry has the UTF-8 file name @name that has length + * @name_len. + */ +static bool dentry_has_name(const struct dentry *dentry, const char *name, + size_t name_len) +{ + if (dentry->file_name_utf8_len != name_len) + return false; + return memcmp(dentry->file_name_utf8, name, name_len) == 0; +} + +/* 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_length(&dentry->ads_entries[i]); + return length; +} /* Transfers file attributes from a `stat' buffer to a struct dentry. */ void stbuf_to_dentry(const struct stat *stbuf, struct dentry *dentry) { - if (S_ISDIR(stbuf->st_mode)) - dentry->attributes = WIM_FILE_ATTRIBUTE_DIRECTORY; + if (S_ISLNK(stbuf->st_mode)) { + dentry->attributes = FILE_ATTRIBUTE_REPARSE_POINT; + dentry->reparse_tag = WIM_IO_REPARSE_TAG_SYMLINK; + } else if (S_ISDIR(stbuf->st_mode)) { + dentry->attributes = FILE_ATTRIBUTE_DIRECTORY; + } else { + dentry->attributes = FILE_ATTRIBUTE_NORMAL; + } + if (sizeof(ino_t) >= 8) + dentry->hard_link = (u64)stbuf->st_ino; else - dentry->attributes = WIM_FILE_ATTRIBUTE_NORMAL; + dentry->hard_link = (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); } -/* Transfers file attributes from a struct dentry to a `stat' buffer. */ -void dentry_to_stbuf(const struct dentry *dentry, struct stat *stbuf, - const struct lookup_table *table) + +/* Makes all timestamp fields for the dentry be the current time. */ +void dentry_update_all_timestamps(struct dentry *dentry) { - struct lookup_table_entry *lte; + u64 now = get_wim_timestamp(); + dentry->creation_time = now; + dentry->last_access_time = now; + dentry->last_write_time = now; +} - if (dentry_is_directory(dentry)) - stbuf->st_mode = S_IFDIR | 0755; - else - stbuf->st_mode = S_IFREG | 0644; +struct ads_entry *dentry_get_ads_entry(struct dentry *dentry, + const char *stream_name) +{ + size_t stream_name_len = strlen(stream_name); + 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]; + return NULL; +} - if (table) - lte = lookup_resource(table, dentry->hash); - else - lte = NULL; +static void ads_entry_init(struct ads_entry *ads_entry) +{ + 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; +} - if (lte) { - stbuf->st_nlink = lte->refcnt; - stbuf->st_size = lte->resource_entry.original_size; - } else { - stbuf->st_nlink = 1; - stbuf->st_size = 0; +/* Add an alternate stream entry to a dentry and return a pointer to it, or NULL + * on failure. */ +struct ads_entry *dentry_add_ads(struct dentry *dentry, const char *stream_name) +{ + u16 num_ads; + struct ads_entry *ads_entries; + struct ads_entry *new_entry; + + if (dentry->num_ads == 0xffff) + return NULL; + num_ads = dentry->num_ads + 1; + ads_entries = REALLOC(dentry->ads_entries, + num_ads * sizeof(struct ads_entry)); + if (!ads_entries) + 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; + } } - stbuf->st_uid = getuid(); - stbuf->st_gid = getgid(); - stbuf->st_atime = ms_timestamp_to_unix(dentry->last_access_time); - stbuf->st_mtime = ms_timestamp_to_unix(dentry->last_write_time); - stbuf->st_ctime = ms_timestamp_to_unix(dentry->creation_time); - stbuf->st_blocks = (stbuf->st_size + 511) / 512; + dentry->ads_entries = ads_entries; + + new_entry = &ads_entries[num_ads - 1]; + if (change_ads_name(new_entry, stream_name) != 0) + return NULL; + dentry->num_ads = num_ads; + ads_entry_init(new_entry); + return new_entry; } -/* Makes all timestamp fields for the dentry be the current time. */ -void dentry_update_all_timestamps(struct dentry *dentry) +void dentry_remove_ads(struct dentry *dentry, struct ads_entry *ads_entry) { - u64 now = get_timestamp(); - dentry->creation_time = now; - dentry->last_access_time = now; - dentry->last_write_time = now; + 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--; } /* @@ -144,49 +231,48 @@ int for_dentry_in_tree_depth(struct dentry *root, */ int calculate_dentry_full_path(struct dentry *dentry, void *ignore) { - int parent_len; - int len; - char *parent_full_path; char *full_path; - - FREE(dentry->full_path_utf8); - + u32 full_path_len; if (dentry_is_root(dentry)) { - dentry->full_path_utf8 = MALLOC(2); - if (!dentry->full_path_utf8) { - ERROR("Out of memory!\n"); - return WIMLIB_ERR_NOMEM; - } - - dentry->full_path_utf8[0] = '/'; - dentry->full_path_utf8[1] = '\0'; - dentry->full_path_utf8_len = 1; - return 0; - } - - if (dentry_is_root(dentry->parent)) { - parent_len = 0; - parent_full_path = ""; + full_path = MALLOC(2); + if (!full_path) + goto oom; + full_path[0] = '/'; + full_path[1] = '\0'; + full_path_len = 1; } else { - parent_len = dentry->parent->full_path_utf8_len; - parent_full_path = dentry->parent->full_path_utf8; - } + char *parent_full_path; + u32 parent_full_path_len; + const struct dentry *parent = dentry->parent; - len = parent_len + 1 + dentry->file_name_utf8_len; - full_path = MALLOC(len + 1); - if (!full_path) { - ERROR("Out of memory!\n"); - return WIMLIB_ERR_NOMEM; - } + if (dentry_is_root(parent)) { + parent_full_path = ""; + parent_full_path_len = 0; + } else { + parent_full_path = parent->full_path_utf8; + parent_full_path_len = parent->full_path_utf8_len; + } - memcpy(full_path, parent_full_path, parent_len); - full_path[parent_len] = '/'; - memcpy(full_path + parent_len + 1, dentry->file_name_utf8, - dentry->file_name_utf8_len); - full_path[len] = '\0'; + full_path_len = parent_full_path_len + 1 + + dentry->file_name_utf8_len; + full_path = MALLOC(full_path_len + 1); + if (!full_path) + goto oom; + + memcpy(full_path, parent_full_path, parent_full_path_len); + full_path[parent_full_path_len] = '/'; + memcpy(full_path + parent_full_path_len + 1, + dentry->file_name_utf8, + dentry->file_name_utf8_len); + full_path[full_path_len] = '\0'; + } + FREE(dentry->full_path_utf8); dentry->full_path_utf8 = full_path; - dentry->full_path_utf8_len = len; + dentry->full_path_utf8_len = full_path_len; return 0; +oom: + ERROR("Out of memory while calculating dentry full path"); + return WIMLIB_ERR_NOMEM; } /* @@ -207,7 +293,7 @@ void calculate_subdir_offsets(struct dentry *dentry, u64 *subdir_offset_p) /* Advance the subdir offset by the amount of space the children * of this dentry take up. */ do { - *subdir_offset_p += child->length; + *subdir_offset_p += dentry_total_length(child); child = child->next; } while (child != dentry->children); @@ -306,28 +392,64 @@ int print_dentry_full_path(struct dentry *dentry, void *ignore) return 0; } +struct file_attr_flag { + u32 flag; + const char *name; +}; +struct file_attr_flag file_attr_flags[] = { + {FILE_ATTRIBUTE_READONLY, "READONLY"}, + {FILE_ATTRIBUTE_HIDDEN, "HIDDEN"}, + {FILE_ATTRIBUTE_SYSTEM, "SYSTEM"}, + {FILE_ATTRIBUTE_DIRECTORY, "DIRECTORY"}, + {FILE_ATTRIBUTE_ARCHIVE, "ARCHIVE"}, + {FILE_ATTRIBUTE_DEVICE, "DEVICE"}, + {FILE_ATTRIBUTE_NORMAL, "NORMAL"}, + {FILE_ATTRIBUTE_TEMPORARY, "TEMPORARY"}, + {FILE_ATTRIBUTE_SPARSE_FILE, "SPARSE_FILE"}, + {FILE_ATTRIBUTE_REPARSE_POINT, "REPARSE_POINT"}, + {FILE_ATTRIBUTE_COMPRESSED, "COMPRESSED"}, + {FILE_ATTRIBUTE_OFFLINE, "OFFLINE"}, + {FILE_ATTRIBUTE_NOT_CONTENT_INDEXED,"NOT_CONTENT_INDEXED"}, + {FILE_ATTRIBUTE_ENCRYPTED, "ENCRYPTED"}, + {FILE_ATTRIBUTE_VIRTUAL, "VIRTUAL"}, +}; + /* Prints a directory entry. @lookup_table is a pointer to the lookup table, or * NULL if the resource entry for the dentry is not to be printed. */ int print_dentry(struct dentry *dentry, void *lookup_table) { + const u8 *hash; struct lookup_table_entry *lte; + printf("[DENTRY]\n"); printf("Length = %"PRIu64"\n", dentry->length); printf("Attributes = 0x%x\n", dentry->attributes); - /*printf("Security ID = %d\n", dentry->security_id);*/ + for (unsigned i = 0; i < ARRAY_LEN(file_attr_flags); i++) + if (file_attr_flags[i].flag & dentry->attributes) + printf(" FILE_ATTRIBUTE_%s is set\n", + file_attr_flags[i].name); + printf("Security ID = %d\n", dentry->security_id); printf("Subdir offset = %"PRIu64"\n", dentry->subdir_offset); - /*printf("Unused1 = %"PRIu64"\n", dentry->unused1);*/ - /*printf("Unused2 = %"PRIu64"\n", dentry->unused2);*/ - printf("Creation Time = %"PRIu64"\n", dentry->creation_time); - printf("Last Access Time = %"PRIu64"\n", dentry->last_access_time); - printf("Last Write Time = %"PRIu64"\n", dentry->last_write_time); - printf("Creation Time = 0x%"PRIx64"\n", dentry->creation_time); - printf("Hash = "); - print_hash(dentry->hash); - putchar('\n'); - /*printf("Reparse Tag = %u\n", dentry->reparse_tag);*/ - printf("Hard Link Group = %"PRIu64"\n", dentry->hard_link); - /*printf("Number of Streams = %hu\n", dentry->streams);*/ +#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 + + 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(localtime(&creat_time))); + printf("Last Access Time = %s", asctime(localtime(&access_time))); + printf("Last Write Time = %s", asctime(localtime(&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); printf("Filename = \""); print_string(dentry->file_name, dentry->file_name_len); puts("\""); @@ -339,14 +461,30 @@ 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); - if (lookup_table) { - lte = lookup_resource(lookup_table, dentry->hash); - if (lte) - print_lookup_table_entry(lte, NULL); - else - putchar('\n'); + lte = dentry_stream_lte(dentry, 0, lookup_table); + if (lte) { + print_lookup_table_entry(lte); } else { - putchar('\n'); + hash = dentry_stream_hash(dentry, 0); + if (hash) { + printf("Hash = 0x"); + print_hash(hash); + putchar('\n'); + } + } + for (u16 i = 0; i < dentry->num_ads; i++) { + printf("[Alternate Stream Entry %u]\n", i); + printf("Name = \"%s\"\n", dentry->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); + if (hash) { + printf("Hash = 0x"); + print_hash(hash); + putchar('\n'); + } + print_lookup_table_entry(dentry_stream_lte(dentry, i + 1, + lookup_table)); } return 0; } @@ -355,8 +493,9 @@ static inline void dentry_common_init(struct dentry *dentry) { memset(dentry, 0, sizeof(struct dentry)); dentry->refcnt = 1; - /* We are currently ignoring the security data. */ - /*dentry->security_id = -1;*/ + dentry->security_id = -1; + dentry->ads_entries_status = ADS_ENTRIES_DEFAULT; + dentry->lte_group_list.type = STREAM_TYPE_NORMAL; } /* @@ -371,51 +510,112 @@ struct dentry *new_dentry(const char *name) dentry = MALLOC(sizeof(struct dentry)); if (!dentry) - return NULL; + goto err; dentry_common_init(dentry); - if (change_dentry_name(dentry, name) != 0) { - FREE(dentry); - return NULL; - } + 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); + ERROR("Failed to allocate new dentry"); + return NULL; } +void dentry_free_ads_entries(struct dentry *dentry) +{ + 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; +} -void free_dentry(struct dentry *dentry) +static void __destroy_dentry(struct dentry *dentry) { FREE(dentry->file_name); FREE(dentry->file_name_utf8); FREE(dentry->short_name); FREE(dentry->full_path_utf8); + FREE(dentry->extracted_file); +} + +void free_dentry(struct dentry *dentry) +{ + wimlib_assert(dentry); + __destroy_dentry(dentry); + if (dentry->ads_entries_status != ADS_ENTRIES_USER) + dentry_free_ads_entries(dentry); FREE(dentry); } -/* Arguments for do_free_dentry(). */ -struct free_dentry_args { - struct lookup_table *lookup_table; - bool decrement_refcnt; -}; +/* 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) +{ + 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; + } + } + dentry->ads_entries_status = ADS_ENTRIES_USER; + } + struct list_head *next; + list_del(&dentry->link_group_list); + free_dentry(dentry); +} + + +/* clones a dentry. + * + * Beware: + * - memory for file names is not cloned + * - next, prev, and children pointers and not touched + * - stream entries are not cloned. + */ +struct dentry *clone_dentry(struct dentry *old) +{ + struct dentry *new = MALLOC(sizeof(struct dentry)); + if (!new) + return NULL; + memcpy(new, old, sizeof(struct dentry)); + new->file_name = NULL; + new->file_name_len = 0; + new->file_name_utf8 = NULL; + new->file_name_utf8_len = 0; + new->short_name = NULL; + new->short_name_len = 0; + return new; +} /* * This function is passed as an argument to for_dentry_in_tree_depth() in order * to free a directory tree. __args is a pointer to a `struct free_dentry_args'. */ -static int do_free_dentry(struct dentry *dentry, void *__args) +static int do_free_dentry(struct dentry *dentry, void *__lookup_table) { - struct free_dentry_args *args = (struct free_dentry_args*)__args; - - if (args->decrement_refcnt && !dentry_is_directory(dentry)) { - lookup_table_decrement_refcnt(args->lookup_table, - dentry->hash); + struct lookup_table *lookup_table = __lookup_table; + if (lookup_table) { + struct lookup_table_entry *lte; + if (dentry->resolved) + lte = dentry->lte; + else + lte = __lookup_resource(lookup_table, dentry->hash); + lte_decrement_refcnt(lte, lookup_table); } - wimlib_assert(dentry->refcnt >= 1); + wimlib_assert(dentry->refcnt != 0); if (--dentry->refcnt == 0) free_dentry(dentry); return 0; @@ -425,20 +625,16 @@ static int do_free_dentry(struct dentry *dentry, void *__args) * Unlinks and frees a dentry tree. * * @root: The root of the tree. - * @lookup_table: The lookup table for dentries. - * @decrement_refcnt: True if the dentries in the tree are to have their - * reference counts in the lookup table decremented. + * @lookup_table: The lookup table for dentries. If non-NULL, the + * reference counts in the lookup table for the lookup + * table entries corresponding to the dentries will be + * decremented. */ -void free_dentry_tree(struct dentry *root, struct lookup_table *lookup_table, - bool decrement_refcnt) +void free_dentry_tree(struct dentry *root, struct lookup_table *lookup_table) { if (!root || !root->parent) return; - - struct free_dentry_args args; - args.lookup_table = lookup_table; - args.decrement_refcnt = decrement_refcnt; - for_dentry_in_tree_depth(root, do_free_dentry, &args); + for_dentry_in_tree_depth(root, do_free_dentry, lookup_table); } int increment_dentry_refcnt(struct dentry *dentry, void *ignore) @@ -455,6 +651,7 @@ int increment_dentry_refcnt(struct dentry *dentry, void *ignore) */ void link_dentry(struct dentry *dentry, struct dentry *parent) { + wimlib_assert(dentry_is_directory(parent)); dentry->parent = parent; if (parent->children) { /* Not an only child; link to siblings. */ @@ -470,7 +667,13 @@ void link_dentry(struct dentry *dentry, struct dentry *parent) } } -/* 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. */ void unlink_dentry(struct dentry *dentry) { if (dentry_is_root(dentry)) @@ -493,41 +696,64 @@ 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 += (8 - dentry->length % 8) % 8; + dentry->length = (dentry->length + 7) & ~7; } -/* Changes the name of a dentry to @new_name. Only changes the file_name and - * file_name_utf8 fields; does not change the short_name, short_name_utf8, or - * full_path_utf8 fields. Also recalculates its length. */ -int change_dentry_name(struct dentry *dentry, const char *new_name) +/* 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, + u16 *name_utf16_len_ret, u16 *name_utf8_len_ret, + const char *name) { size_t utf8_len; size_t utf16_len; + char *name_utf16, *name_utf8; - FREE(dentry->file_name); - - utf8_len = strlen(new_name); + utf8_len = strlen(name); - dentry->file_name = utf8_to_utf16(new_name, utf8_len, &utf16_len); + name_utf16 = utf8_to_utf16(name, utf8_len, &utf16_len); - if (!dentry->file_name) + if (!name_utf16) return WIMLIB_ERR_NOMEM; - FREE(dentry->file_name_utf8); - dentry->file_name_utf8 = MALLOC(utf8_len + 1); - if (!dentry->file_name_utf8) { - FREE(dentry->file_name); - dentry->file_name = NULL; + name_utf8 = MALLOC(utf8_len + 1); + if (!name_utf8) { + FREE(name_utf8); return WIMLIB_ERR_NOMEM; } - - dentry->file_name_len = utf16_len; - dentry->file_name_utf8_len = utf8_len; - memcpy(dentry->file_name_utf8, new_name, utf8_len + 1); - recalculate_dentry_size(dentry); + memcpy(name_utf8, name, utf8_len + 1); + FREE(*name_utf8_ret); + FREE(*name_utf16_ret); + *name_utf8_ret = name_utf8; + *name_utf16_ret = name_utf16; + *name_utf8_len_ret = utf8_len; + *name_utf16_len_ret = utf16_len; return 0; } +/* Changes the name of a dentry to @new_name. Only changes the file_name and + * file_name_utf8 fields; does not change the short_name, short_name_utf8, or + * full_path_utf8 fields. Also recalculates its length. */ +int change_dentry_name(struct dentry *dentry, const char *new_name) +{ + int ret; + + ret = get_names(&dentry->file_name, &dentry->file_name_utf8, + &dentry->file_name_len, &dentry->file_name_utf8_len, + new_name); + if (ret == 0) + recalculate_dentry_size(dentry); + return ret; +} + +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); +} + /* Parameters for calculate_dentry_statistics(). */ struct image_statistics { struct lookup_table *lookup_table; @@ -541,21 +767,34 @@ static int calculate_dentry_statistics(struct dentry *dentry, void *arg) { struct image_statistics *stats; struct lookup_table_entry *lte; + u16 i; stats = arg; - lte = lookup_resource(stats->lookup_table, dentry->hash); if (dentry_is_directory(dentry) && !dentry_is_root(dentry)) ++*stats->dir_count; else ++*stats->file_count; - if (lte) { - u64 size = lte->resource_entry.original_size; - *stats->total_bytes += size; - if (++lte->out_refcnt == 1) - *stats->hard_link_bytes += size; + if (dentry->resolved) + lte = dentry->lte; + else + lte = __lookup_resource(stats->lookup_table, dentry->hash); + i = 0; + while (1) { + if (lte) { + u64 size = lte->resource_entry.original_size; + *stats->total_bytes += size; + if (++lte->out_refcnt == 1) + *stats->hard_link_bytes += size; + } + if (i == dentry->num_ads) + break; + lte = __lookup_resource(stats->lookup_table, + dentry->ads_entries[i].hash); + i++; } + return 0; } @@ -578,11 +817,91 @@ void calculate_dir_tree_statistics(struct dentry *root, struct lookup_table *tab for_dentry_in_tree(root, calculate_dentry_statistics, &stats); } +static int read_ads_entries(const u8 *p, struct dentry *dentry, + u64 remaining_size) +{ + u16 num_ads = dentry->num_ads; + struct ads_entry *ads_entries = CALLOC(num_ads, sizeof(struct ads_entry)); + int ret; + if (!ads_entries) { + ERROR("Could not allocate memory for %"PRIu16" " + "alternate data stream entries", num_ads); + return WIMLIB_ERR_NOMEM; + } + DEBUG2("Reading %"PRIu16" alternate data streams " + "(remaining size = %"PRIu64")", num_ads, remaining_size); + + for (u16 i = 0; i < num_ads; i++) { + struct ads_entry *cur_entry = &ads_entries[i]; + u64 length; + size_t utf8_len; + const char *p_save = p; + /* Read the base stream entry, excluding the stream name. */ + if (remaining_size < WIM_ADS_ENTRY_DISK_SIZE) { + ERROR("Stream entries go past end of metadata resource"); + ERROR("(remaining_size = %"PRIu64")", remaining_size); + 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 */ + + DEBUG2("ADS length = %"PRIu64, length); + + p += 8; /* Unused */ + p = get_bytes(p, SHA1_HASH_SIZE, (u8*)cur_entry->hash); + p = get_u16(p, &cur_entry->stream_name_len); + + DEBUG2("Stream name length = %u", 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) { + 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); + 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; + 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_length(cur_entry); + } + dentry->ads_entries = ads_entries; + 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); + } + FREE(ads_entries); + return ret; +} + /* * Reads a directory entry from the metadata resource. */ int read_dentry(const u8 metadata_resource[], u64 metadata_resource_len, - u64 offset, struct dentry *dentry) + u64 offset, struct dentry *dentry) { const u8 *p; u64 calculated_size; @@ -592,14 +911,15 @@ int read_dentry(const u8 metadata_resource[], u64 metadata_resource_len, u16 short_name_len; u16 file_name_len; size_t file_name_utf8_len; + int ret; dentry_common_init(dentry); /*Make sure the dentry really fits into the metadata resource.*/ if (offset + 8 > metadata_resource_len) { ERROR("Directory entry starting at %"PRIu64" ends past the " - "end of the metadata resource (size %"PRIu64")!\n", - offset, metadata_resource_len); + "end of the metadata resource (size %"PRIu64")", + offset, metadata_resource_len); return WIMLIB_ERR_INVALID_DENTRY; } @@ -618,9 +938,9 @@ int read_dentry(const u8 metadata_resource[], u64 metadata_resource_len, if (offset + dentry->length >= metadata_resource_len) { ERROR("Directory entry at offset %"PRIu64" and with size " - "%"PRIu64" ends past the end of the metadata resource " - "(size %"PRIu64")!\n", offset, dentry->length, - metadata_resource_len); + "%"PRIu64" ends past the end of the metadata resource " + "(size %"PRIu64")", + offset, dentry->length, metadata_resource_len); return WIMLIB_ERR_INVALID_DENTRY; } @@ -628,34 +948,47 @@ int read_dentry(const u8 metadata_resource[], u64 metadata_resource_len, * Note: The root directory entry has no name, and its length does not * include the short name length field. */ if (dentry->length < WIM_DENTRY_DISK_SIZE) { - ERROR("Directory entry has invalid length of " - "%"PRIu64" bytes\n", dentry->length); + ERROR("Directory entry has invalid length of %"PRIu64" bytes", + dentry->length); return WIMLIB_ERR_INVALID_DENTRY; } p = get_u32(p, &dentry->attributes); - /* Currently ignoring security ID. */ - p += sizeof(u32); + p = get_u32(p, (u32*)&dentry->security_id); p = get_u64(p, &dentry->subdir_offset); /* 2 unused fields */ p += 2 * sizeof(u64); + /*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_bytes(p, WIM_HASH_SIZE, dentry->hash); + p = get_bytes(p, SHA1_HASH_SIZE, dentry->hash); - /* Currently ignoring reparse_tag. */ - p += sizeof(u32); + /* + * I don't know what's going on here. It seems like M$ screwed up the + * reparse points, then put the fields in the same place and didn't + * 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) { + /* ??? */ + p += 4; + p = get_u32(p, &dentry->reparse_tag); + p += 4; + } else { + p = get_u32(p, &dentry->reparse_tag); + p = get_u64(p, &dentry->hard_link); + } - /* The reparse_reserved field does not actually exist. */ + /* By the way, the reparse_reserved field does not actually exist (at + * least when the file is not a reparse point) */ - p = get_u64(p, &dentry->hard_link); - /* Currently ignoring streams. */ - p += sizeof(u16); + p = get_u16(p, &dentry->num_ads); p = get_u16(p, &short_name_len); p = get_u16(p, &file_name_len); @@ -665,18 +998,18 @@ int read_dentry(const u8 metadata_resource[], u64 metadata_resource_len, if (dentry->length < calculated_size) { ERROR("Unexpected end of directory entry! (Expected " - "%"PRIu64" bytes, got %"PRIu64" bytes. " - "short_name_len = %hu, file_name_len = %hu)\n", - calculated_size, dentry->length, - short_name_len, file_name_len); + "%"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!\n", - file_name_len); + 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); @@ -686,25 +1019,70 @@ int read_dentry(const u8 metadata_resource[], u64 metadata_resource_len, &file_name_utf8_len); if (!file_name_utf8) { - ERROR("Failed to allocate memory to convert UTF16 " - "filename (%hu bytes) to UTF8\n", - file_name_len); - goto err_nomem2; + 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; } /* Undocumented padding between file name and short name. This probably - * is supposed to be a terminating NULL character. */ + * 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\n", - short_name_len); - goto err_nomem1; + ERROR("Failed to allocate %hu bytes for short filename", + short_name_len); + ret = WIMLIB_ERR_NOMEM; + goto out_free_file_name_utf8; } - get_bytes(p, short_name_len, short_name); + p = get_bytes(p, short_name_len, short_name); + + /* Some directory entries inexplicibly 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. 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'); + } +#endif + + if (dentry->num_ads != 0) { + calculated_size = (calculated_size + 7) & ~7; + if (calculated_size > metadata_resource_len - offset) { + ERROR("Not enough space in metadata resource for " + "alternate stream entries"); + ret = WIMLIB_ERR_INVALID_DENTRY; + goto out_free_short_name; + } + ret = read_ads_entries(&metadata_resource[offset + calculated_size], + dentry, + metadata_resource_len - offset - calculated_size); + if (ret != 0) + goto out_free_short_name; + } dentry->file_name = file_name; dentry->file_name_utf8 = file_name_utf8; @@ -713,11 +1091,13 @@ int read_dentry(const u8 metadata_resource[], u64 metadata_resource_len, dentry->file_name_utf8_len = file_name_utf8_len; dentry->short_name_len = short_name_len; return 0; -err_nomem1: - FREE(dentry->file_name_utf8); -err_nomem2: - FREE(dentry->file_name); - return WIMLIB_ERR_NOMEM; +out_free_short_name: + FREE(short_name); +out_free_file_name_utf8: + FREE(file_name_utf8); +out_free_file_name: + FREE(file_name); + return ret; } /* @@ -725,31 +1105,69 @@ err_nomem2: * * @dentry: The dentry structure. * @p: The memory location to write the data to. - * @return: True on success, false on failure. + * @return: Pointer to the byte after the last byte we wrote as part of the + * dentry. */ static u8 *write_dentry(const struct dentry *dentry, u8 *p) { u8 *orig_p = p; - memset(p, 0, dentry->length); + unsigned padding; + const u8 *hash; + p = put_u64(p, dentry->length); p = put_u32(p, dentry->attributes); - p = put_u32(p, (u32)(-1)); /* security id */ + p = put_u32(p, dentry->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); - p = put_bytes(p, WIM_HASH_SIZE, dentry->hash); - p = put_u32(p, 0); /* reparse_tag */ - p = put_u64(p, dentry->hard_link); - p = put_u16(p, 0); /*streams */ + if (dentry->resolved && dentry->lte) + hash = dentry->lte->hash; + else + hash = dentry->hash; + p = put_bytes(p, SHA1_HASH_SIZE, hash); + if (dentry->attributes & FILE_ATTRIBUTE_REPARSE_POINT) { + p = put_zeroes(p, 4); + p = put_u32(p, dentry->reparse_tag); + p = put_zeroes(p, 4); + } else { + u64 hard_link; + p = put_u32(p, dentry->reparse_tag); + if (dentry->link_group_list.next == &dentry->link_group_list) + hard_link = 0; + else + hard_link = dentry->hard_link; + p = put_u64(p, hard_link); + } + p = put_u16(p, dentry->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); - return orig_p + dentry->length; + + wimlib_assert(p - orig_p <= dentry->length); + 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); + + for (u16 i = 0; i < dentry->num_ads; i++) { + p = put_u64(p, ads_entry_length(&dentry->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; + 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_zeroes(p, (8 - (p - orig_p) % 8) % 8); + } + return p; } /* Recursive function that writes a dentry tree rooted at @tree, not including @@ -765,8 +1183,8 @@ u8 *write_dentry_tree(const struct dentry *tree, u8 *p) /* write end of directory entry */ p = put_u64(p, 0); } else { - /* Nothing to do for a regular file. */ - if (dentry_is_regular_file(tree)) + /* Nothing to do for non-directories */ + if (!dentry_is_directory(tree)) return p; } @@ -796,13 +1214,14 @@ u8 *write_dentry_tree(const struct dentry *tree, u8 *p) * metadata resource and into the dentry tree. * * @metadata_resource: An array that contains the uncompressed metadata - * resource for the WIM file. + * resource for the WIM file. * @metadata_resource_len: The length of @metadata_resource. - * @dentry: A pointer to a struct dentry that is the root of the directory tree - * and has already been read from the metadata resource. It does not - * need to be the real root, because this procedure is called - * recursively. - * @return: True on success, false on failure. + * @dentry: A pointer to a struct dentry that is the root of the directory + * tree and has already been read from the metadata resource. It + * does not need to be the real root because this procedure is + * called recursively. + * + * @return: Zero on success, nonzero on failure. */ int read_dentry_tree(const u8 metadata_resource[], u64 metadata_resource_len, struct dentry *dentry) @@ -838,8 +1257,8 @@ int read_dentry_tree(const u8 metadata_resource[], u64 metadata_resource_len, * link it to the parent and previous child. */ child = MALLOC(sizeof(struct dentry)); if (!child) { - ERROR("Failed to allocate %zu bytes for new dentry!\n", - sizeof(struct dentry)); + ERROR("Failed to allocate %zu bytes for new dentry", + sizeof(struct dentry)); ret = WIMLIB_ERR_NOMEM; break; } @@ -865,7 +1284,7 @@ int read_dentry_tree(const u8 metadata_resource[], u64 metadata_resource_len, } /* Advance to the offset of the next child. */ - cur_offset += child->length; + cur_offset += dentry_total_length(child); } /* Link last child to first one, and set parent's