X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fdentry.c;h=54601493ba4e4ee7c43b2577ac76814c352fe68f;hb=034fd063f956d0806e557680a36a69a42556a776;hp=2fc42c6b6d55e35df425f7102f662af6d19dac10;hpb=8d2a74ef1ec7d57b153ef09552fd3e6613935bd9;p=wimlib diff --git a/src/dentry.c b/src/dentry.c index 2fc42c6b..54601493 100644 --- a/src/dentry.c +++ b/src/dentry.c @@ -71,16 +71,6 @@ static u64 dentry_correct_length(const struct dentry *dentry) return (dentry_correct_length_unaligned(dentry) + 7) & ~7; } -/* Return %true iff @dentry has the UTF-8 file name @name that has length - * @name_len bytes. */ -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; -} - /* Return %true iff the alternate data stream entry @entry has the UTF-8 stream * name @name that has length @name_len bytes. */ static inline bool ads_entry_has_name(const struct ads_entry *entry, @@ -185,28 +175,6 @@ static u64 dentry_total_length(const struct dentry *dentry) return __dentry_total_length(dentry, dentry->length); } -/* Transfers file attributes from a `stat' buffer to a WIM "inode". */ -void stbuf_to_inode(const struct stat *stbuf, struct inode *inode) -{ - if (S_ISLNK(stbuf->st_mode)) { - inode->attributes = FILE_ATTRIBUTE_REPARSE_POINT; - inode->reparse_tag = WIM_IO_REPARSE_TAG_SYMLINK; - } else if (S_ISDIR(stbuf->st_mode)) { - inode->attributes = FILE_ATTRIBUTE_DIRECTORY; - } else { - inode->attributes = FILE_ATTRIBUTE_NORMAL; - } - if (sizeof(ino_t) >= 8) - inode->ino = (u64)stbuf->st_ino; - else - inode->ino = (u64)stbuf->st_ino | - ((u64)stbuf->st_dev << ((sizeof(ino_t) * 8) & 63)); - /* Set timestamps */ - 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); -} - #ifdef WITH_FUSE /* Transfers file attributes from a struct inode to a `stat' buffer. * @@ -306,20 +274,18 @@ static int for_dentry_tree_in_rbtree_depth(struct rb_node *node, #ifdef RECURSIVE_FOR_DENTRY_IN_TREE static int for_dentry_tree_in_rbtree(struct rb_node *node, - int (*visitor)(struct dentry*, void*), - void *arg) + int (*visitor)(struct dentry*, void*), + void *arg) { int ret; if (node) { - ret = for_dentry_tree_in_rbtree(node->rb_left, - visitor, arg); + ret = for_dentry_tree_in_rbtree(node->rb_left, visitor, arg); if (ret != 0) return ret; ret = for_dentry_in_tree(rbnode_dentry(node), visitor, arg); if (ret != 0) return ret; - ret = for_dentry_tree_in_rbtree(node->rb_right, - visitor, arg); + ret = for_dentry_tree_in_rbtree(node->rb_right, visitor, arg); if (ret != 0) return ret; } @@ -790,49 +756,37 @@ int print_dentry(struct dentry *dentry, void *lookup_table) const u8 *hash; struct lookup_table_entry *lte; const struct inode *inode = dentry->d_inode; - time_t time; - char *p; + char buf[50]; printf("[DENTRY]\n"); printf("Length = %"PRIu64"\n", dentry->length); printf("Attributes = 0x%x\n", inode->attributes); - for (unsigned i = 0; i < ARRAY_LEN(file_attr_flags); i++) + for (size_t i = 0; i < ARRAY_LEN(file_attr_flags); i++) 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", inode->security_id); printf("Subdir offset = %"PRIu64"\n", dentry->subdir_offset); - /* Translate the timestamps into something readable */ - time = wim_timestamp_to_unix(inode->creation_time); - p = asctime(gmtime(&time)); - *(strrchr(p, '\n')) = '\0'; - printf("Creation Time = %s UTC\n", p); + wim_timestamp_to_str(inode->creation_time, buf, sizeof(buf)); + printf("Creation Time = %s\n", buf); - 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); + wim_timestamp_to_str(inode->last_access_time, buf, sizeof(buf)); + printf("Last Access Time = %s\n", buf); - 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); + wim_timestamp_to_str(inode->last_write_time, buf, sizeof(buf)); + printf("Last Write Time = %s\n", buf); 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("\""); - printf("Filename Length = %hu\n", dentry->file_name_len); printf("Filename (UTF-8) = \"%s\"\n", dentry->file_name_utf8); - printf("Filename (UTF-8) Length = %hu\n", dentry->file_name_utf8_len); - printf("Short Name = \""); + /*printf("Filename (UTF-8) Length = %hu\n", dentry->file_name_utf8_len);*/ + printf("Short Name (UTF-16LE) = \""); print_string(dentry->short_name, dentry->short_name_len); puts("\""); - printf("Short Name Length = %hu\n", dentry->short_name_len); + /*printf("Short Name Length = %hu\n", dentry->short_name_len);*/ printf("Full Path (UTF-8) = \"%s\"\n", dentry->full_path_utf8); lte = inode_stream_lte(dentry->d_inode, 0, lookup_table); if (lte) { @@ -878,6 +832,11 @@ static struct inode *new_timeless_inode() inode->link_count = 1; #ifdef WITH_FUSE inode->next_stream_id = 1; + if (pthread_mutex_init(&inode->i_mutex, NULL) != 0) { + ERROR_WITH_ERRNO("Error initializing mutex"); + FREE(inode); + return NULL; + } #endif INIT_LIST_HEAD(&inode->dentry_list); } @@ -983,6 +942,7 @@ void free_inode(struct inode *inode) #ifdef WITH_FUSE wimlib_assert(inode->num_opened_fds == 0); FREE(inode->fds); + pthread_mutex_destroy(&inode->i_mutex); #endif FREE(inode->extracted_file); FREE(inode); @@ -1065,9 +1025,8 @@ static int do_free_dentry(struct dentry *dentry, void *__lookup_table) */ void free_dentry_tree(struct dentry *root, struct lookup_table *lookup_table) { - if (!root || !root->parent) - return; - for_dentry_in_tree_depth(root, do_free_dentry, lookup_table); + if (root) + for_dentry_in_tree_depth(root, do_free_dentry, lookup_table); } int increment_dentry_refcnt(struct dentry *dentry, void *ignore) @@ -1527,11 +1486,11 @@ out_free_ads_entries: * @offset: Offset of this directory entry in the metadata resource. * @dentry: A `struct dentry' that will be filled in by this function. * - * Return 0 on success or nonzero on failure. On failure, @dentry have been - * modified, bu it will be left with no pointers to any allocated buffers. - * On success, the dentry->length field must be examined. If zero, this was a - * special "end of directory" dentry and not a real dentry. If nonzero, this - * was a real dentry. + * Return 0 on success or nonzero on failure. On failure, @dentry will have + * been modified, but it will not be left with pointers to any allocated + * buffers. On success, the dentry->length field must be examined. If zero, + * this was a special "end of directory" dentry and not a real dentry. If + * nonzero, this was a real dentry. */ int read_dentry(const u8 metadata_resource[], u64 metadata_resource_len, u64 offset, struct dentry *dentry) @@ -1811,8 +1770,6 @@ int read_dentry_tree(const u8 metadata_resource[], u64 metadata_resource_len, struct dentry *dentry) { u64 cur_offset = dentry->subdir_offset; - struct dentry *prev_child = NULL; - struct dentry *first_child = NULL; struct dentry *child; struct dentry cur_child; int ret; @@ -1849,9 +1806,7 @@ int read_dentry_tree(const u8 metadata_resource[], u64 metadata_resource_len, break; } memcpy(child, &cur_child, sizeof(struct dentry)); - dentry_add_child(dentry, child); - inode_add_dentry(child, child->d_inode); /* If there are children of this child, call this procedure