+/*
+ * Copyright (C) 2012 Eric Biggers
+ *
+ * This file is part of wimlib, a library for working with WIM files.
+ *
+ * wimlib is free software; you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 2.1 of the License, or (at your option)
+ * any later version.
+ *
+ * wimlib is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with wimlib; if not, see http://www.gnu.org/licenses/.
+ */
+
#include "dentry.h"
#include "io.h"
#include "lookup_table.h"
#include "sha1.h"
+#include <errno.h>
/*
* Find the symlink target of a symbolic link or junction point in the WIM.
/* 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);
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)
{
- struct resource_entry *res_entry;
- struct lookup_table_entry *lte;
- u16 i = 0;
- const u8 *hash = dentry->hash;
+ const struct resource_entry *res_entry;
+ const struct lookup_table_entry *lte;
wimlib_assert(dentry_is_symlink(dentry));
- while (1) {
- if ((lte = __lookup_resource(w->lookup_table, hash)))
- break;
- if (i == dentry->num_ads)
- return -EIO;
- hash = dentry->ads_entries[i].hash;
- i++;
- }
+ lte = dentry_first_lte(dentry, w->lookup_table);
+ if (!lte)
+ return -EIO;
+
res_entry = <e->resource_entry;
if (res_entry->original_size > 10000)
return -EIO;
if (lte->is_symlink && lte->symlink_buf) {
res_buf = lte->symlink_buf;
} else {
- res_buf = __res_buf;
if (read_full_resource(w->fp, res_entry->size,
res_entry->original_size,
res_entry->offset,
}
static int dentry_set_symlink_buf(struct dentry *dentry,
- const u8 symlink_buf_hash[])
+ struct lookup_table_entry *lte)
{
struct ads_entry *ads_entries;
ads_entries = CALLOC(2, sizeof(struct ads_entry));
if (!ads_entries)
return WIMLIB_ERR_NOMEM;
- memcpy(ads_entries[1].hash, symlink_buf_hash, WIM_HASH_SIZE);
- dentry_free_ads_entries(dentry);
+
+ wimlib_assert(dentry->num_ads == 0);
+ wimlib_assert(dentry->ads_entries == NULL);
+
+ ads_entries[0].lte = lte;
+
+ /*dentry_free_ads_entries(dentry);*/
dentry->num_ads = 2;
dentry->ads_entries = ads_entries;
return 0;
}
+/*
+ * Sets @dentry to be a symbolic link pointing to @target.
+ *
+ * A lookup table entry for the symbolic link data buffer is created and
+ * inserted into @lookup_table, unless there is an existing lookup table entry
+ * for the exact same data, in which its reference count is incremented.
+ *
+ * The lookup table entry is returned in @lte_ret.
+ *
+ * On failure @dentry and @lookup_table are not modified.
+ */
int dentry_set_symlink(struct dentry *dentry, const char *target,
- struct lookup_table *lookup_table)
+ struct lookup_table *lookup_table,
+ struct lookup_table_entry **lte_ret)
{
int ret;
size_t symlink_buf_len;
struct lookup_table_entry *lte = NULL, *existing_lte;
- u8 symlink_buf_hash[WIM_HASH_SIZE];
+ u8 symlink_buf_hash[SHA1_HASH_SIZE];
void *symlink_buf;
symlink_buf = make_symlink_reparse_data_buf(target, &symlink_buf_len);
return WIMLIB_ERR_NOMEM;
DEBUG("Made symlink reparse data buf (len = %zu, name len = %zu)",
- symlink_buf_len, ret);
+ symlink_buf_len, symlink_buf_len);
sha1_buffer(symlink_buf, symlink_buf_len, symlink_buf_hash);
existing_lte = __lookup_resource(lookup_table, symlink_buf_hash);
if (existing_lte) {
- existing_lte->refcnt++;
+ lte = existing_lte;
} else {
DEBUG("Creating new lookup table entry for symlink buf");
lte = new_lookup_table_entry();
lte->symlink_buf = symlink_buf;
lte->resource_entry.original_size = symlink_buf_len;
lte->resource_entry.size = symlink_buf_len;
- memcpy(lte->hash, symlink_buf_hash, WIM_HASH_SIZE);
+ copy_hash(lte->hash, symlink_buf_hash);
}
- ret = dentry_set_symlink_buf(dentry, symlink_buf_hash);
+ ret = dentry_set_symlink_buf(dentry, lte);
if (ret != 0)
goto out_free_lte;
+ dentry->resolved = true;
+
DEBUG("Loaded symlink buf");
- if (!existing_lte)
+ if (existing_lte)
+ lte->refcnt++;
+ else
lookup_table_insert(lookup_table, lte);
+ if (lte_ret)
+ *lte_ret = lte;
return 0;
out_free_lte:
- FREE(lte);
+ if (lte != existing_lte)
+ FREE(lte);
out_free_symlink_buf:
FREE(symlink_buf);
return ret;
git://wimlib.net / wimlib / blobdiff