X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fwim.c;h=11bb2e50a616b79c397d9c30b0b5c5d3a8d84c98;hb=45d7e8a4f1740974e1dacd221676f9ec38c6b272;hp=2f5f5e0e8e27d534c49db96b8af3fad442f9a9f4;hpb=1c19875f1bcbfe341014b20b9bbbc9b5fa0cea4d;p=wimlib

diff --git a/src/wim.c b/src/wim.c
index 2f5f5e0e..11bb2e50 100644
--- a/src/wim.c
+++ b/src/wim.c
@@ -138,6 +138,10 @@ wim_chunk_size_valid(u32 chunk_size, int ctype)
 		 * 2^15 = 32768 is the default value used for compatibility, but
 		 * wimlib can actually use up to 2^26.  */
 		return order >= 15 && order <= 26;
+
+	case WIMLIB_COMPRESSION_TYPE_LZMS:
+		/* TODO */
+		return 131072;
 	}
 	return false;
 }
@@ -200,15 +204,15 @@ wimlib_create_new_wim(int ctype, WIMStruct **wim_ret)
 
 	/* Allocate the WIMStruct. */
 	wim = new_wim_struct();
-	if (!wim)
+	if (wim == NULL)
 		return WIMLIB_ERR_NOMEM;
 
 	ret = init_wim_header(&wim->hdr, ctype, wim_default_chunk_size(ctype));
-	if (ret != 0)
+	if (ret)
 		goto out_free;
 
 	table = new_lookup_table(9001);
-	if (!table) {
+	if (table == NULL) {
 		ret = WIMLIB_ERR_NOMEM;
 		goto out_free;
 	}
@@ -293,6 +297,8 @@ wimlib_get_compression_type_string(int ctype)
 			return T("LZX");
 		case WIMLIB_COMPRESSION_TYPE_XPRESS:
 			return T("XPRESS");
+		case WIMLIB_COMPRESSION_TYPE_LZMS:
+			return T("LZMS");
 		default:
 			return T("Invalid");
 	}
@@ -371,7 +377,7 @@ wimlib_get_wim_info(WIMStruct *wim, struct wimlib_wim_info *info)
 	memcpy(info->guid, wim->hdr.guid, WIMLIB_GUID_LEN);
 	info->image_count = wim->hdr.image_count;
 	info->boot_index = wim->hdr.boot_idx;
-	info->wim_version = WIM_VERSION;
+	info->wim_version = wim->hdr.wim_version;
 	info->chunk_size = wim->hdr.chunk_size;
 	info->part_number = wim->hdr.part_number;
 	info->total_parts = wim->hdr.total_parts;
@@ -445,6 +451,7 @@ wimlib_set_output_compression_type(WIMStruct *wim, int ctype)
 	case WIMLIB_COMPRESSION_TYPE_NONE:
 	case WIMLIB_COMPRESSION_TYPE_LZX:
 	case WIMLIB_COMPRESSION_TYPE_XPRESS:
+	case WIMLIB_COMPRESSION_TYPE_LZMS:
 		wim->out_compression_type = ctype;
 
 		/* Reset the chunk size if it's no longer valid.  */
@@ -474,6 +481,9 @@ wimlib_set_output_chunk_size(WIMStruct *wim, uint32_t chunk_size)
 			ERROR("Valid chunk sizes for LZX are "
 			      "32768, 65536, 131072, ..., 2097152.");
 			break;
+		case WIMLIB_COMPRESSION_TYPE_LZMS:
+			ERROR("Valid chunk sizes for LZMS are 131072.");
+			break;
 		}
 		return WIMLIB_ERR_INVALID_CHUNK_SIZE;
 	}
