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

diff --git a/src/symlink.c b/src/symlink.c
index bed8fc3e..b90ebe5e 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>
@@ -124,34 +124,31 @@ out:
 	return ret;
 }
 
-void *make_symlink_reparse_data_buf(const char *symlink_target, size_t *len_ret)
+static void *make_symlink_reparse_data_buf(const char *symlink_target,
+					   size_t *len_ret)
 {
 	size_t utf8_len = strlen(symlink_target);
 	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);*/
+
 	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 +160,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 +175,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,
@@ -248,9 +245,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;