X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fsymlink.c;h=ccdd6f591bdea7aa04cb3887e8d0a6b8251d5a73;hp=cf2f863b84671a68a7b685fed71dddb972e03786;hb=b3d65ccab09cc7f33380cb5bf43709349d079087;hpb=67f45cecd793345416d5d85fbe37ec54b1bb6ef8 diff --git a/src/symlink.c b/src/symlink.c index cf2f863b..ccdd6f59 100644 --- a/src/symlink.c +++ b/src/symlink.c @@ -24,7 +24,7 @@ */ #include "dentry.h" -#include "io.h" +#include "buffer_io.h" #include "lookup_table.h" #include "sha1.h" #include @@ -80,9 +80,16 @@ static ssize_t get_symlink_name(const u8 *resource, size_t resource_len, } if (header_size + substitute_name_offset + substitute_name_len > resource_len) return -EIO; - link_target = utf16_to_utf8((const char *)p + substitute_name_offset, - substitute_name_len, - &link_target_len); + + ret = utf16_to_utf8((const char *)p + substitute_name_offset, + substitute_name_len, + &link_target, &link_target_len); + if (ret == WIMLIB_ERR_INVALID_UTF16_STRING) + return -EILSEQ; + else if (ret == WIMLIB_ERR_NOMEM) + return -ENOMEM; + + wimlib_assert(ret == 0); if (!link_target) return -EIO; @@ -105,7 +112,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 @@ -124,38 +131,41 @@ out: return ret; } -void *make_symlink_reparse_data_buf(const char *symlink_target, size_t *len_ret) +static int make_symlink_reparse_data_buf(const char *symlink_target, + size_t *len_ret, void **buf_ret) { size_t utf8_len = strlen(symlink_target); + char *name_utf16; size_t utf16_len; - char *name_utf16 = utf8_to_utf16(symlink_target, utf8_len, &utf16_len); - if (!name_utf16) - return NULL; - /*DEBUG("utf16_len = %zu", utf16_len);*/ + int ret; + + ret = utf8_to_utf16(symlink_target, utf8_len, + &name_utf16, &utf16_len); + if (ret != 0) + return ret; + for (size_t i = 0; i < utf16_len / 2; i++) - if (((u16*)name_utf16)[i] == to_le16('/')) - ((u16*)name_utf16)[i] = to_le16('\\'); - size_t len = 12 + utf16_len * 2 + 4; + if (((u16*)name_utf16)[i] == cpu_to_le16('/')) + ((u16*)name_utf16)[i] = cpu_to_le16('\\'); + size_t len = 12 + utf16_len * 2; void *buf = MALLOC(len); - if (!buf) - goto out; - /* XXX Fix absolute paths */ - - u8 *p = buf; - p = put_u16(p, utf16_len + 2); /* Substitute name offset */ - p = put_u16(p, utf16_len); /* Substitute name length */ - p = put_u16(p, 0); /* Print name offset */ - p = put_u16(p, utf16_len); /* Print name length */ - p = put_u32(p, 1); - p = put_bytes(p, utf16_len, (const u8*)name_utf16); - p = put_u16(p, 0); - p = put_bytes(p, utf16_len, (const u8*)name_utf16); - p = put_u16(p, 0); - /*DEBUG("utf16_len = %zu, len = %zu", utf16_len, len);*/ - *len_ret = len; -out: + if (buf) { + u8 *p = buf; + p = put_u16(p, utf16_len); /* Substitute name offset */ + p = put_u16(p, utf16_len); /* Substitute name length */ + p = put_u16(p, 0); /* Print name offset */ + p = put_u16(p, utf16_len); /* Print name length */ + p = put_u32(p, 1); /* flags: 0 iff *full* target, including drive letter??? */ + p = put_bytes(p, utf16_len, (const u8*)name_utf16); + p = put_bytes(p, utf16_len, (const u8*)name_utf16); + *len_ret = len; + *buf_ret = buf; + ret = 0; + } else { + ret = WIMLIB_ERR_NOMEM; + } FREE(name_utf16); - return buf; + return ret; } /* Get the symlink target from a dentry. @@ -163,7 +173,7 @@ out: * The dentry may be either "real" symlink or a junction point. */ ssize_t inode_readlink(const struct inode *inode, char *buf, size_t buf_len, - const WIMStruct *w) + const WIMStruct *w, int read_resource_flags) { const struct lookup_table_entry *lte; int ret; @@ -178,41 +188,15 @@ ssize_t inode_readlink(const struct inode *inode, char *buf, size_t buf_len, return -EIO; u8 res_buf[wim_resource_size(lte)]; - ret = read_full_wim_resource(lte, res_buf); + ret = read_full_wim_resource(lte, res_buf, read_resource_flags); if (ret != 0) return -EIO; return get_symlink_name(res_buf, wim_resource_size(lte), buf, 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 +216,15 @@ 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; + + ret = make_symlink_reparse_data_buf(target, &symlink_buf_len, + &symlink_buf); + if (ret != 0) + return ret; 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 +244,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"); @@ -279,9 +259,6 @@ int inode_set_symlink(struct inode *inode, const char *target, if (lte_ret) *lte_ret = lte; return 0; -out_free_lte: - if (lte != existing_lte) - FREE(lte); out_free_symlink_buf: FREE(symlink_buf); return ret;