Fixes, comments

[wimlib] / src / symlink.c

diff --git a/src/symlink.c b/src/symlink.c
index 1e0109fde59a7b91f7fb085ed0550fc3e22e68c5..538b3e8548b1b5ec11fd3762349089a360d997f4 100644 (file)
--- a/src/symlink.c
+++ b/src/symlink.c
@@ -48,7 +48,7 @@ static ssize_t
 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;
@@ -82,17 +82,12 @@ get_symlink_name(const void *resource, size_t resource_len, char *buf,
        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);
+       ret = utf16le_to_tstr((const utf16lechar*)(p + substitute_name_offset),
+                             substitute_name_len,
+                             &link_target, &link_target_len);
        if (ret)
                return -errno;
 
-       wimlib_assert(ret == 0);
-
-       if (!link_target)
-               return -EIO;
-
        if (link_target_len + 1 > buf_len) {
                ret = -ENAMETOOLONG;
                goto out;
@@ -150,7 +145,7 @@ make_symlink_reparse_data_buf(const char *symlink_target,
        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 */
@@ -176,7 +171,7 @@ make_symlink_reparse_data_buf(const char *symlink_target,
  */
 ssize_t
 inode_readlink(const struct wim_inode *inode, char *buf, size_t buf_len,
-              const WIMStruct *w, int read_resource_flags)
+              const WIMStruct *w, bool threadsafe)
 {
        const struct wim_lookup_table_entry *lte;
        int ret;
@@ -191,7 +186,7 @@ inode_readlink(const struct wim_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, 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,
@@ -224,7 +219,7 @@ inode_set_symlink(struct wim_inode *inode,
 
        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)",
@@ -248,7 +243,6 @@ inode_set_symlink(struct wim_inode *inode,
                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);
        }
 
@@ -269,4 +263,4 @@ out_free_symlink_buf:
        return ret;
 }
 
-#endif /* !defined(__WIN32__) && !defined(WITH_FUSE) */
+#endif /* !defined(__WIN32__) */