* 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/.
*/
case RESOURCE_IN_STAGING_FILE:
case RESOURCE_IN_ATTACHED_BUFFER:
case RESOURCE_IN_FILE_ON_DISK:
- wimlib_assert(<e->file_on_disk ==
- <e->staging_file_name ==
- <e->attached_buffer);
+ wimlib_assert(((void*)<e->file_on_disk ==
+ (void*)<e->staging_file_name)
+ && ((void*)<e->file_on_disk ==
+ (void*)<e->attached_buffer));
FREE(lte->file_on_disk);
break;
#ifdef WITH_NTFS_3G
void free_lookup_table(struct lookup_table *table)
{
- DEBUG("Freeing lookup table");
+ DEBUG2("Freeing lookup table");
if (table) {
if (table->array) {
for_lookup_table_entry(table,
u8 buf[WIM_LOOKUP_TABLE_ENTRY_DISK_SIZE];
int ret;
struct lookup_table *table;
+ struct lookup_table_entry *cur_entry = NULL, *duplicate_entry;
DEBUG("Reading lookup table: offset %"PRIu64", size %"PRIu64"",
w->hdr.lookup_table_res_entry.offset,
while (num_entries--) {
const u8 *p;
- struct lookup_table_entry *cur_entry, *duplicate_entry;
if (fread(buf, 1, sizeof(buf), w->fp) != sizeof(buf)) {
if (feof(w->fp)) {
p = get_u32(p, &cur_entry->refcnt);
p = get_bytes(p, SHA1_HASH_SIZE, cur_entry->hash);
+ if (cur_entry->part_number != w->hdr.part_number) {
+ ERROR("A lookup table entry in part %hu of the WIM "
+ "points to part %hu",
+ w->hdr.part_number, cur_entry->part_number);
+ ret = WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY;
+ goto out_free_cur_entry;
+
+ }
+
if (is_zero_hash(cur_entry->hash)) {
ERROR("The WIM lookup table contains an entry with a "
"SHA1 message digest of all 0's");
ret = WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY;
- FREE(cur_entry);
- goto out;
+ goto out_free_cur_entry;
}
duplicate_entry = __lookup_resource(table, cur_entry->hash);
ERROR("The second entry is:");
print_lookup_table_entry(cur_entry);
ret = WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY;
- FREE(cur_entry);
- goto out;
+ goto out_free_cur_entry;
}
- lookup_table_insert(table, cur_entry);
if (!(cur_entry->resource_entry.flags & WIM_RESHDR_FLAG_COMPRESSED)
&& (cur_entry->resource_entry.size !=
ERROR("The lookup table entry for the resource is as follows:");
print_lookup_table_entry(cur_entry);
ret = WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY;
- goto out;
+ goto out_free_cur_entry;
}
+ lookup_table_insert(table, cur_entry);
+
}
DEBUG("Done reading lookup table.");
w->lookup_table = table;
return 0;
+out_free_cur_entry:
+ FREE(cur_entry);
out:
free_lookup_table(table);
return ret;
* Finds the dentry, lookup table entry, and stream index for a WIM file stream,
* given a path name.
*
- * This is only for pre-resolved dentries.
+ * This is only for pre-resolved inodes.
*/
int lookup_resource(WIMStruct *w, const char *path,
int lookup_flags,
struct lookup_table_entry *lte;
unsigned stream_idx;
const char *stream_name = NULL;
+ struct inode *inode;
char *p = NULL;
if (lookup_flags & LOOKUP_FLAG_ADS_OK) {
if (!dentry)
return -ENOENT;
- wimlib_assert(dentry->resolved);
+ inode = dentry->inode;
+
+ wimlib_assert(inode->resolved);
- lte = dentry->lte;
if (!(lookup_flags & LOOKUP_FLAG_DIRECTORY_OK)
- && dentry_is_directory(dentry))
+ && inode_is_directory(inode))
return -EISDIR;
+
+ lte = inode->lte;
stream_idx = 0;
if (stream_name) {
size_t stream_name_len = strlen(stream_name);
- for (u16 i = 0; i < dentry->num_ads; i++) {
- if (ads_entry_has_name(&dentry->ads_entries[i],
+ for (u16 i = 0; i < inode->num_ads; i++) {
+ if (ads_entry_has_name(inode->ads_entries[i],
stream_name,
stream_name_len))
{
stream_idx = i + 1;
- lte = dentry->ads_entries[i].lte;
+ lte = inode->ads_entries[i]->lte;
goto out;
}
}
return 0;
}
+static int inode_resolve_ltes(struct inode *inode, struct lookup_table *table)
+{
+ struct lookup_table_entry *lte;
+
+ /* Resolve the default file stream */
+ lte = __lookup_resource(table, inode->hash);
+ if (lte)
+ list_add(&inode->lte_group_list.list, <e->lte_group_list);
+ else
+ INIT_LIST_HEAD(&inode->lte_group_list.list);
+ inode->lte = lte;
+ inode->lte_group_list.type = STREAM_TYPE_NORMAL;
+ inode->resolved = true;
+
+ /* Resolve the alternate data streams */
+ for (u16 i = 0; i < inode->num_ads; i++) {
+ struct ads_entry *cur_entry = inode->ads_entries[i];
+
+ lte = __lookup_resource(table, cur_entry->hash);
+ if (lte)
+ list_add(&cur_entry->lte_group_list.list,
+ <e->lte_group_list);
+ else
+ INIT_LIST_HEAD(&cur_entry->lte_group_list.list);
+ cur_entry->lte = lte;
+ cur_entry->lte_group_list.type = STREAM_TYPE_ADS;
+ }
+ return 0;
+}
+
/* Resolve a dentry's lookup table entries
*
* This replaces the SHA1 hash fields (which are used to lookup an entry in the
* This function always succeeds; unresolved lookup table entries are given a
* NULL pointer.
*/
-int dentry_resolve_ltes(struct dentry *dentry, void *__table)
+int dentry_resolve_ltes(struct dentry *dentry, void *table)
{
- struct lookup_table *table = __table;
- struct lookup_table_entry *lte;
-
- if (dentry->resolved)
+ if (dentry->inode->resolved)
return 0;
-
- /* Resolve the default file stream */
- lte = __lookup_resource(table, dentry->hash);
- if (lte)
- list_add(&dentry->lte_group_list.list, <e->lte_group_list);
else
- INIT_LIST_HEAD(&dentry->lte_group_list.list);
- dentry->lte = lte;
- dentry->lte_group_list.type = STREAM_TYPE_NORMAL;
- dentry->resolved = true;
-
- /* Resolve the alternate data streams */
- if (dentry->ads_entries_status != ADS_ENTRIES_USER) {
- for (u16 i = 0; i < dentry->num_ads; i++) {
- struct ads_entry *cur_entry = &dentry->ads_entries[i];
-
- lte = __lookup_resource(table, cur_entry->hash);
- if (lte)
- list_add(&cur_entry->lte_group_list.list,
- <e->lte_group_list);
- else
- INIT_LIST_HEAD(&cur_entry->lte_group_list.list);
- cur_entry->lte = lte;
- cur_entry->lte_group_list.type = STREAM_TYPE_ADS;
- }
- }
- return 0;
+ return inode_resolve_ltes(dentry->inode, table);
}
-/* Return the lookup table entry for the unnamed data stream of a dentry, or
+
+
+
+/* Return the lookup table entry for the unnamed data stream of a inode, or
* NULL if there is none.
*
* You'd think this would be easier than it actually is, since the unnamed data
- * stream should be the one referenced from the dentry itself. Alas, if there
+ * stream should be the one referenced from the inode itself. Alas, if there
* are named data streams, Microsoft's "imagex.exe" program will put the unnamed
* data stream in one of the alternate data streams instead of inside the
- * dentry. So we need to check the alternate data streams too.
+ * inode. So we need to check the alternate data streams too.
*
- * Also, note that a dentry may appear to have than one unnamed stream, but if
+ * Also, note that a inode may appear to have than one unnamed stream, but if
* the SHA1 message digest is all 0's then the corresponding stream does not
- * really "count" (this is the case for the dentry's own file stream when the
+ * really "count" (this is the case for the inode's own file stream when the
* file stream that should be there is actually in one of the alternate stream
* entries.). This is despite the fact that we may need to extract such a
* missing entry as an empty file or empty named data stream.
*/
struct lookup_table_entry *
-dentry_unnamed_lte(const struct dentry *dentry,
+inode_unnamed_lte(const struct inode *inode,
const struct lookup_table *table)
{
- if (dentry->resolved)
- return dentry_unnamed_lte_resolved(dentry);
+ if (inode->resolved)
+ return inode_unnamed_lte_resolved(inode);
else
- return dentry_unnamed_lte_unresolved(dentry, table);
+ return inode_unnamed_lte_unresolved(inode, table);
}
git://wimlib.net / wimlib / blobdiff