/* None of this file is ever needed in Win32 builds because the reparse point
* buffers are not parsed. */
-#if !defined(__WIN32__) || defined(WITH_FUSE)
+#if !defined(__WIN32__)
/*
* Find the symlink target of a symbolic link or junction point in the WIM.
* entry resource length.
*/
static ssize_t
-get_symlink_name(const void *resource, size_t resource_len, mbchar *buf,
+get_symlink_name(const void *resource, size_t resource_len, char *buf,
size_t buf_len, u32 reparse_tag)
{
- const u8 *p = resource;
+ const void *p = resource;
u16 substitute_name_offset;
u16 substitute_name_len;
u16 print_name_offset;
u16 print_name_len;
- mbchar *link_target;
+ char *link_target;
size_t link_target_len;
ssize_t ret;
unsigned header_size;
- mbchar *translated_target;
+ char *translated_target;
bool is_absolute;
u32 flags;
if (header_size + substitute_name_offset + substitute_name_len > resource_len)
return -EIO;
- ret = utf16le_to_mbs((const utf16lechar*)(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;
+ ret = utf16le_to_tstr((const utf16lechar*)(p + substitute_name_offset),
+ substitute_name_len,
+ &link_target, &link_target_len);
+ if (ret)
+ return -errno;
if (link_target_len + 1 > buf_len) {
ret = -ENAMETOOLONG;
}
static int
-make_symlink_reparse_data_buf(const mbchar *symlink_target,
+make_symlink_reparse_data_buf(const char *symlink_target,
size_t *len_ret, void **buf_ret)
{
utf16lechar *name_utf16le;
size_t name_utf16le_nbytes;
int ret;
- ret = mbs_to_utf16le(symlink_target, strlen(symlink_target),
- &name_utf16le, &name_utf16le_nbytes);
+ ret = tstr_to_utf16le(symlink_target, strlen(symlink_target),
+ &name_utf16le, &name_utf16le_nbytes);
if (ret != 0)
return ret;
size_t len = 12 + name_utf16le_nbytes * 2;
void *buf = MALLOC(len);
if (buf) {
- u8 *p = buf;
+ void *p = buf;
p = put_u16(p, name_utf16le_nbytes); /* Substitute name offset */
p = put_u16(p, name_utf16le_nbytes); /* Substitute name length */
p = put_u16(p, 0); /* Print name offset */
* WIM_IO_REPARSE_TAG_MOUNT_POINT).
*/
ssize_t
-inode_readlink(const struct wim_inode *inode, mbchar *buf, size_t buf_len,
- const WIMStruct *w, int read_resource_flags)
+inode_readlink(const struct wim_inode *inode, char *buf, size_t buf_len,
+ const WIMStruct *w, bool threadsafe)
{
const struct wim_lookup_table_entry *lte;
int ret;
return -EIO;
u8 res_buf[wim_resource_size(lte)];
- ret = read_full_wim_resource(lte, res_buf, read_resource_flags);
+ ret = read_full_resource_into_buf(lte, res_buf, threadsafe);
if (ret != 0)
return -EIO;
return get_symlink_name(res_buf, wim_resource_size(lte), buf,
*/
int
inode_set_symlink(struct wim_inode *inode,
- const mbchar *target,
+ const char *target,
struct wim_lookup_table *lookup_table,
struct wim_lookup_table_entry **lte_ret)
ret = make_symlink_reparse_data_buf(target, &symlink_buf_len,
&symlink_buf);
- if (ret != 0)
+ if (ret)
return ret;
DEBUG("Made symlink reparse data buf (len = %zu, name len = %zu)",
lte->resource_location = RESOURCE_IN_ATTACHED_BUFFER;
lte->attached_buffer = symlink_buf;
lte->resource_entry.original_size = symlink_buf_len;
- lte->resource_entry.size = symlink_buf_len;
copy_hash(lte->hash, symlink_buf_hash);
}
return ret;
}
-#endif /* !defined(__WIN32__) && !defined(WITH_FUSE) */
+#endif /* !defined(__WIN32__) */