X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fwim.c;h=fc15a21db00c6a541091e770a29ca7eef8863260;hp=95a3cb2872f07a54ef6cb6aaa0c3376a5d7bd574;hb=ce4af1bc0291503cae1b053d53efbc4123c50be5;hpb=86a852652706cfe53087ef839840171bed597ffd

diff --git a/src/wim.c b/src/wim.c
index 95a3cb28..fc15a21d 100644
--- a/src/wim.c
+++ b/src/wim.c
@@ -66,9 +66,7 @@ static u32
 wim_default_pack_chunk_size(int ctype) {
 	switch (ctype) {
 	case WIMLIB_COMPRESSION_TYPE_LZMS:
-		/* Note: WIMGAPI uses 1 << 26, but lower sizes are compatible.
-		 * */
-		return 1U << 25; /* 33554432  */
+		return 1U << 26; /* 67108864  */
 	default:
 		return 1U << 15; /* 32768     */
 	}
@@ -225,8 +223,125 @@ out_free:
 	return ret;
 }
 
-/* Load the metadata for the specified WIM image into memory and set it as the
- * WIMStruct's currently selected WIM image.  */
+static void
+destroy_image_metadata(struct wim_image_metadata *imd,
+		       struct wim_lookup_table *table,
+		       bool free_metadata_lte)
+{
+	free_dentry_tree(imd->root_dentry, table);
+	imd->root_dentry = NULL;
+	free_wim_security_data(imd->security_data);
+	imd->security_data = NULL;
+
+	if (free_metadata_lte) {
+		free_lookup_table_entry(imd->metadata_lte);
+		imd->metadata_lte = NULL;
+	}
+	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);
+	}
+	INIT_LIST_HEAD(&imd->unhashed_streams);
+	INIT_LIST_HEAD(&imd->inode_list);
+#ifdef WITH_NTFS_3G
+	if (imd->ntfs_vol) {
+		do_ntfs_umount(imd->ntfs_vol);
+		imd->ntfs_vol = NULL;
+	}
+#endif
+}
+
+void
+put_image_metadata(struct wim_image_metadata *imd,
+		   struct wim_lookup_table *table)
+{
+	if (imd && --imd->refcnt == 0) {
+		destroy_image_metadata(imd, table, true);
+		FREE(imd);
+	}
+}
+
+/* Appends the specified image metadata structure to the array of image metadata
+ * for a WIM, and increments the image count. */
+int
+append_image_metadata(WIMStruct *wim, struct wim_image_metadata *imd)
+{
+	struct wim_image_metadata **imd_array;
+
+	DEBUG("Reallocating image metadata array for image_count = %u",
+	      wim->hdr.image_count + 1);
+	imd_array = REALLOC(wim->image_metadata,
+			    sizeof(wim->image_metadata[0]) * (wim->hdr.image_count + 1));
+
+	if (imd_array == NULL)
+		return WIMLIB_ERR_NOMEM;
+	wim->image_metadata = imd_array;
+	imd_array[wim->hdr.image_count++] = imd;
+	return 0;
+}
+
+struct wim_image_metadata *
+new_image_metadata(void)
+{
+	struct wim_image_metadata *imd;
+
+	imd = CALLOC(1, sizeof(*imd));
+	if (imd) {
+		imd->refcnt = 1;
+		INIT_LIST_HEAD(&imd->inode_list);
+		INIT_LIST_HEAD(&imd->unhashed_streams);
+		DEBUG("Created new image metadata (refcnt=1)");
+	} else {
+		ERROR_WITH_ERRNO("Failed to allocate new image metadata structure");
+	}
+	return imd;
+}
+
+static struct wim_image_metadata **
+new_image_metadata_array(unsigned num_images)
+{
+	struct wim_image_metadata **imd_array;
+
+	DEBUG("Creating new image metadata array for %u images",
+	      num_images);
+
+	imd_array = CALLOC(num_images, sizeof(imd_array[0]));
+
+	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] == NULL) {
+			for (unsigned j = 0; j < i; j++)
+				put_image_metadata(imd_array[j], NULL);
+			FREE(imd_array);
+			return NULL;
+		}
+	}
+	return imd_array;
+}
+
+
+/*
+ * Load the metadata for the specified WIM image into memory and set it
+ * as the WIMStruct's currently selected image.
+ *
+ * @wim
+ *	The WIMStruct for the WIM.
+ * @image
+ *	The 1-based index of the image in the WIM to select.
+ *
+ * On success, 0 will be returned, wim->current_image will be set to
+ * @image, and wim_get_current_image_metadata() can be used to retrieve
+ * metadata information for the image.
+ *
+ * On failure, WIMLIB_ERR_INVALID_IMAGE, WIMLIB_ERR_METADATA_NOT_FOUND,
+ * or another error code will be returned.
+ */
 int
 select_wim_image(WIMStruct *wim, int image)
 {
@@ -354,13 +469,6 @@ wimlib_print_available_images(const WIMStruct *wim, int image)
 		print_image_info(wim->wim_info, i);
 }
 
