X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fwim.c;h=ce55444b233372117118411b8f869593002d1ded;hb=66886005209df72f53d0921cb32be6b13500e287;hp=b36da84f2adb2196642d210c9436dfcd5a258f77;hpb=5ab0691733e0724ba5cd73bd4f9c0963cfe1d276;p=wimlib diff --git a/src/wim.c b/src/wim.c index b36da84f..ce55444b 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 #include -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) { @@ -138,8 +130,9 @@ wim_chunk_size_valid(u32 chunk_size, int ctype) return order >= 15 && order <= 21; case WIMLIB_COMPRESSION_TYPE_XPRESS: + return order >= 12 && order <= 26; case WIMLIB_COMPRESSION_TYPE_LZMS: - return order >= 15 && order <= 26; + return order >= 15 && order <= 30; } return false; } @@ -232,6 +225,8 @@ 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. */ int select_wim_image(WIMStruct *wim, int image) { @@ -261,8 +256,8 @@ select_wim_image(WIMStruct *wim, int image) return WIMLIB_ERR_METADATA_NOT_FOUND; } - /* If a valid image is currently selected, it can be freed if it is not - * modified. */ + /* If a valid image is currently selected, its metadata can be freed if + * it has not been modified. */ if (wim->current_image != WIMLIB_NO_IMAGE) { imd = wim_get_current_image_metadata(wim); if (!imd->modified) { @@ -276,11 +271,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,14 +354,6 @@ wimlib_print_available_images(const WIMStruct *wim, int image) print_image_info(wim->wim_info, i); } - -/* API function documented in wimlib.h */ -WIMLIBAPI int -wimlib_print_metadata(WIMStruct *wim, int image) -{ - return for_image(wim, image, image_print_metadata); -} - /* API function documented in wimlib.h */ WIMLIBAPI int wimlib_get_wim_info(WIMStruct *wim, struct wimlib_wim_info *info) @@ -407,6 +389,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 +457,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 +471,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; } @@ -534,7 +522,7 @@ wimlib_set_output_pack_chunk_size(WIMStruct *wim, uint32_t chunk_size) } static int -do_open_wim(const tchar *filename, struct filedes *fd_ret) +open_wim_file(const tchar *filename, struct filedes *fd_ret) { int raw_fd; @@ -547,23 +535,6 @@ do_open_wim(const tchar *filename, struct filedes *fd_ret) return 0; } -int -reopen_wim(WIMStruct *wim) -{ - wimlib_assert(!filedes_valid(&wim->in_fd)); - return do_open_wim(wim->filename, &wim->in_fd); -} - -int -close_wim(WIMStruct *wim) -{ - if (filedes_valid(&wim->in_fd)) { - filedes_close(&wim->in_fd); - filedes_invalidate(&wim->in_fd); - } - return 0; -} - /* * Begins the reading of a WIM file; opens the file and reads its header and * lookup table, and optionally checks the integrity. @@ -582,7 +553,7 @@ begin_read(WIMStruct *wim, const void *wim_filename_or_fd, wim->in_fd.is_pipe = 1; } else { wimfile = wim_filename_or_fd; - ret = do_open_wim(wimfile, &wim->in_fd); + ret = open_wim_file(wimfile, &wim->in_fd); if (ret) return ret; @@ -643,7 +614,8 @@ begin_read(WIMStruct *wim, const void *wim_filename_or_fd, if (wim->hdr.flags & WIM_HDR_FLAG_COMPRESSION) { if (wim->hdr.flags & WIM_HDR_FLAG_COMPRESS_LZX) { wim->compression_type = WIMLIB_COMPRESSION_TYPE_LZX; - } else if (wim->hdr.flags & WIM_HDR_FLAG_COMPRESS_XPRESS) { + } else if (wim->hdr.flags & (WIM_HDR_FLAG_COMPRESS_XPRESS | + WIM_HDR_FLAG_COMPRESS_XPRESS_2)) { wim->compression_type = WIMLIB_COMPRESSION_TYPE_XPRESS; } else if (wim->hdr.flags & WIM_HDR_FLAG_COMPRESS_LZMS) { wim->compression_type = WIMLIB_COMPRESSION_TYPE_LZMS; @@ -753,7 +725,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); } @@ -999,6 +975,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) @@ -1007,6 +990,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();