X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fwim.c;h=292f4cd7b92622c8e2583c2389ed2d956d1c8799;hb=89d02398124cf1c8615a503518f0d62fbc7bbbbb;hp=f4353a1dbf29bc391a78b6b584fdeef37dfca5d5;hpb=9d9c2fe60b5842825002131f4ca926024e6f0038;p=wimlib diff --git a/src/wim.c b/src/wim.c index f4353a1d..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 #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) { @@ -87,8 +79,8 @@ new_wim_struct(void) { WIMStruct *wim = CALLOC(1, sizeof(WIMStruct)); if (wim) { - wim->in_fd.fd = -1; - wim->out_fd.fd = -1; + filedes_invalidate(&wim->in_fd); + filedes_invalidate(&wim->out_fd); wim->out_pack_compression_type = wim_default_pack_compression_type(); wim->out_pack_chunk_size = wim_default_pack_chunk_size( wim->out_pack_compression_type); @@ -130,30 +122,14 @@ wim_chunk_size_valid(u32 chunk_size, int ctype) * 25 33554432 * 26 67108864 */ + + /* See the documentation for the --chunk-size option of `wimlib-imagex + * capture' for information about allowed chunk sizes. */ switch (ctype) { case WIMLIB_COMPRESSION_TYPE_LZX: - /* For LZX compression, the chunk size corresponds to the LZX - * window size, which according the LZX specification can be any - * power of 2 between 2^15 and 2^21, inclusively. All these are - * supported by wimlib; however, unfortunately only 2^15 is - * supported by WIMGAPI[1] so this value is used by default. - * - * [1] WIMGAPI (Windows 7) attempts to decompress LZX chunk - * sizes > 2^15 but seems to have bug(s) that cause it to fail - * or crash. (I tried several tweaks to the LZX data but none - * resulted in successful decompression.) WIMGAPI (Windows 8) - * appears to refuse to open WIMs with chunk size > 2^15 - * entirely. */ return order >= 15 && order <= 21; case WIMLIB_COMPRESSION_TYPE_XPRESS: - /* WIMGAPI (Windows 7, Windows 8) doesn't seem to support XPRESS - * chunk size below 32768 bytes, but larger power-of-two sizes, - * up ta 67108864 bytes, appear to work. (Note, however, that - * the offsets of XPRESS matches are still limited to 65535 - * bytes even when a much larger chunk size is used!) */ - return order >= 15 && order <= 26; - case WIMLIB_COMPRESSION_TYPE_LZMS: return order >= 15 && order <= 26; } @@ -175,10 +151,10 @@ wim_default_chunk_size(int ctype) } /* - * Calls a function on images in the WIM. If @image is WIMLIB_ALL_IMAGES, @visitor - * is called on the WIM once for each image, with each image selected as the - * current image in turn. If @image is a certain image, @visitor is called on - * the WIM only once, with that image selected. + * Calls a function on images in the WIM. If @image is WIMLIB_ALL_IMAGES, + * @visitor is called on the WIM once for each image, with each image selected + * as the current image in turn. If @image is a certain image, @visitor is + * called on the WIM only once, with that image selected. */ int for_image(WIMStruct *wim, int image, int (*visitor)(WIMStruct *)) @@ -292,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; @@ -380,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 */ @@ -423,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; @@ -485,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; } @@ -499,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; } @@ -550,7 +526,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; @@ -563,23 +539,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. @@ -598,7 +557,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; @@ -769,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); } @@ -1015,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) @@ -1023,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();