*/
/*
- * Copyright (C) 2012 Eric Biggers
+ * Copyright (C) 2012, 2013 Eric Biggers
*
* wimlib - Library for working with WIM files
*
#include "dentry.h"
#include "lookup_table.h"
-static int verify_inode(struct wim_inode *inode, const WIMStruct *w)
+static int
+verify_inode(struct wim_inode *inode, const WIMStruct *w)
{
const struct wim_lookup_table *table = w->lookup_table;
const struct wim_security_data *sd = wim_const_security_data(w);
- const struct wim_dentry *first_dentry = inode_first_dentry(inode);
- const struct wim_dentry *dentry;
+ struct wim_dentry *first_dentry = inode_first_dentry(inode);
+ struct wim_dentry *dentry;
int ret = WIMLIB_ERR_INVALID_DENTRY;
/* Check the security ID. -1 is valid and means "no security
* descriptor". Anything else has to be a valid index into the WIM
* image's security descriptors table. */
if (inode->i_security_id < -1) {
- ERROR("Dentry `%s' has an invalid security ID (%d)",
- first_dentry->full_path_utf8, inode->i_security_id);
+ ERROR("Dentry `%"TS"' has an invalid security ID (%d)",
+ dentry_full_path(first_dentry), inode->i_security_id);
goto out;
}
if (inode->i_security_id >= sd->num_entries) {
- ERROR("Dentry `%s' has an invalid security ID (%d) "
+ ERROR("Dentry `%"TS"' has an invalid security ID (%d) "
"(there are only %u entries in the security table)",
- first_dentry->full_path_utf8, inode->i_security_id,
- sd->num_entries);
+ dentry_full_path(first_dentry), inode->i_security_id,
+ sd->num_entries);
goto out;
}
/* Check that lookup table entries for all the inode's stream exist,
* except if the SHA1 message digest is all 0's, which indicates an
- * empty stream.
+ * empty stream.
*
* This check is skipped on split WIMs. */
if (w->hdr.total_parts == 1) {
lte = __lookup_resource(table, hash);
if (!lte && !is_zero_hash(hash)) {
ERROR("Could not find lookup table entry for stream "
- "%u of dentry `%s'", i, first_dentry->full_path_utf8);
+ "%u of dentry `%"TS"'",
+ i, dentry_full_path(first_dentry));
goto out;
}
if (lte)
lte->real_refcnt += inode->i_nlink;
-
- /* The following is now done when required by
- * wim_run_full_verifications(). */
-
- #if 0
- if (lte && !w->full_verification_in_progress &&
- lte->real_refcnt > lte->refcnt)
- {
- #ifdef ENABLE_ERROR_MESSAGES
- WARNING("The following lookup table entry "
- "has a reference count of %u, but",
- lte->refcnt);
- WARNING("We found %u references to it",
- lte->real_refcnt);
- WARNING("(One dentry referencing it is at `%s')",
- first_dentry->full_path_utf8);
-
- print_lookup_table_entry(lte);
- #endif
- /* Guess what! install.wim for Windows 8
- * contains many streams referenced by more
- * dentries than the refcnt stated in the lookup
- * table entry. So we will need to handle this
- * case and not just make it be an error... I'm
- * just setting the reference count to the
- * number of references we found.
- * (Unfortunately, even after doing this, the
- * reference count could be too low if it's also
- * referenced in other WIM images) */
-
- #if 1
- lte->refcnt = lte->real_refcnt;
- WARNING("Fixing reference count");
- #else
- goto out;
- #endif
- }
- #endif
}
}
for (unsigned i = 0; i <= inode->i_num_ads; i++) {
const u8 *hash;
hash = inode_stream_hash_unresolved(inode, i);
- if (inode_stream_name_len(inode, i) == 0 && !is_zero_hash(hash))
+ if (inode_stream_name_nbytes(inode, i) == 0 && !is_zero_hash(hash))
num_unnamed_streams++;
}
if (num_unnamed_streams > 1) {
- ERROR("Dentry `%s' has multiple (%u) un-named streams",
- first_dentry->full_path_utf8, num_unnamed_streams);
+ ERROR("Dentry `%"TS"' has multiple (%u) un-named streams",
+ dentry_full_path(first_dentry), num_unnamed_streams);
goto out;
}
/* Files cannot have multiple DOS names, even if they have multiple
* names in multiple directories (i.e. hard links).
* Source: NTFS-3g authors. */
- const struct wim_dentry *dentry_with_dos_name = NULL;
+ struct wim_dentry *dentry_with_dos_name = NULL;
inode_for_each_dentry(dentry, inode) {
- if (dentry->short_name_len) {
+ if (dentry_has_short_name(dentry)) {
if (dentry_with_dos_name) {
ERROR("Hard-linked file has a DOS name at "
- "both `%s' and `%s'",
- dentry_with_dos_name->full_path_utf8,
- dentry->full_path_utf8);
+ "both `%"TS"' and `%"TS"'",
+ dentry_full_path(dentry_with_dos_name),
+ dentry_full_path(dentry));
goto out;
}
dentry_with_dos_name = dentry;
/* Directories with multiple links have not been tested. XXX */
if (inode->i_nlink > 1 && inode->i_attributes & FILE_ATTRIBUTE_DIRECTORY) {
- ERROR("Hard-linked directory `%s' is unsupported",
- first_dentry->full_path_utf8);
+ ERROR("Hard-linked directory `%"TS"' is unsupported",
+ dentry_full_path(first_dentry));
goto out;
}
}
/* Run some miscellaneous verifications on a WIM dentry */
-int verify_dentry(struct wim_dentry *dentry, void *wim)
+int
+verify_dentry(struct wim_dentry *dentry, void *wim)
{
int ret;
+ WIMStruct *w = wim;
/* Verify the associated inode, but only one time no matter how many
- * dentries it has. */
+ * dentries it has (unless we are doing a full verification of the WIM,
+ * in which case we need to force the inode to be verified again.) */
if (!dentry->d_inode->i_verified) {
- ret = verify_inode(dentry->d_inode, wim);
+ ret = verify_inode(dentry->d_inode, w);
if (ret != 0)
return ret;
}
* into a single WIM dentry, even if they are stored separately on NTFS.
* (This seems to be the case...) */
if (dentry_is_root(dentry)) {
- if (dentry->file_name_len || dentry->short_name_len) {
- ERROR("The root dentry is named `%s', but it must "
- "be unnamed", dentry->file_name_utf8);
+ if (dentry_has_long_name(dentry) || dentry_has_short_name(dentry)) {
+ ERROR("The root dentry has a nonempty name!");
return WIMLIB_ERR_INVALID_DENTRY;
}
} else {
- if (!dentry->file_name_len) {
- ERROR("Dentry `%s' has no long name",
- dentry->full_path_utf8);
+ if (!dentry_has_long_name(dentry)) {
+ ERROR("Dentry `%"TS"' has no long name!",
+ dentry_full_path(dentry));
return WIMLIB_ERR_INVALID_DENTRY;
}
}
/* Check timestamps */
if (inode->i_last_access_time < inode->i_creation_time ||
inode->i_last_write_time < inode->i_creation_time) {
- WARNING("Dentry `%s' was created after it was last accessed or "
- "written to", dentry->full_path_utf8);
+ WARNING("Dentry `%"TS"' was created after it was last accessed or "
+ "written to", dentry->full_path);
}
#endif
return 0;
}
-static int image_run_full_verifications(WIMStruct *w)
+static int
+image_run_full_verifications(WIMStruct *w)
{
- return for_dentry_in_tree(wim_root_dentry(w), verify_dentry, w);
+ struct wim_image_metadata *imd;
+ struct wim_inode *inode;
+
+ imd = wim_get_current_image_metadata(w);
+ image_for_each_inode(inode, imd)
+ inode->i_verified = 0;
+ return for_dentry_in_tree(imd->root_dentry, verify_dentry, w);
}
-static int lte_fix_refcnt(struct wim_lookup_table_entry *lte, void *ctr)
+static int
+lte_fix_refcnt(struct wim_lookup_table_entry *lte, void *ctr)
{
if (lte->refcnt != lte->real_refcnt) {
#ifdef ENABLE_ERROR_MESSAGES
* problem by looking at ALL the images to re-calculate the reference count of
* EVERY lookup table entry. This only absolutely has to be done before an image
* is deleted or before an image is mounted read-write. */
-int wim_run_full_verifications(WIMStruct *w)
+int
+wim_run_full_verifications(WIMStruct *w)
{
int ret;
for_lookup_table_entry(w->lookup_table, lte_zero_real_refcnt, NULL);
- w->all_images_verified = 1;
- w->full_verification_in_progress = 1;
+
+ w->all_images_verified = 1; /* Set *before* image_run_full_verifications,
+ because of check in read_metadata_resource() */
ret = for_image(w, WIMLIB_ALL_IMAGES, image_run_full_verifications);
- w->full_verification_in_progress = 0;
if (ret == 0) {
unsigned long num_ltes_with_bogus_refcnt = 0;
- for (int i = 0; i < w->hdr.image_count; i++)
- w->image_metadata[i].metadata_lte->real_refcnt++;
for_lookup_table_entry(w->lookup_table, lte_fix_refcnt,
&num_ltes_with_bogus_refcnt);
if (num_ltes_with_bogus_refcnt != 0) {
* @return:
* 0 on success; WIMLIB_ERR_SPLIT_INVALID if the set is not valid.
*/
-int verify_swm_set(WIMStruct *w, WIMStruct **additional_swms,
- unsigned num_additional_swms)
+int
+verify_swm_set(WIMStruct *w, WIMStruct **additional_swms,
+ unsigned num_additional_swms)
{
unsigned total_parts = w->hdr.total_parts;
int ctype;
const u8 *guid;
if (total_parts != num_additional_swms + 1) {
- ERROR("`%s' says there are %u parts in the spanned set, "
- "but %s%u part%s provided",
+ ERROR("`%"TS"' says there are %u parts in the spanned set, "
+ "but %"TS"%u part%"TS" provided",
w->filename, total_parts,
- (num_additional_swms + 1 < total_parts) ? "only " : "",
+ (num_additional_swms + 1 < total_parts) ? T("only ") : T(""),
num_additional_swms + 1,
- (num_additional_swms) ? "s were" : " was");
+ (num_additional_swms) ? T("s were") : T(" was"));
return WIMLIB_ERR_SPLIT_INVALID;
}
if (w->hdr.part_number != 1) {
- ERROR("WIM `%s' is not the first part of the split WIM.",
+ ERROR("WIM `%"TS"' is not the first part of the split WIM.",
w->filename);
return WIMLIB_ERR_SPLIT_INVALID;
}
for (unsigned i = 0; i < num_additional_swms; i++) {
if (additional_swms[i]->hdr.total_parts != total_parts) {
- ERROR("WIM `%s' says there are %u parts in the spanned set, "
- "but %u parts were provided",
+ ERROR("WIM `%"TS"' says there are %u parts in the "
+ "spanned set, but %u parts were provided",
additional_swms[i]->filename,
additional_swms[i]->hdr.total_parts,
total_parts);
return WIMLIB_ERR_SPLIT_INVALID;
}
if (swm->hdr.part_number == 1) {
- ERROR("WIMs `%s' and `%s' both are marked as the "
- "first WIM in the spanned set",
+ ERROR("WIMs `%"TS"' and `%"TS"' both are marked "
+ "as the first WIM in the spanned set",
w->filename, swm->filename);
return WIMLIB_ERR_SPLIT_INVALID;
}
if (swm->hdr.part_number == 0 ||
swm->hdr.part_number > total_parts)
{
- ERROR("WIM `%s' says it is part %u in the spanned set, "
- "but the part number must be in the range "
- "[1, %u]",
+ ERROR("WIM `%"TS"' says it is part %u in the "
+ "spanned set, but the part number must "
+ "be in the range [1, %u]",
swm->filename, swm->hdr.part_number, total_parts);
return WIMLIB_ERR_SPLIT_INVALID;
}
if (parts_to_swms[swm->hdr.part_number - 2])
{
- ERROR("`%s' and `%s' are both marked as part %u of %u "
- "in the spanned set",
+ ERROR("`%"TS"' and `%"TS"' are both marked as "
+ "part %u of %u in the spanned set",
parts_to_swms[swm->hdr.part_number - 2]->filename,
swm->filename,
swm->hdr.part_number,
}
return 0;
}
-