X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fsymlink.c;h=ca2e422fca2176e49f6f6b1054bc0667736bcce0;hb=8ca5d211433e3edef4366f984e2bb13a5a425c6c;hp=03f78370bb7442bb56f95c20cf79813eb25996a7;hpb=b1c4e6a269ae4c969060e33685db12f76a204a58;p=wimlib

diff --git a/src/symlink.c b/src/symlink.c
index 03f78370..ca2e422f 100644
--- a/src/symlink.c
+++ b/src/symlink.c
@@ -1,3 +1,9 @@
+/*
+ * symlink.c
+ *
+ * Code to read and set symbolic links in WIM files.
+ */
+
 /*
  * Copyright (C) 2012 Eric Biggers
  *
@@ -99,7 +105,12 @@ static ssize_t get_symlink_name(const u8 *resource, size_t resource_len,
 		translated_target += 4;
 		link_target_len -= 4;
 		/* There's a drive letter, so just leave the backslashes since
-		 * it won't go anyhwere on UNIX anyway... */
+		 * it won't go anyhwere on UNIX anyway... 
+		 *
+		 * XXX
+		 * NTFS-3g tries to re-map these links to actually point to
+		 * something, so maybe we could do something like that here
+		 * XXX*/
 	} else {
 		for (size_t i = 0; i < link_target_len; i++)
 			if (translated_target[i] == '\\')
@@ -131,9 +142,9 @@ void *make_symlink_reparse_data_buf(const char *symlink_target, size_t *len_ret)
 	/* XXX Fix absolute paths */
 
 	u8 *p = buf;
-	p = put_u16(p, 0); /* 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, utf16_len); /* Print name offset */
+	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, name_utf16);
@@ -145,13 +156,15 @@ out:
 	return buf;
 }
 
-/* Get the symlink target from a dentry that's already checked to be either a
- * "real" symlink or a junction point. */
+/* Get the symlink target from a dentry.
+ *
+ * The dentry may be either "real" symlink or a junction point.
+ */
 ssize_t dentry_readlink(const struct dentry *dentry, char *buf, size_t buf_len,
 			const WIMStruct *w)
 {
-	const struct resource_entry *res_entry;
 	const struct lookup_table_entry *lte;
+	int ret;
 
 	wimlib_assert(dentry_is_symlink(dentry));
 
@@ -159,24 +172,14 @@ ssize_t dentry_readlink(const struct dentry *dentry, char *buf, size_t buf_len,
 	if (!lte)
 		return -EIO;
 
-	res_entry = &lte->resource_entry;
-	if (res_entry->original_size > 10000)
+	if (wim_resource_size(lte) > 10000)
 		return -EIO;
 
-	char __res_buf[res_entry->original_size];
-	const char *res_buf;
-	if (lte->is_symlink && lte->symlink_buf) {
-		res_buf = lte->symlink_buf;
-	} else {
-		if (read_full_resource(w->fp, res_entry->size, 
-				       res_entry->original_size,
-				       res_entry->offset,
-				       wim_resource_compression_type(w, res_entry),
-				       __res_buf) != 0)
-			return -EIO;
-		res_buf = __res_buf;
-	}
-	return get_symlink_name(res_buf, res_entry->original_size, buf,
+	char res_buf[wim_resource_size(lte)];
+	ret = read_full_wim_resource(lte, res_buf);
+	if (ret != 0)
+		return -EIO;
+	return get_symlink_name(res_buf, wim_resource_size(lte), buf,
 				buf_len, dentry->reparse_tag);
 }
 
@@ -192,7 +195,7 @@ static int dentry_set_symlink_buf(struct dentry *dentry,
 	wimlib_assert(dentry->num_ads == 0);
 	wimlib_assert(dentry->ads_entries == NULL);
 
-	ads_entries[1].lte = lte;
+	ads_entries[0].lte = lte;
 
 	/*dentry_free_ads_entries(dentry);*/
 	dentry->num_ads = 2;
@@ -235,6 +238,8 @@ int dentry_set_symlink(struct dentry *dentry, const char *target,
 
 	if (existing_lte) {
 		lte = existing_lte;
+		FREE(symlink_buf);
+		symlink_buf = NULL;
 	} else {
 		DEBUG("Creating new lookup table entry for symlink buf");
 		lte = new_lookup_table_entry();
@@ -242,10 +247,11 @@ int dentry_set_symlink(struct dentry *dentry, const char *target,
 			ret = WIMLIB_ERR_NOMEM;
 			goto out_free_symlink_buf;
 		}
-		lte->is_symlink = true;
-		lte->symlink_buf = symlink_buf;
+		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;
+		lte->resource_entry.size          = symlink_buf_len;
+		lte->resource_entry.flags         = 0;
 		copy_hash(lte->hash, symlink_buf_hash);
 	}