X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fwrite.c;h=b595c875e08e08e80313aa3bd2e363e8577df2d3;hp=47579b549c5a8123f872b5f7bc8b19652e60f5dd;hb=2181fcb79eb8ec6d81d02eabd84d28cfa27d4f5f;hpb=9bd0659477b3a1ebad90b46106f743d72689bbd3

diff --git a/src/write.c b/src/write.c
index 47579b54..b595c875 100644
--- a/src/write.c
+++ b/src/write.c
@@ -548,9 +548,9 @@ end_chunk_table(struct write_blobs_ctx *ctx, u64 res_actual_size,
 			hdr.chunk_size = cpu_to_le32(ctx->out_chunk_size);
 			hdr.compression_format = cpu_to_le32(ctx->out_ctype);
 
-			BUILD_BUG_ON(WIMLIB_COMPRESSION_TYPE_XPRESS != 1);
-			BUILD_BUG_ON(WIMLIB_COMPRESSION_TYPE_LZX != 2);
-			BUILD_BUG_ON(WIMLIB_COMPRESSION_TYPE_LZMS != 3);
+			STATIC_ASSERT(WIMLIB_COMPRESSION_TYPE_XPRESS == 1);
+			STATIC_ASSERT(WIMLIB_COMPRESSION_TYPE_LZX == 2);
+			STATIC_ASSERT(WIMLIB_COMPRESSION_TYPE_LZMS == 3);
 
 			ret = full_pwrite(ctx->out_fd, &hdr, sizeof(hdr),
 					  chunk_table_offset - sizeof(hdr));
@@ -624,6 +624,8 @@ do_done_with_blob(struct blob_descriptor *blob,
 {
 	int ret;
 	struct wim_inode *inode;
+	tchar *cookie1;
+	tchar *cookie2;
 
 	if (!blob->may_send_done_with_file)
 		return 0;
@@ -635,38 +637,14 @@ do_done_with_blob(struct blob_descriptor *blob,
 	if (--inode->i_num_remaining_streams > 0)
 		return 0;
 
-#ifdef __WIN32__
-	/* XXX: This logic really should be somewhere else.  */
-
-	/* We want the path to the file, but blob->file_on_disk might actually
-	 * refer to a named data stream.  Temporarily strip the named data
-	 * stream from the path.  */
-	wchar_t *p_colon = NULL;
-	wchar_t *p_question_mark = NULL;
-	const wchar_t *p_stream_name;
-
-	p_stream_name = path_stream_name(blob->file_on_disk);
-	if (unlikely(p_stream_name)) {
-		p_colon = (wchar_t *)(p_stream_name - 1);
-		wimlib_assert(*p_colon == L':');
-		*p_colon = L'\0';
-	}
-
-	/* We also should use a fake Win32 path instead of a NT path  */
-	if (!wcsncmp(blob->file_on_disk, L"\\??\\", 4)) {
-		p_question_mark = &blob->file_on_disk[1];
-		*p_question_mark = L'\\';
-	}
-#endif
+	cookie1 = progress_get_streamless_path(blob->file_on_disk);
+	cookie2 = progress_get_win32_path(blob->file_on_disk);
 
 	ret = done_with_file(blob->file_on_disk, progfunc, progctx);
 
-#ifdef __WIN32__
-	if (p_colon)
-		*p_colon = L':';
-	if (p_question_mark)
-		*p_question_mark = L'?';
-#endif
+	progress_put_win32_path(cookie2);
+	progress_put_streamless_path(cookie1);
+
 	return ret;
 }
 
@@ -791,13 +769,9 @@ write_blob_uncompressed(struct blob_descriptor *blob, struct filedes *out_fd)
 
 	wimlib_assert(out_fd->offset - begin_offset == blob->size);
 
-	if (out_fd->offset < end_offset &&
-	    0 != ftruncate(out_fd->fd, out_fd->offset))
-	{
-		ERROR_WITH_ERRNO("Can't truncate output file to "
-				 "offset %"PRIu64, out_fd->offset);
-		return WIMLIB_ERR_WRITE;
-	}
+	/* We could ftruncate() the file to 'out_fd->offset' here, but there
+	 * isn't much point.  Usually we will only be truncating by a few bytes
+	 * and will just overwrite the data immediately.  */
 
 	blob->out_reshdr.size_in_wim = blob->size;
 	blob->out_reshdr.flags &= ~(WIM_RESHDR_FLAG_COMPRESSED |