-/* TODO: Deprecated; remove this.  */
-WIMLIBAPI int
-wimlib_print_metadata(WIMStruct *wim, int image)
-{
-	return WIMLIB_ERR_UNSUPPORTED;
-}
-
 /* API function documented in wimlib.h  */
 WIMLIBAPI int
 wimlib_get_wim_info(WIMStruct *wim, struct wimlib_wim_info *info)
@@ -416,10 +524,8 @@ wimlib_set_wim_info(WIMStruct *wim, const struct wimlib_wim_info *info, int whic
 	if (ret)
 		return ret;
 
-	if (which & WIMLIB_CHANGE_GUID) {
-		memcpy(wim->hdr.guid, info->guid, WIM_GID_LEN);
-		wim->guid_set_explicitly = 1;
-	}
+	if (which & WIMLIB_CHANGE_GUID)
+		memcpy(wim->hdr.guid, info->guid, WIM_GUID_LEN);
 
 	if (which & WIMLIB_CHANGE_BOOT_INDEX) {
 		if (info->boot_index > wim->hdr.image_count) {
@@ -443,8 +549,6 @@ static int
 set_out_ctype(int ctype, u8 *out_ctype_p)
 {
 	switch (ctype) {
-	case WIMLIB_COMPRESSION_TYPE_INVALID:
-		break;
 	case WIMLIB_COMPRESSION_TYPE_NONE:
 	case WIMLIB_COMPRESSION_TYPE_LZX:
 	case WIMLIB_COMPRESSION_TYPE_XPRESS:
@@ -528,6 +632,15 @@ wimlib_set_output_pack_chunk_size(WIMStruct *wim, uint32_t chunk_size)
 				  &wim->out_pack_chunk_size);
 }
 
+WIMLIBAPI void
+wimlib_register_progress_function(WIMStruct *wim,
+				  wimlib_progress_func_t progfunc,
+				  void *progctx)
+{
+	wim->progfunc = progfunc;
+	wim->progctx = progctx;
+}
+
 static int
 open_wim_file(const tchar *filename, struct filedes *fd_ret)
 {
@@ -547,8 +660,7 @@ open_wim_file(const tchar *filename, struct filedes *fd_ret)
  * lookup table, and optionally checks the integrity.
  */
 static int
-begin_read(WIMStruct *wim, const void *wim_filename_or_fd,
-	   int open_flags, wimlib_progress_func_t progress_func)
+begin_read(WIMStruct *wim, const void *wim_filename_or_fd, int open_flags)
 {
 	int ret;
 	int xml_num_images;
@@ -649,7 +761,7 @@ begin_read(WIMStruct *wim, const void *wim_filename_or_fd,
 	}
 
 	if (open_flags & WIMLIB_OPEN_FLAG_CHECK_INTEGRITY) {
-		ret = check_wim_integrity(wim, progress_func);
+		ret = check_wim_integrity(wim);
 		if (ret == WIM_INTEGRITY_NONEXISTENT) {
 			WARNING("No integrity information for `%"TS"'; skipping "
 				"integrity check.", wimfile);
@@ -697,7 +809,8 @@ begin_read(WIMStruct *wim, const void *wim_filename_or_fd,
 
 int
 open_wim_as_WIMStruct(const void *wim_filename_or_fd, int open_flags,
-		      WIMStruct **wim_ret, wimlib_progress_func_t progress_func)
+		      WIMStruct **wim_ret,
+		      wimlib_progress_func_t progfunc, void *progctx)
 {
 	WIMStruct *wim;
 	int ret;
@@ -716,7 +829,10 @@ open_wim_as_WIMStruct(const void *wim_filename_or_fd, int open_flags,
 	if (wim == NULL)
 		return WIMLIB_ERR_NOMEM;
 
-	ret = begin_read(wim, wim_filename_or_fd, open_flags, progress_func);
+	wim->progfunc = progfunc;
+	wim->progctx = progctx;
+
+	ret = begin_read(wim, wim_filename_or_fd, open_flags);
 	if (ret) {
 		wimlib_free(wim);
 		return ret;
@@ -729,8 +845,9 @@ open_wim_as_WIMStruct(const void *wim_filename_or_fd, int open_flags,
 
 /* API function documented in wimlib.h  */
 WIMLIBAPI int
-wimlib_open_wim(const tchar *wimfile, int open_flags,
-		WIMStruct **wim_ret, wimlib_progress_func_t progress_func)
+wimlib_open_wim_with_progress(const tchar *wimfile, int open_flags,
+			      WIMStruct **wim_ret,
+			      wimlib_progress_func_t progfunc, void *progctx)
 {
 	if (open_flags & ~(WIMLIB_OPEN_FLAG_CHECK_INTEGRITY |
 			   WIMLIB_OPEN_FLAG_ERROR_IF_SPLIT |
@@ -738,110 +855,15 @@ wimlib_open_wim(const tchar *wimfile, int open_flags,
 		return WIMLIB_ERR_INVALID_PARAM;
 
 	return open_wim_as_WIMStruct(wimfile, open_flags, wim_ret,
-				     progress_func);
-}
-
-void
-destroy_image_metadata(struct wim_image_metadata *imd,
-		       struct wim_lookup_table *table,
-		       bool free_metadata_lte)
-{
-	free_dentry_tree(imd->root_dentry, table);
-	imd->root_dentry = NULL;
-	free_wim_security_data(imd->security_data);
-	imd->security_data = NULL;
-
-	if (free_metadata_lte) {
-		free_lookup_table_entry(imd->metadata_lte);
-		imd->metadata_lte = NULL;
-	}
-	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);
-	}
-	INIT_LIST_HEAD(&imd->unhashed_streams);
-	INIT_LIST_HEAD(&imd->inode_list);
-#ifdef WITH_NTFS_3G
-	if (imd->ntfs_vol) {
-		do_ntfs_umount(imd->ntfs_vol);
-		imd->ntfs_vol = NULL;
-	}
-#endif
-}
-
-void
-put_image_metadata(struct wim_image_metadata *imd,
-		   struct wim_lookup_table *table)
-{
-	if (imd && --imd->refcnt == 0) {
-		destroy_image_metadata(imd, table, true);
-		FREE(imd);
-	}
+				     progfunc, progctx);
 }
 
-/* Appends the specified image metadata structure to the array of image metadata
- * for a WIM, and increments the image count. */
-int
-append_image_metadata(WIMStruct *wim, struct wim_image_metadata *imd)
-{
-	struct wim_image_metadata **imd_array;
-
-	DEBUG("Reallocating image metadata array for image_count = %u",
-	      wim->hdr.image_count + 1);
-	imd_array = REALLOC(wim->image_metadata,
-			    sizeof(wim->image_metadata[0]) * (wim->hdr.image_count + 1));
-
-	if (imd_array == NULL)
-		return WIMLIB_ERR_NOMEM;
-	wim->image_metadata = imd_array;
-	imd_array[wim->hdr.image_count++] = imd;
-	return 0;
-}
-
-
-struct wim_image_metadata *
-new_image_metadata(void)
+/* API function documented in wimlib.h  */
+WIMLIBAPI int
+wimlib_open_wim(const tchar *wimfile, int open_flags, WIMStruct **wim_ret)
 {
-	struct wim_image_metadata *imd;
-
-	imd = CALLOC(1, sizeof(*imd));
-	if (imd) {
-		imd->refcnt = 1;
-		INIT_LIST_HEAD(&imd->inode_list);
-		INIT_LIST_HEAD(&imd->unhashed_streams);
-		DEBUG("Created new image metadata (refcnt=1)");
-	} else {
-		ERROR_WITH_ERRNO("Failed to allocate new image metadata structure");
-	}
-	return imd;
-}
-
-struct wim_image_metadata **
-new_image_metadata_array(unsigned num_images)
-{
-	struct wim_image_metadata **imd_array;
-
-	DEBUG("Creating new image metadata array for %u images",
-	      num_images);
-
-	imd_array = CALLOC(num_images, sizeof(imd_array[0]));
-
-	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] == NULL) {
-			for (unsigned j = 0; j < i; j++)
-				put_image_metadata(imd_array[j], NULL);
-			FREE(imd_array);
-			return NULL;
-		}
-	}
-	return imd_array;
+	return wimlib_open_wim_with_progress(wimfile, open_flags, wim_ret,
+					     NULL, NULL);
 }
 
 /* Checksum all streams that are unhashed (other than the metadata streams),
@@ -989,15 +1011,20 @@ wimlib_get_version(void)
 	return WIMLIB_VERSION_CODE;
 }
 
+static bool lib_initialized = false;
+
 /* API function documented in wimlib.h  */
 WIMLIBAPI int
 wimlib_global_init(int init_flags)
 {
-	static bool already_inited = false;
-
-	if (already_inited)
+	if (lib_initialized)
 		return 0;
 
+#ifdef ENABLE_ERROR_MESSAGES
+	if (wimlib_error_file == NULL)
+		wimlib_error_file = stderr;
+#endif
+
 	if (init_flags & ~(WIMLIB_INIT_FLAG_ASSUME_UTF8 |
 			   WIMLIB_INIT_FLAG_DONT_ACQUIRE_PRIVILEGES |
 			   WIMLIB_INIT_FLAG_STRICT_CAPTURE_PRIVILEGES |
@@ -1021,12 +1048,13 @@ wimlib_global_init(int init_flags)
 			return ret;
 	}
 #endif
+	iconv_global_init();
 	init_upcase();
 	if (init_flags & WIMLIB_INIT_FLAG_DEFAULT_CASE_SENSITIVE)
 		default_ignore_case = false;
 	else if (init_flags & WIMLIB_INIT_FLAG_DEFAULT_CASE_INSENSITIVE)
 		default_ignore_case = true;
-	already_inited = true;
+	lib_initialized = true;
 	return 0;
 }
 
@@ -1034,6 +1062,8 @@ wimlib_global_init(int init_flags)
 WIMLIBAPI void
 wimlib_global_cleanup(void)
 {
+	if (!lib_initialized)
+		return;
 	libxml_global_cleanup();
 	iconv_global_cleanup();
 #ifdef __WIN32__
@@ -1041,4 +1071,7 @@ wimlib_global_cleanup(void)
 #endif
 	cleanup_decompressor_params();
 	cleanup_compressor_params();
+
+	wimlib_set_error_file(NULL);
+	lib_initialized = false;
 }