X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fwrite.c;h=cc569395d19c12f3f499b5a68f8523f33e5055bd;hp=930c61b1d5dad40f0694102c061d4b2514c3f6cb;hb=832b0b2adaf6369d4d686006962206e867ac2a11;hpb=707700a1f8f41a8e27bc87d4debffe4fb1d24ec7

diff --git a/src/write.c b/src/write.c
index 930c61b1..cc569395 100644
--- a/src/write.c
+++ b/src/write.c
@@ -639,6 +639,7 @@ do_done_with_blob(struct blob_descriptor *blob,
 {
 	int ret;
 	struct wim_inode *inode;
+	const tchar *path;
 	tchar *cookie1;
 	tchar *cookie2;
 
@@ -652,10 +653,12 @@ do_done_with_blob(struct blob_descriptor *blob,
 	if (--inode->i_num_remaining_streams > 0)
 		return 0;
 
-	cookie1 = progress_get_streamless_path(blob->file_on_disk);
-	cookie2 = progress_get_win32_path(blob->file_on_disk);
+	path = blob_file_path(blob);
 
-	ret = done_with_file(blob->file_on_disk, progfunc, progctx);
+	cookie1 = progress_get_streamless_path(path);
+	cookie2 = progress_get_win32_path(path);
+
+	ret = done_with_file(path, progfunc, progctx);
 
 	progress_put_win32_path(cookie2);
 	progress_put_streamless_path(cookie1);
@@ -2430,7 +2433,10 @@ finish_write(WIMStruct *wim, int image, int write_flags,
 	ret = WIMLIB_ERR_WRITE;
 	if (unlikely(write_flags & WIMLIB_WRITE_FLAG_UNSAFE_COMPACT)) {
 		/* Truncate any data the compaction freed up.  */
-		if (ftruncate(wim->out_fd.fd, wim->out_fd.offset)) {
+		if (ftruncate(wim->out_fd.fd, wim->out_fd.offset) &&
+		    errno != EINVAL) /* allow compaction on untruncatable files,
+					e.g. block devices  */
+		{
 			ERROR_WITH_ERRNO("Failed to truncate the output WIM file");
 			goto out;
 		}
@@ -3110,8 +3116,11 @@ overwrite_wim_inplace(WIMStruct *wim, int write_flags, unsigned num_threads)
 		 * this data would be overwritten.  */
 		old_xml_begin = wim->hdr.xml_data_reshdr.offset_in_wim;
 		old_xml_end = old_xml_begin + wim->hdr.xml_data_reshdr.size_in_wim;
-		old_blob_table_end = wim->hdr.blob_table_reshdr.offset_in_wim +
-				     wim->hdr.blob_table_reshdr.size_in_wim;
+		if (wim->hdr.blob_table_reshdr.offset_in_wim == 0)
+			old_blob_table_end = WIM_HEADER_DISK_SIZE;
+		else
+			old_blob_table_end = wim->hdr.blob_table_reshdr.offset_in_wim +
+					     wim->hdr.blob_table_reshdr.size_in_wim;
 		if (wim_has_integrity_table(wim) &&
 		    wim->hdr.integrity_table_reshdr.offset_in_wim < old_xml_end) {
 			WARNING("Didn't expect the integrity table to be "
@@ -3214,9 +3223,8 @@ out_truncate:
 			     WIMLIB_WRITE_FLAG_UNSAFE_COMPACT))) {
 		WARNING("Truncating \"%"TS"\" to its original size "
 			"(%"PRIu64" bytes)", wim->filename, old_wim_end);
-		/* Return value of ftruncate() is ignored because this is
-		 * already an error path.  */
-		(void)ftruncate(wim->out_fd.fd, old_wim_end);
+		if (ftruncate(wim->out_fd.fd, old_wim_end))
+			WARNING_WITH_ERRNO("Failed to truncate WIM file!");
 	}
 out_restore_hdr:
 	(void)write_wim_header_flags(wim->hdr.flags, &wim->out_fd);