Fixes, comments

[wimlib] / src / symlink.c

diff --git a/src/symlink.c b/src/symlink.c
index 5c8417c70fda6f3720dfba23af50ad10fe67a0d7..538b3e8548b1b5ec11fd3762349089a360d997f4 100644 (file)
--- a/src/symlink.c
+++ b/src/symlink.c
@@ -29,6 +29,10 @@
 #include "sha1.h"
 #include <errno.h>
 
+/* None of this file is ever needed in Win32 builds because the reparse point
+ * buffers are not parsed. */
+#if !defined(__WIN32__)
+
 /*
  * Find the symlink target of a symbolic link or junction point in the WIM.
  *
@@ -41,11 +45,10 @@
  * entry resource length.
  */
 static ssize_t
-get_symlink_name(const void *resource, size_t resource_len,
-                void *buf, size_t buf_len,
-                u32 reparse_tag)
+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;
@@ -79,18 +82,11 @@ get_symlink_name(const void *resource, size_t resource_len,
        if (header_size + substitute_name_offset + substitute_name_len > resource_len)
                return -EIO;
 
-       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;
+       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;
@@ -130,40 +126,40 @@ out:
 }
 
 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)
 {
-       size_t utf8_len = strlen(symlink_target);
-       char *name_utf16;
-       size_t utf16_len;
+       utf16lechar *name_utf16le;
+       size_t name_utf16le_nbytes;
        int ret;
 
-       ret = utf8_to_utf16(symlink_target, utf8_len,
-                           &name_utf16, &utf16_len);
+       ret = tstr_to_utf16le(symlink_target, strlen(symlink_target),
+                             &name_utf16le, &name_utf16le_nbytes);
        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;
+       for (size_t i = 0; i < name_utf16le_nbytes / 2; i++)
+               if (name_utf16le[i] == cpu_to_le16('/'))
+                       name_utf16le[i] = cpu_to_le16('\\');
+
+       size_t len = 12 + name_utf16le_nbytes * 2;
        void *buf = MALLOC(len);
        if (buf) {
-               u8 *p = buf;
-               p = put_u16(p, utf16_len); /* Substitute name offset */
-               p = put_u16(p, utf16_len); /* Substitute name length */
+               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 */
-               p = put_u16(p, utf16_len); /* Print name length */
+               p = put_u16(p, name_utf16le_nbytes); /* 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);
+               p = put_bytes(p, name_utf16le_nbytes, name_utf16le);
+               p = put_bytes(p, name_utf16le_nbytes, name_utf16le);
                *len_ret = len;
                *buf_ret = buf;
                ret = 0;
        } else {
                ret = WIMLIB_ERR_NOMEM;
        }
-       FREE(name_utf16);
+       FREE(name_utf16le);
        return ret;
 }
 
@@ -174,8 +170,8 @@ make_symlink_reparse_data_buf(const mbchar *symlink_target,
  * 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;
@@ -190,7 +186,7 @@ inode_readlink(const struct wim_inode *inode, mbchar *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,
@@ -210,7 +206,7 @@ inode_readlink(const struct wim_inode *inode, mbchar *buf, size_t buf_len,
  */
 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)
 
@@ -223,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)",
@@ -247,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);
        }
 
@@ -267,3 +262,5 @@ out_free_symlink_buf:
        FREE(symlink_buf);
        return ret;
 }
+
+#endif /* !defined(__WIN32__) */