X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fsymlink.c;h=5c8417c70fda6f3720dfba23af50ad10fe67a0d7;hp=3e89a88eead6cfed31980c86f9f4fd51a2e5ca4e;hb=14baa6ae892debbaa18dba8119931580efd0e517;hpb=a2c56fd332b6c37026b24c8a216e0ff0bf140d80 diff --git a/src/symlink.c b/src/symlink.c index 3e89a88e..5c8417c7 100644 --- a/src/symlink.c +++ b/src/symlink.c @@ -5,7 +5,7 @@ */ /* - * Copyright (C) 2012 Eric Biggers + * Copyright (C) 2012, 2013 Eric Biggers * * This file is part of wimlib, a library for working with WIM files. * @@ -24,7 +24,7 @@ */ #include "dentry.h" -#include "io.h" +#include "buffer_io.h" #include "lookup_table.h" #include "sha1.h" #include @@ -32,14 +32,18 @@ /* * Find the symlink target of a symbolic link or junction point in the WIM. * - * See http://msdn.microsoft.com/en-us/library/cc232006(v=prot.10).aspx - * Except the first 8 bytes aren't included in the resource (presumably because - * we already know the reparse tag from the dentry, and we already know the - * reparse tag len from the lookup table entry resource length). + * See http://msdn.microsoft.com/en-us/library/cc232006(v=prot.10).aspx for a + * description of the format of the so-called "reparse point data buffers". + * + * But, in the WIM format, the first 8 bytes of the reparse point data buffer + * are omitted, presumably because we already know the reparse tag from the + * dentry, and we already know the reparse tag length from the lookup table + * entry resource length. */ -static ssize_t get_symlink_name(const u8 *resource, size_t resource_len, - char *buf, size_t buf_len, - u32 reparse_tag) +static ssize_t +get_symlink_name(const void *resource, size_t resource_len, + void *buf, size_t buf_len, + u32 reparse_tag) { const u8 *p = resource; u16 substitute_name_offset; @@ -65,12 +69,6 @@ static ssize_t get_symlink_name(const u8 *resource, size_t resource_len, wimlib_assert(reparse_tag == WIM_IO_REPARSE_TAG_SYMLINK || reparse_tag == WIM_IO_REPARSE_TAG_MOUNT_POINT); - /* I think that some junction points incorrectly get marked as symbolic - * links. So, parse the link buffer as a symlink if the flags seem - * plausible. */ - if (flags <= 1) - reparse_tag = WIM_IO_REPARSE_TAG_SYMLINK; - if (reparse_tag == WIM_IO_REPARSE_TAG_MOUNT_POINT) { header_size = 8; } else { @@ -80,9 +78,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; @@ -124,48 +129,55 @@ 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 mbchar *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] == cpu_to_le16('/')) ((u16*)name_utf16)[i] = cpu_to_le16('\\'); - size_t len = 12 + utf16_len * 2 + 4; + 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. +/* Get the symlink target from a WIM inode. * - * The dentry may be either "real" symlink or a junction point. + * The inode may be either a "real" symlink (reparse tag + * WIM_IO_REPARSE_TAG_SYMLINK), or it may be a junction point (reparse tag + * WIM_IO_REPARSE_TAG_MOUNT_POINT). */ -ssize_t inode_readlink(const struct inode *inode, char *buf, size_t buf_len, - const WIMStruct *w) +ssize_t +inode_readlink(const struct wim_inode *inode, mbchar *buf, size_t buf_len, + const WIMStruct *w, int read_resource_flags) { - const struct lookup_table_entry *lte; + const struct wim_lookup_table_entry *lte; int ret; wimlib_assert(inode_is_symlink(inode)); @@ -178,11 +190,11 @@ 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); + buf_len, inode->i_reparse_tag); } /* @@ -196,20 +208,23 @@ ssize_t inode_readlink(const struct inode *inode, char *buf, size_t buf_len, * * On failure @dentry and @lookup_table are not modified. */ -int inode_set_symlink(struct inode *inode, const char *target, - struct lookup_table *lookup_table, - struct lookup_table_entry **lte_ret) +int +inode_set_symlink(struct wim_inode *inode, + const mbchar *target, + struct wim_lookup_table *lookup_table, + struct wim_lookup_table_entry **lte_ret) { int ret; size_t symlink_buf_len; - struct lookup_table_entry *lte = NULL, *existing_lte; + struct wim_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); @@ -236,8 +251,8 @@ int inode_set_symlink(struct inode *inode, const char *target, copy_hash(lte->hash, symlink_buf_hash); } - inode->lte = lte; - inode->resolved = true; + inode->i_lte = lte; + inode->i_resolved = 1; DEBUG("Loaded symlink buf");