* 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)
+ * terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 3 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
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more
* details.
*
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
* along with wimlib; if not, see http://www.gnu.org/licenses/.
*/
}
if (header_size + substitute_name_offset + substitute_name_len > resource_len)
return -EIO;
- link_target = utf16_to_utf8(p + substitute_name_offset,
+ link_target = utf16_to_utf8((const char *)p + substitute_name_offset,
substitute_name_len,
&link_target_len);
for (size_t i = 0; i < utf16_len / 2; i++)
if (((u16*)name_utf16)[i] == to_le16('/'))
((u16*)name_utf16)[i] = to_le16('\\');
- size_t len = 12 + utf16_len * 2;
+ size_t len = 12 + utf16_len * 2 + 4;
void *buf = MALLOC(len);
if (!buf)
goto out;
/* XXX Fix absolute paths */
u8 *p = buf;
- p = put_u16(p, utf16_len); /* Substitute name offset */
+ 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, name_utf16);
- p = put_bytes(p, utf16_len, name_utf16);
+ 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:
*
* 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)
+ssize_t inode_readlink(const struct inode *inode, char *buf, size_t buf_len,
+ const WIMStruct *w)
{
const struct lookup_table_entry *lte;
int ret;
- wimlib_assert(dentry_is_symlink(dentry));
+ wimlib_assert(inode_is_symlink(inode));
- lte = dentry_unnamed_lte(dentry, w->lookup_table);
+ lte = inode_unnamed_lte(inode, w->lookup_table);
if (!lte)
return -EIO;
if (wim_resource_size(lte) > 10000)
return -EIO;
- char res_buf[wim_resource_size(lte)];
+ u8 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);
+ buf_len, inode->reparse_tag);
}
-static int dentry_set_symlink_buf(struct dentry *dentry,
- struct lookup_table_entry *lte)
+static int inode_set_symlink_buf(struct inode *inode,
+ struct lookup_table_entry *lte)
{
+#if 0
struct ads_entry *ads_entries;
- ads_entries = CALLOC(2, sizeof(struct ads_entry));
+ ads_entries = MALLOC(2, sizeof(struct ads_entry));
if (!ads_entries)
return WIMLIB_ERR_NOMEM;
+ ads_entry_init(&ads_entries[0]);
+ ads_entry_init(&ads_entries[1]);
wimlib_assert(dentry->num_ads == 0);
wimlib_assert(dentry->ads_entries == NULL);
/*dentry_free_ads_entries(dentry);*/
dentry->num_ads = 2;
dentry->ads_entries = ads_entries;
+#endif
+ wimlib_assert(inode->resolved);
+ inode->lte = lte;
return 0;
}
*
* 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_entry **lte_ret)
+int inode_set_symlink(struct inode *inode, const char *target,
+ struct lookup_table *lookup_table,
+ struct lookup_table_entry **lte_ret)
{
int ret;
lte->attached_buffer = symlink_buf;
lte->resource_entry.original_size = symlink_buf_len;
lte->resource_entry.size = symlink_buf_len;
- lte->resource_entry.flags = 0;
copy_hash(lte->hash, symlink_buf_hash);
}
- ret = dentry_set_symlink_buf(dentry, lte);
+ ret = inode_set_symlink_buf(inode, lte);
if (ret != 0)
goto out_free_lte;
- dentry->resolved = true;
+ inode->resolved = true;
DEBUG("Loaded symlink buf");