configure.ac: generate version number from git commit and tags

[wimlib] / src / inode.c

diff --git a/src/inode.c b/src/inode.c
index e43fd2d0d1b446f70a5b334f45ad05a76a2d1deb..68e88c05fd6a21444c0ce716d68883d2c6cab001 100644 (file)
--- a/src/inode.c
+++ b/src/inode.c
@@ -8,7 +8,7 @@
  */
 
 /*
- * Copyright (C) 2012, 2013, 2014, 2015 Eric Biggers
+ * Copyright (C) 2012-2018 Eric Biggers
  *
  * This file 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
@@ -57,7 +57,7 @@ new_inode(struct wim_dentry *dentry, bool set_timestamps)
        inode->i_security_id = -1;
        /*inode->i_nlink = 0;*/
        inode->i_rp_flags = WIM_RP_FLAG_NOT_FIXED;
-       INIT_LIST_HEAD(&inode->i_dentry);
+       INIT_HLIST_HEAD(&inode->i_alias_list);
        inode->i_streams = inode->i_embedded_streams;
        if (set_timestamps) {
                u64 now = now_as_wim_timestamp();
@@ -85,8 +85,8 @@ free_inode(struct wim_inode *inode)
                FREE(inode->i_streams);
        if (inode->i_extra)
                FREE(inode->i_extra);
-       if (!hlist_unhashed(&inode->i_hlist))
-               hlist_del(&inode->i_hlist);
+       if (!hlist_unhashed(&inode->i_hlist_node))
+               hlist_del(&inode->i_hlist_node);
        FREE(inode);
 }
 
@@ -108,7 +108,7 @@ d_associate(struct wim_dentry *dentry, struct wim_inode *inode)
 {
        wimlib_assert(!dentry->d_inode);
 
-       list_add_tail(&dentry->d_alias, &inode->i_dentry);
+       hlist_add_head(&dentry->d_alias_node, &inode->i_alias_list);
        dentry->d_inode = inode;
        inode->i_nlink++;
 }
@@ -125,7 +125,7 @@ d_disassociate(struct wim_dentry *dentry)
 
        wimlib_assert(inode->i_nlink > 0);
 
-       list_del(&dentry->d_alias);
+       hlist_del(&dentry->d_alias_node);
        dentry->d_inode = NULL;
        inode->i_nlink--;
 
@@ -267,7 +267,7 @@ inode_add_stream(struct wim_inode *inode, int stream_type,
 {
        if (inode->i_num_streams >= 0xFFFF) {
                ERROR("Inode has too many streams! Path=\"%"TS"\"",
-                     inode_first_full_path(inode));
+                     inode_any_full_path(inode));
                errno = EFBIG;
                return NULL;
        }
@@ -492,7 +492,7 @@ blob_not_found_error(const struct wim_inode *inode, const u8 *hash)
                ERROR("\"%"TS"\": blob not found\n"
                      "        SHA-1 message digest of missing blob:\n"
                      "        %"TS"",
-                     inode_first_full_path(inode), hashstr);
+                     inode_any_full_path(inode), hashstr);
        }
        return WIMLIB_ERR_RESOURCE_NOT_FOUND;
 }
@@ -510,15 +510,25 @@ stream_blob(const struct wim_inode_stream *strm, const struct blob_table *table)
                return lookup_blob(table, strm->_stream_hash);
 }
 
-/* Return the SHA-1 message digest of the data of the specified stream, or a
- * void SHA-1 of all zeroes if the specified stream is empty.   */
+/*
+ * Return the SHA-1 message digest of the data of the specified stream, or a
+ * void SHA-1 of all zeroes if the specified stream is empty, or NULL if the
+ * specified stream is unhashed.  (Most callers ensure the stream cannot be
+ * unhashed.)
+ */
 const u8 *
 stream_hash(const struct wim_inode_stream *strm)
 {
-       if (strm->stream_resolved)
-               return strm->_stream_blob ? strm->_stream_blob->hash : zero_hash;
-       else
+       if (!strm->stream_resolved)
                return strm->_stream_hash;
+
+       if (!strm->_stream_blob)
+               return zero_hash;
+
+       if (strm->_stream_blob->unhashed)
+               return NULL;
+
+       return strm->_stream_blob->hash;
 }
 
 /*
@@ -557,7 +567,9 @@ inode_get_blob_for_unnamed_data_stream_resolved(const struct wim_inode *inode)
 /*
  * Return the SHA-1 message digest of the unnamed data stream of the inode, or a
  * void SHA-1 of all zeroes if the inode does not have an unnamed data stream or
- * if the inode's unnamed data stream is empty.
+ * if the inode's unnamed data stream is empty, or NULL if the inode's unnamed
+ * data stream is unhashed.  (Most callers ensure the stream cannot be
+ * unhashed.)
  */
 const u8 *
 inode_get_hash_of_unnamed_data_stream(const struct wim_inode *inode)