X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fdentry.c;h=8f591c3d9f57c18f63d89ae90c72504a895c0608;hp=4f9e9f7a7aca69682eeb2c69f5fa4546bf3720aa;hb=594502d26951aa89e374599de862486c1e7a6878;hpb=a3bb2e86f2640f5d593d00250a627d3dcc9747a2 diff --git a/src/dentry.c b/src/dentry.c index 4f9e9f7a..8f591c3d 100644 --- a/src/dentry.c +++ b/src/dentry.c @@ -275,14 +275,15 @@ for_dentry_in_tree_depth(struct wim_dentry *root, /* Calculate the full path of @dentry. The full path of its parent must have * already been calculated, or it must be the root dentry. */ -int -calculate_dentry_full_path(struct wim_dentry *dentry, void *ignore) +static int +calculate_dentry_full_path(struct wim_dentry *dentry) { tchar *full_path; u32 full_path_nbytes; + int ret; - wimlib_assert(dentry_is_root(dentry) || - dentry->parent->full_path != NULL); + if (dentry->_full_path) + return 0; if (dentry_is_root(dentry)) { full_path = TSTRDUP(T("/")); @@ -290,7 +291,7 @@ calculate_dentry_full_path(struct wim_dentry *dentry, void *ignore) return WIMLIB_ERR_NOMEM; full_path_nbytes = 1 * sizeof(tchar); } else { - const struct wim_dentry *parent; + struct wim_dentry *parent; tchar *parent_full_path; u32 parent_full_path_nbytes; size_t filename_nbytes; @@ -300,7 +301,12 @@ calculate_dentry_full_path(struct wim_dentry *dentry, void *ignore) parent_full_path = T(""); parent_full_path_nbytes = 0; } else { - parent_full_path = parent->full_path; + if (!parent->_full_path) { + ret = calculate_dentry_full_path(parent); + if (ret) + return ret; + } + parent_full_path = parent->_full_path; parent_full_path_nbytes = parent->full_path_nbytes; } @@ -336,12 +342,30 @@ calculate_dentry_full_path(struct wim_dentry *dentry, void *ignore) sizeof(tchar) + 1]); #endif } - FREE(dentry->full_path); - dentry->full_path = full_path; + dentry->_full_path = full_path; dentry->full_path_nbytes= full_path_nbytes; return 0; } +static int +do_calculate_dentry_full_path(struct wim_dentry *dentry, void *_ignore) +{ + return calculate_dentry_full_path(dentry); +} + +int +calculate_dentry_tree_full_paths(struct wim_dentry *root) +{ + return for_dentry_in_tree(root, do_calculate_dentry_full_path, NULL); +} + +tchar * +dentry_full_path(struct wim_dentry *dentry) +{ + calculate_dentry_full_path(dentry); + return dentry->_full_path; +} + static int increment_subdir_offset(struct wim_dentry *dentry, void *subdir_offset_p) { @@ -559,10 +583,12 @@ get_parent_dentry(WIMStruct *w, const tchar *path) /* Prints the full path of a dentry. */ int -print_dentry_full_path(struct wim_dentry *dentry, void *ignore) +print_dentry_full_path(struct wim_dentry *dentry, void *_ignore) { - if (dentry->full_path) - tprintf(T("%"TS"\n"), dentry->full_path); + int ret = calculate_dentry_full_path(dentry); + if (ret) + return ret; + tprintf(T("%"TS"\n"), dentry->_full_path); return 0; } @@ -620,7 +646,15 @@ print_dentry(struct wim_dentry *dentry, void *lookup_table) wim_timestamp_to_str(inode->i_last_write_time, buf, sizeof(buf)); tprintf(T("Last Write Time = %"TS"\n"), buf); - tprintf(T("Reparse Tag = 0x%"PRIx32"\n"), inode->i_reparse_tag); + if (inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT) { + tprintf(T("Reparse Tag = 0x%"PRIx32"\n"), inode->i_reparse_tag); + tprintf(T("Reparse Point Flags = 0x%"PRIx16"\n"), + inode->i_not_rpfixed); + tprintf(T("Reparse Point Unknown 2 = 0x%"PRIx32"\n"), + inode->i_rp_unknown_2); + } + tprintf(T("Reparse Point Unknown 1 = 0x%"PRIx32"\n"), + inode->i_rp_unknown_1); tprintf(T("Hard Link Group = 0x%"PRIx64"\n"), inode->i_ino); tprintf(T("Hard Link Group Size = %"PRIu32"\n"), inode->i_nlink); tprintf(T("Number of Alternate Data Streams = %hu\n"), inode->i_num_ads); @@ -628,8 +662,8 @@ print_dentry(struct wim_dentry *dentry, void *lookup_table) wimlib_printf(T("Filename = \"%"WS"\"\n"), dentry->file_name); if (dentry_has_short_name(dentry)) wimlib_printf(T("Short Name \"%"WS"\"\n"), dentry->short_name); - if (dentry->full_path) - tprintf(T("Full Path = \"%"TS"\"\n"), dentry->full_path); + if (dentry->_full_path) + tprintf(T("Full Path = \"%"TS"\"\n"), dentry->_full_path); lte = inode_stream_lte(dentry->d_inode, 0, lookup_table); if (lte) { @@ -638,7 +672,7 @@ print_dentry(struct wim_dentry *dentry, void *lookup_table) hash = inode_stream_hash(inode, 0); if (hash) { tprintf(T("Hash = 0x")); - print_hash(hash); + print_hash(hash, stdout); tputchar(T('\n')); tputchar(T('\n')); } @@ -652,7 +686,7 @@ print_dentry(struct wim_dentry *dentry, void *lookup_table) hash = inode_stream_hash(inode, i + 1); if (hash) { tprintf(T("Hash = 0x")); - print_hash(hash); + print_hash(hash, stdout); tputchar(T('\n')); } print_lookup_table_entry(inode_stream_lte(inode, i + 1, lookup_table), @@ -666,18 +700,18 @@ static void dentry_common_init(struct wim_dentry *dentry) { memset(dentry, 0, sizeof(struct wim_dentry)); - dentry->refcnt = 1; } -static struct wim_inode * +struct wim_inode * new_timeless_inode() { struct wim_inode *inode = CALLOC(1, sizeof(struct wim_inode)); if (inode) { inode->i_security_id = -1; inode->i_nlink = 1; - #ifdef WITH_FUSE inode->i_next_stream_id = 1; + inode->i_not_rpfixed = 1; + #ifdef WITH_FUSE if (pthread_mutex_init(&inode->i_mutex, NULL) != 0) { ERROR_WITH_ERRNO("Error initializing mutex"); FREE(inode); @@ -843,20 +877,12 @@ free_dentry(struct wim_dentry *dentry) { FREE(dentry->file_name); FREE(dentry->short_name); - FREE(dentry->full_path); + FREE(dentry->_full_path); if (dentry->d_inode) put_inode(dentry->d_inode); FREE(dentry); } -void -put_dentry(struct wim_dentry *dentry) -{ - wimlib_assert(dentry->refcnt != 0); - if (--dentry->refcnt == 0) - free_dentry(dentry); -} - /* This function is passed as an argument to for_dentry_in_tree_depth() in order * to free a directory tree. */ static int @@ -875,8 +901,7 @@ do_free_dentry(struct wim_dentry *dentry, void *__lookup_table) lte_decrement_refcnt(lte, lookup_table); } } - - put_dentry(dentry); + free_dentry(dentry); return 0; } @@ -896,20 +921,13 @@ free_dentry_tree(struct wim_dentry *root, struct wim_lookup_table *lookup_table) for_dentry_in_tree_depth(root, do_free_dentry, lookup_table); } -int -increment_dentry_refcnt(struct wim_dentry *dentry, void *ignore) -{ - dentry->refcnt++; - return 0; -} - /* * Links a dentry into the directory tree. * * @parent: The dentry that will be the parent of @dentry. * @dentry: The dentry to link. */ -bool +struct wim_dentry * dentry_add_child(struct wim_dentry * restrict parent, struct wim_dentry * restrict child) { @@ -930,12 +948,12 @@ dentry_add_child(struct wim_dentry * restrict parent, else if (result > 0) new = &((*new)->rb_right); else - return false; + return this; } child->parent = parent; rb_link_node(&child->rb_node, rb_parent, new); rb_insert_color(&child->rb_node, root); - return true; + return NULL; } /* Unlink a WIM dentry from the directory entry tree. */ @@ -1025,9 +1043,7 @@ do_inode_add_ads(struct wim_inode *inode, const void *stream_name, new_entry = &inode->i_ads_entries[num_ads - 1]; if (init_ads_entry(new_entry, stream_name, stream_name_nbytes, is_utf16le)) return NULL; -#ifdef WITH_FUSE new_entry->stream_id = inode->i_next_stream_id++; -#endif inode->i_num_ads = num_ads; return new_entry; } @@ -1158,7 +1174,7 @@ inode_get_unix_data(const struct wim_inode *inode, if (size != sizeof(struct wimlib_unix_data)) return BAD_UNIX_DATA; - ret = read_full_wim_resource(lte, unix_data, 0); + ret = read_full_resource_into_buf(lte, unix_data, true); if (ret) return ret; @@ -1201,6 +1217,30 @@ inode_set_unix_data(struct wim_inode *inode, uid_t uid, gid_t gid, mode_t mode, } #endif /* !__WIN32__ */ +static void +replace_forbidden_characters(utf16lechar *name) +{ + utf16lechar *p; + + for (p = name; *p; p++) { + #ifdef __WIN32__ + if (wcschr(L"<>:\"/\\|?*", (wchar_t)*p)) + #else + if (*p == '/') + #endif + { + if (name) { + WARNING("File, directory, or stream name \"%"WS"\"\n" + " contains forbidden characters; " + "replacing them with Unicode codepoint U+001A", + name); + name = NULL; + } + *p = 0x1a; + } + } +} + /* * Reads the alternate data stream entries of a WIM dentry. * @@ -1328,6 +1368,7 @@ read_ads_entries(const u8 *p, struct wim_inode *inode, u64 remaining_size) get_bytes(p, cur_entry->stream_name_nbytes, cur_entry->stream_name); cur_entry->stream_name[cur_entry->stream_name_nbytes / 2] = 0; + replace_forbidden_characters(cur_entry->stream_name); } /* 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 @@ -1445,19 +1486,16 @@ read_dentry(const u8 metadata_resource[], u64 metadata_resource_len, p = get_bytes(p, SHA1_HASH_SIZE, inode->i_hash); - /* - * I don't know what's going on here. It seems like M$ screwed up the + /* 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. - */ + * document it. */ if (inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT) { - /* ??? */ - p += 4; + p = get_u32(p, &inode->i_rp_unknown_1); p = get_u32(p, &inode->i_reparse_tag); - p += 4; + p = get_u16(p, &inode->i_rp_unknown_2); + p = get_u16(p, &inode->i_not_rpfixed); } else { - p = get_u32(p, &inode->i_reparse_tag); + p = get_u32(p, &inode->i_rp_unknown_1); p = get_u64(p, &inode->i_ino); } @@ -1504,6 +1542,7 @@ read_dentry(const u8 metadata_resource[], u64 metadata_resource_len, WARNING("File name in WIM dentry \"%"WS"\" is not " "null-terminated!", file_name); } + replace_forbidden_characters(file_name); } /* Align the calculated size */ @@ -1554,6 +1593,7 @@ read_dentry(const u8 metadata_resource[], u64 metadata_resource_len, WARNING("Short name in WIM dentry \"%"WS"\" is not " "null-terminated!", file_name); } + replace_forbidden_characters(short_name); } /* @@ -1724,9 +1764,10 @@ write_dentry(const struct wim_dentry *dentry, u8 *p) hash = inode_stream_hash(inode, 0); p = put_bytes(p, SHA1_HASH_SIZE, hash); if (inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT) { - p = put_zeroes(p, 4); + p = put_u32(p, 0); p = put_u32(p, inode->i_reparse_tag); - p = put_zeroes(p, 4); + p = put_u16(p, 0); + p = put_u16(p, inode->i_not_rpfixed); } else { u64 link_group_id; p = put_u32(p, 0);