X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fsymlink.c;h=6ef0dab16490787a6591f645399c52363b95e53a;hb=5bae0e225874077fe8aa06a5649aa7bc45d9ef8f;hp=3e89a88eead6cfed31980c86f9f4fd51a2e5ca4e;hpb=a2c56fd332b6c37026b24c8a216e0ff0bf140d80;p=wimlib diff --git a/src/symlink.c b/src/symlink.c index 3e89a88e..6ef0dab1 100644 --- a/src/symlink.c +++ b/src/symlink.c @@ -131,27 +131,23 @@ void *make_symlink_reparse_data_buf(const char *symlink_target, size_t *len_ret) char *name_utf16 = utf8_to_utf16(symlink_target, utf8_len, &utf16_len); if (!name_utf16) return NULL; - /*DEBUG("utf16_len = %zu", utf16_len);*/ + 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 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_u32(p, 1); /* flags: 0 iff *full* target, including drive letter??? */ 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: FREE(name_utf16); @@ -163,7 +159,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,7 +174,7 @@ 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,