X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fsymlink.c;h=ccdd6f591bdea7aa04cb3887e8d0a6b8251d5a73;hp=bed8fc3e06c7774934e54c1c05a42faebd6ed74e;hb=b3d65ccab09cc7f33380cb5bf43709349d079087;hpb=d0e7f039e4ab206b9fd973c983e3fb841fcd2bf2

diff --git a/src/symlink.c b/src/symlink.c
index bed8fc3e..ccdd6f59 100644
--- a/src/symlink.c
+++ b/src/symlink.c
@@ -24,7 +24,7 @@
  */
 
 #include "dentry.h"
-#include "io.h"
+#include "buffer_io.h"
 #include "lookup_table.h"
 #include "sha1.h"
 #include <errno.h>
@@ -80,9 +80,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,38 +131,41 @@ 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 char *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.
@@ -163,7 +173,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 +188,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,
@@ -207,9 +217,10 @@ int inode_set_symlink(struct inode *inode, const char *target,
 	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);
@@ -248,9 +259,6 @@ int inode_set_symlink(struct inode *inode, const char *target,
 	if (lte_ret)
 		*lte_ret = lte;
 	return 0;
-out_free_lte:
-	if (lte != existing_lte)
-		FREE(lte);
 out_free_symlink_buf:
 	FREE(symlink_buf);
 	return ret;