X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=include%2Fwimlib%2Fblob_table.h;h=0999660026ebde5c297d2a04684ec922f1683657;hp=556187e824cc3e4be0fa3be1a2cb56db3d7c0c4e;hb=a4123fea556d6c362318212127e25846981ea190;hpb=1fcf9333676be806716535d01b38722ee53d52e9

diff --git a/include/wimlib/blob_table.h b/include/wimlib/blob_table.h
index 556187e8..09996600 100644
--- a/include/wimlib/blob_table.h
+++ b/include/wimlib/blob_table.h
@@ -74,7 +74,20 @@ struct blob_descriptor {
 	/* List node for a hash bucket of the blob table  */
 	struct hlist_node hash_list;
 
-	/* Uncompressed size of this blob  */
+	/*
+	 * Uncompressed size of this blob.
+	 *
+	 * In most cases we are now enforcing that this is nonzero; i.e. an
+	 * empty stream will have "no blob" rather than "an empty blob".  The
+	 * exceptions are:
+	 *
+	 *	- blob descriptors with 'blob_location == BLOB_NONEXISTENT',
+	 *	  e.g. placeholder entries for new metadata resources or for
+	 *	  blobs required for pipable WIM extraction.  In these cases the
+	 *	  size is not meaningful information anyway.
+	 *	- blob descriptors with 'blob_location == BLOB_IN_STAGING_FILE'
+	 *	  can vary their size over time, including to 0.
+	 */
 	u64 size;
 
 	union {
@@ -95,7 +108,7 @@ struct blob_descriptor {
 			struct wim_inode *back_inode;
 			u32 back_stream_id;
 		};
-	};
+	} _packed_attribute; /* union is SHA1_HASH_SIZE bytes */
 
 	/* Number of times this blob is referenced by file streams in WIM
 	 * images.  See blob_decrement_refcnt() for information about the
@@ -139,13 +152,6 @@ struct blob_descriptor {
 	u16 unique_size : 1;
 	u16 will_be_in_output_wim : 1;
 
-	/* Set to 1 if this blob represents a metadata resource that has been
-	 * changed.  In such cases, the hash cannot be used to verify the data
-	 * if the metadata resource is read again.  (This could be avoided if we
-	 * used separate fields for input/output checksum, but most blobs
-	 * wouldn't need this.)  */
-	u16 dont_check_metadata_hash : 1;
-
 	u16 may_send_done_with_file : 1;
 
 	/* Only used by wimlib_export_image() */
@@ -174,6 +180,9 @@ struct blob_descriptor {
 				struct {
 					tchar *file_on_disk;
 					struct wim_inode *file_inode;
+				#ifdef __WIN32__
+					u64 sort_key;
+				#endif
 				};
 
 				/* BLOB_IN_ATTACHED_BUFFER */
@@ -297,6 +306,9 @@ extern void
 blob_decrement_num_opened_fds(struct blob_descriptor *blob);
 #endif
 
+extern void
+blob_release_location(struct blob_descriptor *blob);
+
 extern void
 free_blob_descriptor(struct blob_descriptor *blob);
 
@@ -325,8 +337,7 @@ blob_to_wimlib_resource_entry(const struct blob_descriptor *blob,
 			      struct wimlib_resource_entry *wentry);
 
 extern int
-sort_blob_list(struct list_head *blob_list,
-	       size_t list_head_offset,
+sort_blob_list(struct list_head *blob_list, size_t list_head_offset,
 	       int (*compar)(const void *, const void*));
 
 extern int
@@ -337,7 +348,7 @@ extern int
 cmp_blobs_by_sequential_order(const void *p1, const void *p2);
 
 static inline const struct blob_extraction_target *
-blob_extraction_targets(struct blob_descriptor *blob)
+blob_extraction_targets(const struct blob_descriptor *blob)
 {
 	if (blob->out_refcnt <= ARRAY_LEN(blob->inline_blob_extraction_targets))
 		return blob->inline_blob_extraction_targets;
@@ -360,18 +371,6 @@ blob_set_is_located_in_wim_resource(struct blob_descriptor *blob,
 	blob->offset_in_res = offset_in_res;
 }
 
-/*
- * Declare that the specified blob is located in the specified non-solid WIM
- * resource.  In this case, the blob data is the entire uncompressed resource.
- */
-static inline void
-blob_set_is_located_in_nonsolid_wim_resource(struct blob_descriptor *blob,
-					     struct wim_resource_descriptor *rdesc)
-{
-	blob_set_is_located_in_wim_resource(blob, rdesc, 0);
-	blob->size = rdesc->uncompressed_size;
-}
-
 static inline void
 blob_unset_is_located_in_wim_resource(struct blob_descriptor *blob)
 {
@@ -388,6 +387,17 @@ blob_set_is_located_in_attached_buffer(struct blob_descriptor *blob,
 	blob->size = size;
 }
 
+static inline bool
+blob_is_in_file(const struct blob_descriptor *blob)
+{
+	return blob->blob_location == BLOB_IN_FILE_ON_DISK
+#ifdef __WIN32__
+	    || blob->blob_location == BLOB_IN_WINNT_FILE_ON_DISK
+	    || blob->blob_location == BLOB_WIN32_ENCRYPTED
+#endif
+	   ;
+}
+
 extern struct blob_descriptor *
 new_blob_from_data_buffer(const void *buffer, size_t size,
 			  struct blob_table *blob_table);
@@ -398,8 +408,7 @@ after_blob_hashed(struct blob_descriptor *blob,
 		  struct blob_table *blob_table);
 
 extern int
-hash_unhashed_blob(struct blob_descriptor *blob,
-		   struct blob_table *blob_table,
+hash_unhashed_blob(struct blob_descriptor *blob, struct blob_table *blob_table,
 		   struct blob_descriptor **blob_ret);
 
 extern struct blob_descriptor **