X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwim.c;h=292f4cd7b92622c8e2583c2389ed2d956d1c8799;hb=f95716e01e9237f722b52edfff5638755ace3007;hp=f118e793086774c289eddd9bbf607b0f5caefd9e;hpb=66e2060915368055778438e3cacacee611a4b162;p=wimlib

diff --git a/src/wim.c b/src/wim.c
index f118e793..292f4cd7 100644
--- a/src/wim.c
+++ b/src/wim.c
@@ -40,6 +40,7 @@
 #include "wimlib/xml.h"
 #include "wimlib/compressor_ops.h"
 #include "wimlib/decompressor_ops.h"
+#include "wimlib/version.h"
 
 #ifdef __WIN32__
 #  include "wimlib/win32.h" /* for realpath() replacement */
@@ -55,15 +56,6 @@
 #include <stdlib.h>
 #include <unistd.h>
 
-static int
-image_print_metadata(WIMStruct *wim)
-{
-	DEBUG("Printing metadata for image %d", wim->current_image);
-	print_wim_security_data(wim_security_data(wim));
-	return for_dentry_in_tree(wim_root_dentry(wim), print_dentry,
-				  wim->lookup_table);
-}
-
 static int
 wim_default_pack_compression_type(void)
 {
@@ -276,11 +268,6 @@ select_wim_image(WIMStruct *wim, int image)
 	if (imd->root_dentry || imd->modified) {
 		ret = 0;
 	} else {
-		#ifdef ENABLE_DEBUG
-		DEBUG("Reading metadata resource specified by the following "
-		      "lookup table entry:");
-		print_lookup_table_entry(imd->metadata_lte, stderr);
-		#endif
 		ret = read_metadata_resource(wim, imd);
 		if (ret)
 			wim->current_image = WIMLIB_NO_IMAGE;
@@ -364,12 +351,11 @@ wimlib_print_available_images(const WIMStruct *wim, int image)
 		print_image_info(wim->wim_info, i);
 }
 
-
-/* API function documented in wimlib.h  */
+/* TODO: Deprecated; remove this.  */
 WIMLIBAPI int
 wimlib_print_metadata(WIMStruct *wim, int image)
 {
-	return for_image(wim, image, image_print_metadata);
+	return WIMLIB_ERR_UNSUPPORTED;
 }
 
 /* API function documented in wimlib.h  */
@@ -407,6 +393,12 @@ wimlib_set_wim_info(WIMStruct *wim, const struct wimlib_wim_info *info, int whic
 {
 	int ret;
 
+	if (which & ~(WIMLIB_CHANGE_READONLY_FLAG |
+		      WIMLIB_CHANGE_GUID |
+		      WIMLIB_CHANGE_BOOT_INDEX |
+		      WIMLIB_CHANGE_RPFIX_FLAG))
+		return WIMLIB_ERR_INVALID_PARAM;
+
 	if (which & WIMLIB_CHANGE_READONLY_FLAG) {
 		if (info->is_marked_readonly)
 			wim->hdr.flags |= WIM_HDR_FLAG_READONLY;
@@ -469,7 +461,7 @@ wimlib_set_output_compression_type(WIMStruct *wim, int ctype)
 		return ret;
 
 	/* Reset the chunk size if it's no longer valid.  */
-	if (!wim_chunk_size_valid(ctype, wim->out_chunk_size))
+	if (!wim_chunk_size_valid(wim->out_chunk_size, ctype))
 		wim->out_chunk_size = wim_default_chunk_size(ctype);
 	return 0;
 }
@@ -483,7 +475,7 @@ wimlib_set_output_pack_compression_type(WIMStruct *wim, int ctype)
 		return ret;
 
 	/* Reset the chunk size if it's no longer valid.  */
-	if (!wim_chunk_size_valid(ctype, wim->out_pack_chunk_size))
+	if (!wim_chunk_size_valid(wim->out_pack_chunk_size, ctype))
 		wim->out_pack_chunk_size = wim_default_pack_chunk_size(ctype);
 	return 0;
 }
@@ -736,7 +728,11 @@ WIMLIBAPI int
 wimlib_open_wim(const tchar *wimfile, int open_flags,
 		WIMStruct **wim_ret, wimlib_progress_func_t progress_func)
 {
-	open_flags &= WIMLIB_OPEN_MASK_PUBLIC;
+	if (open_flags & ~(WIMLIB_OPEN_FLAG_CHECK_INTEGRITY |
+			   WIMLIB_OPEN_FLAG_ERROR_IF_SPLIT |
+			   WIMLIB_OPEN_FLAG_WRITE_ACCESS))
+		return WIMLIB_ERR_INVALID_PARAM;
+
 	return open_wim_as_WIMStruct(wimfile, open_flags, wim_ret,
 				     progress_func);
 }
@@ -982,6 +978,13 @@ test_locale_ctype_utf8(void)
 #endif
 }
 
+/* API function documented in wimlib.h  */
+WIMLIBAPI u32
+wimlib_get_version(void)
+{
+	return WIMLIB_VERSION_CODE;
+}
+
 /* API function documented in wimlib.h  */
 WIMLIBAPI int
 wimlib_global_init(int init_flags)
@@ -990,6 +993,15 @@ wimlib_global_init(int init_flags)
 
 	if (already_inited)
 		return 0;
+
+	if (init_flags & ~(WIMLIB_INIT_FLAG_ASSUME_UTF8 |
+			   WIMLIB_INIT_FLAG_DONT_ACQUIRE_PRIVILEGES |
+			   WIMLIB_INIT_FLAG_STRICT_CAPTURE_PRIVILEGES |
+			   WIMLIB_INIT_FLAG_STRICT_APPLY_PRIVILEGES |
+			   WIMLIB_INIT_FLAG_DEFAULT_CASE_SENSITIVE |
+			   WIMLIB_INIT_FLAG_DEFAULT_CASE_INSENSITIVE))
+		return WIMLIB_ERR_INVALID_PARAM;
+
 	libxml_global_init();
 	if (!(init_flags & WIMLIB_INIT_FLAG_ASSUME_UTF8)) {
 		wimlib_mbs_is_utf8 = test_locale_ctype_utf8();