X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fwrite.c;h=9f48d3f1ded5973d1a215c5cd4b23f9f391d5d12;hp=bc7b6ebde872159d997dee3a08fa48a377cfdc91;hb=8b676e7d340fb8197824745eb387e1d3154e6f60;hpb=809419253b18ca0d44e4f381148f8056486201aa

diff --git a/src/write.c b/src/write.c
index bc7b6ebd..9f48d3f1 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);
@@ -2369,10 +2372,8 @@ finish_write(WIMStruct *wim, int image, int write_flags,
 	if (!(write_flags & WIMLIB_WRITE_FLAG_NO_NEW_BLOBS)) {
 		ret = write_blob_table(wim, image, write_flags,
 				       blob_table_list);
-		if (ret) {
-			free_integrity_table(old_integrity_table);
-			return ret;
-		}
+		if (ret)
+			goto out;
 	}
 
 	/* Write XML data.  */
@@ -2382,13 +2383,13 @@ finish_write(WIMStruct *wim, int image, int write_flags,
 	ret = write_wim_xml_data(wim, image, xml_totalbytes,
 				 &wim->out_hdr.xml_data_reshdr,
 				 write_resource_flags);
-	if (ret) {
-		free_integrity_table(old_integrity_table);
-		return ret;
-	}
+	if (ret)
+		goto out;
 
 	/* Write integrity table if needed.  */
-	if (write_flags & WIMLIB_WRITE_FLAG_CHECK_INTEGRITY) {
+	if ((write_flags & WIMLIB_WRITE_FLAG_CHECK_INTEGRITY) &&
+	    wim->out_hdr.blob_table_reshdr.offset_in_wim != 0)
+	{
 		if (write_flags & WIMLIB_WRITE_FLAG_NO_NEW_BLOBS) {
 			/* The XML data we wrote may have overwritten part of
 			 * the old integrity table, so while calculating the new
@@ -2399,10 +2400,8 @@ finish_write(WIMStruct *wim, int image, int write_flags,
 			zero_reshdr(&checkpoint_hdr.integrity_table_reshdr);
 			checkpoint_hdr.flags |= WIM_HDR_FLAG_WRITE_IN_PROGRESS;
 			ret = write_wim_header(&checkpoint_hdr, &wim->out_fd, 0);
-			if (ret) {
-				free_integrity_table(old_integrity_table);
-				return ret;
-			}
+			if (ret)
+				goto out;
 		}
 
 		new_blob_table_end = wim->out_hdr.blob_table_reshdr.offset_in_wim +
@@ -2412,9 +2411,8 @@ finish_write(WIMStruct *wim, int image, int write_flags,
 					    new_blob_table_end,
 					    old_blob_table_end,
 					    old_integrity_table);
-		free_integrity_table(old_integrity_table);
 		if (ret)
-			return ret;
+			goto out;
 	} else {
 		/* No integrity table.  */
 		zero_reshdr(&wim->out_hdr.integrity_table_reshdr);
@@ -2430,13 +2428,17 @@ finish_write(WIMStruct *wim, int image, int write_flags,
 	else
 		ret = write_wim_header(&wim->out_hdr, &wim->out_fd, 0);
 	if (ret)
-		return ret;
+		goto out;
 
+	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");
-			return WIMLIB_ERR_WRITE;
+			goto out;
 		}
 	}
 
@@ -2446,19 +2448,24 @@ finish_write(WIMStruct *wim, int image, int write_flags,
 	 * the system is abruptly terminated when the metadata for the rename
 	 * operation has been written to disk, but the new file data has not.
 	 */
+	ret = WIMLIB_ERR_WRITE;
 	if (write_flags & WIMLIB_WRITE_FLAG_FSYNC) {
 		if (fsync(wim->out_fd.fd)) {
 			ERROR_WITH_ERRNO("Error syncing data to WIM file");
-			return WIMLIB_ERR_WRITE;
+			goto out;
 		}
 	}
 
+	ret = WIMLIB_ERR_WRITE;
 	if (close_wim_writable(wim, write_flags)) {
 		ERROR_WITH_ERRNO("Failed to close the output WIM file");
-		return WIMLIB_ERR_WRITE;
+		goto out;
 	}
 
-	return 0;
+	ret = 0;
+out:
+	free_integrity_table(old_integrity_table);
+	return ret;
 }
 
 #if defined(HAVE_SYS_FILE_H) && defined(HAVE_FLOCK)
@@ -3109,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 "