X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fdentry.c;h=3847fbb2a6fd429dd2eb925c343679f9dcc7a48e;hb=cecdece7933824c248a1b07021ce576f0f9d6892;hp=4ff86029e3e73967f2f752b83815bc13241dd7f8;hpb=3fa7b7a033ce803accfd6758029114323f6a6865;p=wimlib diff --git a/src/dentry.c b/src/dentry.c index 4ff86029..3847fbb2 100644 --- a/src/dentry.c +++ b/src/dentry.c @@ -27,19 +27,12 @@ * wimlib; if not, see http://www.gnu.org/licenses/. */ -#include -#include -#include -#include - +#include "buffer_io.h" #include "dentry.h" -#include "io.h" #include "lookup_table.h" -#include "sha1.h" #include "timestamp.h" #include "wimlib_internal.h" - /* Calculates the unaligned length, in bytes, of an on-disk WIM dentry that has * a file name and short name that take the specified numbers of bytes. This * excludes any alternate data stream entries that may follow the dentry. */ @@ -90,13 +83,12 @@ int get_names(char **name_utf16_ret, char **name_utf8_ret, size_t utf8_len; size_t utf16_len; char *name_utf16, *name_utf8; + int ret; utf8_len = strlen(name); - - name_utf16 = utf8_to_utf16(name, utf8_len, &utf16_len); - - if (!name_utf16) - return WIMLIB_ERR_NOMEM; + ret = utf8_to_utf16(name, utf8_len, &name_utf16, &utf16_len); + if (ret != 0) + return ret; name_utf8 = MALLOC(utf8_len + 1); if (!name_utf8) { @@ -122,11 +114,14 @@ static 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) + new_name); + if (ret == 0) { + if (dentry->short_name_len) { + FREE(dentry->short_name); + dentry->short_name_len = 0; + } dentry->length = dentry_correct_length(dentry); + } return ret; } @@ -175,52 +170,6 @@ static u64 dentry_total_length(const struct dentry *dentry) return __dentry_total_length(dentry, dentry->length); } -#ifdef WITH_FUSE -/* Transfers file attributes from a struct inode to a `stat' buffer. - * - * The lookup table entry tells us which stream in the inode we are statting. - * For a named data stream, everything returned is the same as the unnamed data - * stream except possibly the size and block count. */ -int inode_to_stbuf(const struct inode *inode, struct lookup_table_entry *lte, - struct stat *stbuf) -{ - if (inode_is_symlink(inode)) - stbuf->st_mode = S_IFLNK | 0777; - else if (inode_is_directory(inode)) - stbuf->st_mode = S_IFDIR | 0755; - else - stbuf->st_mode = S_IFREG | 0755; - - stbuf->st_ino = (ino_t)inode->ino; - stbuf->st_nlink = inode->link_count; - stbuf->st_uid = getuid(); - stbuf->st_gid = getgid(); - - if (lte) { - if (lte->resource_location == RESOURCE_IN_STAGING_FILE) { - wimlib_assert(lte->staging_file_name); - struct stat native_stat; - if (stat(lte->staging_file_name, &native_stat) != 0) { - DEBUG("Failed to stat `%s': %m", - lte->staging_file_name); - return -errno; - } - stbuf->st_size = native_stat.st_size; - } else { - stbuf->st_size = wim_resource_size(lte); - } - } else { - stbuf->st_size = 0; - } - - stbuf->st_atime = wim_timestamp_to_unix(inode->last_access_time); - stbuf->st_mtime = wim_timestamp_to_unix(inode->last_write_time); - stbuf->st_ctime = wim_timestamp_to_unix(inode->creation_time); - stbuf->st_blocks = (stbuf->st_size + 511) / 512; - return 0; -} -#endif - int for_dentry_in_rbtree(struct rb_node *root, int (*visitor)(struct dentry *, void *), void *arg) @@ -862,6 +811,9 @@ static struct inode *new_inode() * * Returns a pointer to the new dentry, or NULL if out of memory. */ +#ifndef WITH_FUSE +static +#endif struct dentry *new_dentry(const char *name) { struct dentry *dentry; @@ -879,7 +831,7 @@ struct dentry *new_dentry(const char *name) return dentry; err: FREE(dentry); - ERROR("Failed to allocate new dentry"); + ERROR_WITH_ERRNO("Failed to create new dentry with name \"%s\"", name); return NULL; } @@ -943,6 +895,8 @@ void free_inode(struct inode *inode) wimlib_assert(inode->num_opened_fds == 0); FREE(inode->fds); pthread_mutex_destroy(&inode->i_mutex); + if (inode->hlist.pprev) + hlist_safe_del(&inode->hlist); #endif FREE(inode->extracted_file); FREE(inode); @@ -1080,150 +1034,6 @@ void unlink_dentry(struct dentry *dentry) } #endif -static inline struct dentry *inode_first_dentry(struct inode *inode) -{ - wimlib_assert(inode->dentry_list.next != &inode->dentry_list); - return container_of(inode->dentry_list.next, struct dentry, - inode_dentry_list); -} - -static 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; - - /* The following is now done when required by - * wim_run_full_verifications(). */ - - #if 0 - if (lte && !w->full_verification_in_progress && - lte->real_refcnt > lte->refcnt) - { - #ifdef ENABLE_ERROR_MESSAGES - WARNING("The following lookup table entry " - "has a reference count of %u, but", - lte->refcnt); - WARNING("We found %u 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 many streams referenced by more - * dentries than the refcnt stated in the lookup - * table entry. 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 - } - #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) -{ - int ret; - - if (!dentry->d_inode->verified) { - ret = verify_inode(dentry->d_inode, wim); - if (ret != 0) - return ret; - } - - /* 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); - return WIMLIB_ERR_INVALID_DENTRY; - } - - /* 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); - return WIMLIB_ERR_INVALID_DENTRY; - } - } - -#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 - - return 0; -} - - #ifdef WITH_FUSE /* Returns the alternate data stream entry belonging to @inode that has the * stream name @stream_name. */ @@ -1446,15 +1256,14 @@ static int read_ads_entries(const u8 *p, struct inode *inode, } 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; + ret = utf16_to_utf8(cur_entry->stream_name, + cur_entry->stream_name_len, + &cur_entry->stream_name_utf8, + &utf8_len); + if (ret != 0) goto out_free_ads_entries; - } + cur_entry->stream_name_utf8_len = utf8_len; } /* 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 @@ -1629,15 +1438,10 @@ int read_dentry(const u8 metadata_resource[], u64 metadata_resource_len, 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); - - 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; + ret = utf16_to_utf8(file_name, file_name_len, &file_name_utf8, + &file_name_utf8_len); + if (ret != 0) 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); @@ -1977,4 +1781,3 @@ u8 *write_dentry_tree(const struct dentry *root, u8 *p) /* Recursively write the rest of the dentry tree. */ return write_dentry_tree_recursive(root, p); } -