X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fsymlink.c;h=bed8fc3e06c7774934e54c1c05a42faebd6ed74e;hp=cf2f863b84671a68a7b685fed71dddb972e03786;hb=d0e7f039e4ab206b9fd973c983e3fb841fcd2bf2;hpb=67f45cecd793345416d5d85fbe37ec54b1bb6ef8 diff --git a/src/symlink.c b/src/symlink.c index cf2f863b..bed8fc3e 100644 --- a/src/symlink.c +++ b/src/symlink.c @@ -105,7 +105,7 @@ static ssize_t get_symlink_name(const u8 *resource, size_t resource_len, translated_target += 4; link_target_len -= 4; /* There's a drive letter, so just leave the backslashes since - * it won't go anyhwere on UNIX anyway... + * it won't go anyhwere on UNIX anyway... * * XXX * NTFS-3g tries to re-map these links to actually point to @@ -133,8 +133,8 @@ void *make_symlink_reparse_data_buf(const char *symlink_target, size_t *len_ret) return NULL; /*DEBUG("utf16_len = %zu", utf16_len);*/ for (size_t i = 0; i < utf16_len / 2; i++) - if (((u16*)name_utf16)[i] == to_le16('/')) - ((u16*)name_utf16)[i] = to_le16('\\'); + if (((u16*)name_utf16)[i] == cpu_to_le16('/')) + ((u16*)name_utf16)[i] = cpu_to_le16('\\'); size_t len = 12 + utf16_len * 2 + 4; void *buf = MALLOC(len); if (!buf) @@ -185,34 +185,8 @@ ssize_t inode_readlink(const struct inode *inode, char *buf, size_t buf_len, buf_len, inode->reparse_tag); } -static int inode_set_symlink_buf(struct inode *inode, - struct lookup_table_entry *lte) -{ -#if 0 - struct ads_entry *ads_entries; - - ads_entries = MALLOC(2, sizeof(struct ads_entry)); - if (!ads_entries) - return WIMLIB_ERR_NOMEM; - ads_entry_init(&ads_entries[0]); - ads_entry_init(&ads_entries[1]); - - wimlib_assert(dentry->num_ads == 0); - wimlib_assert(dentry->ads_entries == NULL); - - ads_entries[0].lte = lte; - - /*dentry_free_ads_entries(dentry);*/ - dentry->num_ads = 2; - dentry->ads_entries = ads_entries; -#endif - wimlib_assert(inode->resolved); - inode->lte = lte; - return 0; -} - -/* - * Sets @dentry to be a symbolic link pointing to @target. +/* + * Sets @inode to be a symbolic link pointing to @target. * * A lookup table entry for the symbolic link data buffer is created and * inserted into @lookup_table, unless there is an existing lookup table entry @@ -232,14 +206,14 @@ int inode_set_symlink(struct inode *inode, const char *target, struct lookup_table_entry *lte = NULL, *existing_lte; u8 symlink_buf_hash[SHA1_HASH_SIZE]; void *symlink_buf; - + symlink_buf = make_symlink_reparse_data_buf(target, &symlink_buf_len); if (!symlink_buf) return WIMLIB_ERR_NOMEM; DEBUG("Made symlink reparse data buf (len = %zu, name len = %zu)", symlink_buf_len, symlink_buf_len); - + sha1_buffer(symlink_buf, symlink_buf_len, symlink_buf_hash); existing_lte = __lookup_resource(lookup_table, symlink_buf_hash); @@ -259,15 +233,10 @@ int inode_set_symlink(struct inode *inode, const char *target, lte->attached_buffer = symlink_buf; lte->resource_entry.original_size = symlink_buf_len; lte->resource_entry.size = symlink_buf_len; - lte->resource_entry.flags = 0; copy_hash(lte->hash, symlink_buf_hash); } - ret = inode_set_symlink_buf(inode, lte); - - if (ret != 0) - goto out_free_lte; - + inode->lte = lte; inode->resolved = true; DEBUG("Loaded symlink buf");