]> wimlib.net Git - wimlib/blobdiff - src/dentry.c
verify.c, buffer_io.h
[wimlib] / src / dentry.c
index 4ff86029e3e73967f2f752b83815bc13241dd7f8..ae71c1d54d92b0c8a7cd36a94f587d6f2704b17d 100644 (file)
@@ -33,7 +33,7 @@
 #include <unistd.h>
 
 #include "dentry.h"
-#include "io.h"
+#include "buffer_io.h"
 #include "lookup_table.h"
 #include "sha1.h"
 #include "timestamp.h"
@@ -1080,150 +1080,6 @@ void unlink_dentry(struct dentry *dentry)
 }
 #endif
 
-static inline struct dentry *inode_first_dentry(struct inode *inode)
-{
-       wimlib_assert(inode->dentry_list.next != &inode->dentry_list);
-       return container_of(inode->dentry_list.next, struct dentry,
-                           inode_dentry_list);
-}
-
-static int verify_inode(struct inode *inode, const WIMStruct *w)
-{
-       const struct lookup_table *table = w->lookup_table;
-       const struct wim_security_data *sd = wim_const_security_data(w);
-       const struct dentry *first_dentry = inode_first_dentry(inode);
-       int ret = WIMLIB_ERR_INVALID_DENTRY;
-
-       /* Check the security ID */
-       if (inode->security_id < -1) {
-               ERROR("Dentry `%s' has an invalid security ID (%d)",
-                       first_dentry->full_path_utf8, inode->security_id);
-               goto out;
-       }
-       if (inode->security_id >= sd->num_entries) {
-               ERROR("Dentry `%s' has an invalid security ID (%d) "
-                     "(there are only %u entries in the security table)",
-                       first_dentry->full_path_utf8, inode->security_id,
-                       sd->num_entries);
-               goto out;
-       }
-
-       /* Check that lookup table entries for all the resources exist, except
-        * if the SHA1 message digest is all 0's, which indicates there is
-        * intentionally no resource there.  */
-       if (w->hdr.total_parts == 1) {
-               for (unsigned i = 0; i <= inode->num_ads; i++) {
-                       struct lookup_table_entry *lte;
-                       const u8 *hash;
-                       hash = inode_stream_hash_unresolved(inode, i);
-                       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);
-                               goto out;
-                       }
-                       if (lte)
-                               lte->real_refcnt += inode->link_count;
-
-                       /* 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
-               }
-       }
-
-       /* Make sure there is only one un-named stream. */
-       unsigned num_unnamed_streams = 0;
-       for (unsigned i = 0; i <= inode->num_ads; i++) {
-               const u8 *hash;
-               hash = inode_stream_hash_unresolved(inode, i);
-               if (!inode_stream_name_len(inode, i) && !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);
-               goto out;
-       }
-       inode->verified = true;
-       ret = 0;
-out:
-       return ret;
-}
-
-/* Run some miscellaneous verifications on a WIM dentry */
-int verify_dentry(struct dentry *dentry, void *wim)
-{
-       int ret;
-
-       if (!dentry->d_inode->verified) {
-               ret = verify_inode(dentry->d_inode, wim);
-               if (ret != 0)
-                       return ret;
-       }
-
-       /* 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);
-               return WIMLIB_ERR_INVALID_DENTRY;
-       }
-
-       /* 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);
-                       return WIMLIB_ERR_INVALID_DENTRY;
-               }
-       }
-
-#if 0
-       /* Check timestamps */
-       if (inode->last_access_time < inode->creation_time ||
-           inode->last_write_time < inode->creation_time) {
-               WARNING("Dentry `%s' was created after it was last accessed or "
-                     "written to", dentry->full_path_utf8);
-       }
-#endif
-
-       return 0;
-}
-
-
 #ifdef WITH_FUSE
 /* Returns the alternate data stream entry belonging to @inode that has the
  * stream name @stream_name. */