*/
/*
- *
- * Copyright (C) 2010 Carl Thijssen
* 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.
+ * 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
- * details.
+ * 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
- * along with wimlib; if not, see http://www.gnu.org/licenses/.
+ * You should have received a copy of the GNU General Public License along with
+ * wimlib; if not, see http://www.gnu.org/licenses/.
*/
#include <errno.h>
DEBUG("Add alternate data stream %s:%s",
dentry->file_name_utf8, stream_name);
- if (dentry->num_ads == 0xffff)
+ if (dentry->num_ads == 0xffff) {
+ ERROR("Too many alternate data streams in one dentry!");
return NULL;
+ }
num_ads = dentry->num_ads + 1;
ads_entries = REALLOC(dentry->ads_entries,
- num_ads * sizeof(struct ads_entry));
- if (!ads_entries)
+ num_ads * sizeof(dentry->ads_entries[0]));
+ if (!ads_entries) {
+ ERROR("Failed to allocate memory for new alternate data stream");
return NULL;
+ }
+ wimlib_assert(ads_entries == dentry->ads_entries ||
+ ads_entries < dentry->ads_entries ||
+ ads_entries > dentry->ads_entries + dentry->num_ads);
if (ads_entries != dentry->ads_entries) {
/* We moved the ADS entries. Adjust the stream lists. */
for (u16 i = 0; i < dentry->num_ads; i++) {
struct list_head *cur = &ads_entries[i].lte_group_list.list;
- cur->prev->next = cur;
- cur->next->prev = cur;
+ struct list_head *prev = cur->prev;
+ struct list_head *next = cur->next;
+ if ((u8*)prev >= (u8*)dentry->ads_entries
+ && (u8*)prev < (u8*)(dentry->ads_entries + dentry->num_ads)) {
+ /* Previous entry was located in the same ads_entries
+ * array! Adjust our own prev pointer. */
+ u16 idx = (struct ads_entry*)prev -
+ (struct ads_entry*)&dentry->ads_entries[0].lte_group_list.list;
+ cur->prev = &ads_entries[idx].lte_group_list.list;
+ } else {
+ /* Previous entry is located in a different ads_entries
+ * array. Adjust its next pointer. */
+ prev->next = cur;
+ }
+ next = cur->next;
+ if ((u8*)next >= (u8*)dentry->ads_entries
+ && (u8*)next < (u8*)(dentry->ads_entries + dentry->num_ads)) {
+ /* Next entry was located in the same ads_entries array!
+ * Adjust our own next pointer. */
+ u16 idx = (struct ads_entry*)next -
+ (struct ads_entry*)&dentry->ads_entries[0].lte_group_list.list;
+ cur->next = &ads_entries[idx].lte_group_list.list;
+ } else {
+ /* Next entry is located in a different ads_entries
+ * array. Adjust its prev pointer. */
+ next->prev = cur;
+ }
}
}
#endif
/* Translate the timestamps into something readable */
- time_t creat_time = wim_timestamp_to_unix(dentry->creation_time);
- time_t access_time = wim_timestamp_to_unix(dentry->last_access_time);
- time_t mod_time = wim_timestamp_to_unix(dentry->last_write_time);
-
time = wim_timestamp_to_unix(dentry->creation_time);
p = asctime(gmtime(&time));
*(strrchr(p, '\n')) = '\0';
dentry->prev = dentry;
dentry->parent = dentry;
INIT_LIST_HEAD(&dentry->link_group_list);
+ INIT_LIST_HEAD(&dentry->lte_group_list.list);
return dentry;
err:
FREE(dentry);
FREE(dentry->file_name_utf8);
FREE(dentry->short_name);
FREE(dentry->full_path_utf8);
- FREE(dentry->extracted_file);
+ if (dentry->extracted_file != dentry->full_path_utf8)
+ FREE(dentry->extracted_file);
}
/* Frees a WIM dentry. */
}
dentry->ads_entries_status = ADS_ENTRIES_USER;
}
- struct list_head *next;
list_del(&dentry->link_group_list);
free_dentry(dentry);
}
ret = get_names(&dentry->file_name, &dentry->file_name_utf8,
&dentry->file_name_len, &dentry->file_name_utf8_len,
new_name);
+ FREE(dentry->short_name);
+ dentry->short_name_len = 0;
if (ret == 0)
dentry->length = dentry_correct_length(dentry);
return ret;
u64 length_no_padding;
u64 total_length;
size_t utf8_len;
- const char *p_save = p;
+ const u8 *p_save = p;
/* Read the base stream entry, excluding the stream name. */
if (remaining_size < WIM_ADS_ENTRY_DISK_SIZE) {
if (remaining_size < length_no_padding) {
ERROR("Stream entries go past end of metadata resource");
ERROR("(remaining_size = %"PRIu64" bytes, "
- "length_no_padding = %"PRIu16" bytes)",
+ "length_no_padding = %"PRIu64" bytes)",
remaining_size, length_no_padding);
ret = WIMLIB_ERR_INVALID_DENTRY;
goto out_free_ads_entries;
char *short_name = NULL;
u16 short_name_len;
u16 file_name_len;
- size_t file_name_utf8_len;
+ size_t file_name_utf8_len = 0;
int ret;
dentry_common_init(dentry);
/* Make sure there is only one un-named stream. */
unsigned num_unnamed_streams = 0;
- unsigned unnamed_stream_idx;
for (unsigned i = 0; i <= dentry->num_ads; i++) {
const u8 *hash;
hash = dentry_stream_hash_unresolved(dentry, i);
- if (!dentry_stream_name_len(dentry, i) && !is_zero_hash(hash)) {
+ if (!dentry_stream_name_len(dentry, i) && !is_zero_hash(hash))
num_unnamed_streams++;
- unnamed_stream_idx = i;
- }
}
if (num_unnamed_streams > 1) {
ERROR("Dentry `%s' has multiple (%u) un-named streams",
goto out;
}
+ /* Cannot have a short name but no long name */
+ if (dentry->short_name_len && !dentry->file_name_len) {
+ ERROR("Dentry `%s' has a short name but no long name",
+ dentry->full_path_utf8);
+ goto out;
+ }
+
+ /* Make sure root dentry is unnamed */
+ if (dentry_is_root(dentry)) {
+ if (dentry->file_name_len) {
+ ERROR("The root dentry is named `%s', but it must "
+ "be unnamed", dentry->file_name_utf8);
+ goto out;
+ }
+ }
+
#if 0
/* Check timestamps */
if (dentry->last_access_time < dentry->creation_time ||
static u8 *write_dentry(const struct dentry *dentry, u8 *p)
{
u8 *orig_p = p;
- unsigned padding;
const u8 *hash;
/* We calculate the correct length of the dentry ourselves because the
p = put_u64(p, dentry->creation_time);
p = put_u64(p, dentry->last_access_time);
p = put_u64(p, dentry->last_write_time);
- if (dentry->resolved && dentry->lte)
- hash = dentry->lte->hash;
- else
- hash = dentry->hash;
+ hash = dentry_stream_hash(dentry, 0);
p = put_bytes(p, SHA1_HASH_SIZE, hash);
if (dentry->attributes & FILE_ATTRIBUTE_REPARSE_POINT) {
p = put_zeroes(p, 4);
for (u16 i = 0; i < dentry->num_ads; i++) {
p = put_u64(p, ads_entry_total_length(&dentry->ads_entries[i]));
p = put_u64(p, 0); /* Unused */
- if (dentry->resolved && dentry->ads_entries[i].lte)
- hash = dentry->ads_entries[i].lte->hash;
- else
- hash = dentry->ads_entries[i].hash;
+ hash = dentry_stream_hash(dentry, i + 1);
p = put_bytes(p, SHA1_HASH_SIZE, hash);
p = put_u16(p, dentry->ads_entries[i].stream_name_len);
if (dentry->ads_entries[i].stream_name_len) {
git://wimlib.net / wimlib / blobdiff