@@ -535,7 +545,6 @@ begin_read(WIMStruct *wim, const void *wim_filename_or_fd,
 		wim->in_fd.is_pipe = 1;
 	} else {
 		wimfile = wim_filename_or_fd;
-		DEBUG("Reading the WIM file `%"TS"'", wimfile);
 		ret = do_open_wim(wimfile, &wim->in_fd);
 		if (ret)
 			return ret;
@@ -553,7 +562,7 @@ begin_read(WIMStruct *wim, const void *wim_filename_or_fd,
 		 * replacement function in win32_replacements.c.
 		 */
 		wim->filename = realpath(wimfile, NULL);
-		if (!wim->filename) {
+		if (wim->filename == NULL) {
 			ERROR_WITH_ERRNO("Failed to resolve WIM filename");
 			if (errno == ENOMEM)
 				return WIMLIB_ERR_NOMEM;
@@ -562,14 +571,15 @@ begin_read(WIMStruct *wim, const void *wim_filename_or_fd,
 		}
 	}
 
-	ret = read_wim_header(wim->filename, &wim->in_fd, &wim->hdr);
+	ret = read_wim_header(wim, &wim->hdr);
 	if (ret)
 		return ret;
 
 	if (wim->hdr.flags & WIM_HDR_FLAG_WRITE_IN_PROGRESS) {
-		WARNING("The WIM_HDR_FLAG_WRITE_IN_PROGRESS is set in the header of \"%"TS"\".\n"
-			"          It may be being changed by another process, or a process\n"
-			"          may have crashed while writing the WIM.", wimfile);
+		WARNING("The WIM_HDR_FLAG_WRITE_IN_PROGRESS flag is set in the header of\n"
+			"          \"%"TS"\".  It may be being changed by another process,\n"
+			"          or a process may have crashed while writing the WIM.",
+			wimfile);
 	}
 
 	if (open_flags & WIMLIB_OPEN_FLAG_WRITE_ACCESS) {
@@ -595,17 +605,14 @@ begin_read(WIMStruct *wim, const void *wim_filename_or_fd,
 	/* Check and cache the compression type */
 	if (wim->hdr.flags & WIM_HDR_FLAG_COMPRESSION) {
 		if (wim->hdr.flags & WIM_HDR_FLAG_COMPRESS_LZX) {
-			if (wim->hdr.flags & WIM_HDR_FLAG_COMPRESS_XPRESS) {
-				ERROR("Multiple compression flags are set in \"%"TS"\"",
-				      wimfile);
-				return WIMLIB_ERR_INVALID_COMPRESSION_TYPE;
-			}
 			wim->compression_type = WIMLIB_COMPRESSION_TYPE_LZX;
 		} else if (wim->hdr.flags & WIM_HDR_FLAG_COMPRESS_XPRESS) {
 			wim->compression_type = WIMLIB_COMPRESSION_TYPE_XPRESS;
+		} else if (wim->hdr.flags & WIM_HDR_FLAG_COMPRESS_LZMS) {
+			wim->compression_type = WIMLIB_COMPRESSION_TYPE_LZMS;
 		} else {
 			ERROR("The compression flag is set on \"%"TS"\", but "
-			      "neither the XPRESS nor LZX flag is set",
+			      "a flag for a recognized format is not",
 			      wimfile);
 			return WIMLIB_ERR_INVALID_COMPRESSION_TYPE;
 		}
@@ -639,13 +646,13 @@ begin_read(WIMStruct *wim, const void *wim_filename_or_fd,
 
 	if (wim->hdr.image_count != 0 && wim->hdr.part_number == 1) {
 		wim->image_metadata = new_image_metadata_array(wim->hdr.image_count);
-		if (!wim->image_metadata)
+		if (wim->image_metadata == NULL)
 			return WIMLIB_ERR_NOMEM;
 	}
 
 	if (open_flags & WIMLIB_OPEN_FLAG_FROM_PIPE) {
 		wim->lookup_table = new_lookup_table(9001);
-		if (!wim->lookup_table)
+		if (wim->lookup_table == NULL)
 			return WIMLIB_ERR_NOMEM;
 	} else {
 		ret = read_wim_lookup_table(wim);
@@ -676,28 +683,29 @@ open_wim_as_WIMStruct(const void *wim_filename_or_fd, int open_flags,
 	WIMStruct *wim;
 	int ret;
 
+	if (open_flags & WIMLIB_OPEN_FLAG_FROM_PIPE)
+		DEBUG("Opening pipable WIM from file descriptor %d.", *(const int*)wim_filename_or_fd);
+	else
+		DEBUG("Opening WIM file \"%"TS"\"", (const tchar*)wim_filename_or_fd);
+
 	wimlib_global_init(WIMLIB_INIT_FLAG_ASSUME_UTF8);
 
-	ret = WIMLIB_ERR_INVALID_PARAM;
-	if (!wim_ret)
-		goto out;
+	if (wim_ret == NULL)
+		return WIMLIB_ERR_INVALID_PARAM;
 
-	ret = WIMLIB_ERR_NOMEM;
 	wim = new_wim_struct();
-	if (!wim)
-		goto out;
+	if (wim == NULL)
+		return WIMLIB_ERR_NOMEM;
 
 	ret = begin_read(wim, wim_filename_or_fd, open_flags, progress_func);
-	if (ret)
-		goto out_wimlib_free;
+	if (ret) {
+		wimlib_free(wim);
+		return ret;
+	}
 
-	ret = 0;
+	DEBUG("Successfully opened WIM and created WIMStruct.");
 	*wim_ret = wim;
-	goto out;
-out_wimlib_free:
-	wimlib_free(wim);
-out:
-	return ret;
+	return 0;
 }
 
 /* API function documented in wimlib.h  */
@@ -724,7 +732,7 @@ destroy_image_metadata(struct wim_image_metadata *imd,
 		free_lookup_table_entry(imd->metadata_lte);
 		imd->metadata_lte = NULL;
 	}
-	if (!table) {
+	if (table == NULL) {
 		struct wim_lookup_table_entry *lte, *tmp;
 		list_for_each_entry_safe(lte, tmp, &imd->unhashed_streams, unhashed_list)
 			free_lookup_table_entry(lte);
@@ -761,7 +769,7 @@ append_image_metadata(WIMStruct *wim, struct wim_image_metadata *imd)
 	imd_array = REALLOC(wim->image_metadata,
 			    sizeof(wim->image_metadata[0]) * (wim->hdr.image_count + 1));
 
-	if (!imd_array)
+	if (imd_array == NULL)
 		return WIMLIB_ERR_NOMEM;
 	wim->image_metadata = imd_array;
 	imd_array[wim->hdr.image_count++] = imd;
@@ -796,14 +804,14 @@ new_image_metadata_array(unsigned num_images)
 
 	imd_array = CALLOC(num_images, sizeof(imd_array[0]));
 
-	if (!imd_array) {
+	if (imd_array == NULL) {
 		ERROR("Failed to allocate memory for %u image metadata structures",
 		      num_images);
 		return NULL;
 	}
 	for (unsigned i = 0; i < num_images; i++) {
 		imd_array[i] = new_image_metadata();
-		if (!imd_array[i]) {
+		if (imd_array[i] == NULL) {
 			for (unsigned j = 0; j < i; j++)
 				put_image_metadata(imd_array[j], NULL);
 			FREE(imd_array);
@@ -899,7 +907,7 @@ can_delete_from_wim(WIMStruct *wim)
 WIMLIBAPI void
 wimlib_free(WIMStruct *wim)
 {
-	if (!wim)
+	if (wim == NULL)
 		return;
 
 	DEBUG("Freeing WIMStruct (filename=\"%"TS"\", image_count=%u)",