X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fwim.c;h=97bb92a25cfe613ba44669af72ec7a48b9653b3b;hp=9ddaddbeab35cdee1e0a8a2f7d90def0c84dec68;hb=b072e7cbca1ccb874e22aa94e3efae37ce211939;hpb=61db93f82eca3fe9f7676355c709c58cc425a6ad diff --git a/src/wim.c b/src/wim.c index 9ddaddbe..97bb92a2 100644 --- a/src/wim.c +++ b/src/wim.c @@ -63,13 +63,6 @@ image_print_metadata(WIMStruct *wim) } -static int -image_print_files(WIMStruct *wim) -{ - return for_dentry_in_tree(wim_root_dentry(wim), print_dentry_full_path, - NULL); -} - static WIMStruct * new_wim_struct(void) { @@ -78,6 +71,7 @@ new_wim_struct(void) wim->in_fd.fd = -1; wim->out_fd.fd = -1; } + INIT_LIST_HEAD(&wim->subwims); return wim; } @@ -174,9 +168,11 @@ select_wim_image(WIMStruct *wim, int image) return WIMLIB_ERR_INVALID_IMAGE; } - if (wim->hdr.part_number != 1) { - ERROR("Cannot select an image from a non-first part of a split WIM"); - return WIMLIB_ERR_SPLIT_UNSUPPORTED; + if (!wim_has_metadata(wim)) { + ERROR("\"%"TS"\" does not contain metadata resources!", wim->filename); + if (wim->hdr.part_number != 1) + ERROR("Specify the first part of the split WIM instead."); + return WIMLIB_ERR_METADATA_NOT_FOUND; } /* If a valid image is currently selected, it can be freed if it is not @@ -252,33 +248,6 @@ wimlib_resolve_image(WIMStruct *wim, const tchar *image_name_or_num) } } -/* API function documented in wimlib.h */ -WIMLIBAPI void -wimlib_print_wim_information(const WIMStruct *wim) -{ - struct wimlib_wim_info info; - - wimlib_get_wim_info((WIMStruct*)wim, &info); - - tputs(T("WIM Information:")); - tputs(T("----------------")); - tprintf(T("Path: %"TS"\n"), wim->filename); - tfputs(T("GUID: 0x"), stdout); - print_byte_field(info.guid, WIM_GID_LEN, stdout); - tputchar(T('\n')); - tprintf(T("Image Count: %d\n"), info.image_count); - tprintf(T("Compression: %"TS"\n"), - wimlib_get_compression_type_string(info.compression_type)); - tprintf(T("Part Number: %d/%d\n"), info.part_number, info.total_parts); - tprintf(T("Boot Index: %d\n"), info.boot_index); - tprintf(T("Size: %"PRIu64" bytes\n"), info.total_bytes); - tprintf(T("Integrity Info: %"TS"\n"), - info.has_integrity_table ? T("yes") : T("no")); - tprintf(T("Relative path junction: %"TS"\n"), - info.has_rpfix ? T("yes") : T("no")); - tputchar(T('\n')); -} - /* API function documented in wimlib.h */ WIMLIBAPI void wimlib_print_available_images(const WIMStruct *wim, int image) @@ -312,28 +281,9 @@ wimlib_print_available_images(const WIMStruct *wim, int image) WIMLIBAPI int wimlib_print_metadata(WIMStruct *wim, int image) { - if (wim->hdr.part_number != 1) { - ERROR("Cannot show the metadata from part %hu of a %hu-part split WIM!", - wim->hdr.part_number, wim->hdr.total_parts); - ERROR("Select the first part of the split WIM to see the metadata."); - return WIMLIB_ERR_SPLIT_UNSUPPORTED; - } return for_image(wim, image, image_print_metadata); } -/* API function documented in wimlib.h */ -WIMLIBAPI int -wimlib_print_files(WIMStruct *wim, int image) -{ - if (wim->hdr.part_number != 1) { - ERROR("Cannot list the files from part %hu of a %hu-part split WIM!", - wim->hdr.part_number, wim->hdr.total_parts); - ERROR("Select the first part of the split WIM if you'd like to list the files."); - return WIMLIB_ERR_SPLIT_UNSUPPORTED; - } - return for_image(wim, image, image_print_files); -} - /* API function documented in wimlib.h */ WIMLIBAPI int wimlib_get_wim_info(WIMStruct *wim, struct wimlib_wim_info *info) @@ -363,59 +313,6 @@ wimlib_get_wim_info(WIMStruct *wim, struct wimlib_wim_info *info) return 0; } - -/* API function documented in wimlib.h */ -WIMLIBAPI int -wimlib_get_boot_idx(const WIMStruct *wim) -{ - struct wimlib_wim_info info; - - wimlib_get_wim_info((WIMStruct*)wim, &info); - return info.boot_index; -} - -/* API function documented in wimlib.h */ -WIMLIBAPI int -wimlib_get_compression_type(const WIMStruct *wim) -{ - struct wimlib_wim_info info; - - wimlib_get_wim_info((WIMStruct*)wim, &info); - return info.compression_type; -} - -/* API function documented in wimlib.h */ -WIMLIBAPI int -wimlib_get_num_images(const WIMStruct *wim) -{ - struct wimlib_wim_info info; - - wimlib_get_wim_info((WIMStruct*)wim, &info); - return info.image_count; -} - -/* API function documented in wimlib.h */ -WIMLIBAPI int -wimlib_get_part_number(const WIMStruct *wim, int *total_parts_ret) -{ - struct wimlib_wim_info info; - - wimlib_get_wim_info((WIMStruct*)wim, &info); - if (total_parts_ret) - *total_parts_ret = info.total_parts; - return info.part_number; -} - -/* API function documented in wimlib.h */ -WIMLIBAPI bool -wimlib_has_integrity_table(const WIMStruct *wim) -{ - struct wimlib_wim_info info; - - wimlib_get_wim_info((WIMStruct*)wim, &info); - return info.has_integrity_table; -} - /* API function documented in wimlib.h */ WIMLIBAPI int wimlib_set_wim_info(WIMStruct *wim, const struct wimlib_wim_info *info, int which) @@ -436,8 +333,10 @@ wimlib_set_wim_info(WIMStruct *wim, const struct wimlib_wim_info *info, int whic if (ret) return ret; - if (which & WIMLIB_CHANGE_GUID) + if (which & WIMLIB_CHANGE_GUID) { memcpy(wim->hdr.guid, info->guid, WIM_GID_LEN); + wim->guid_set_explicitly = 1; + } if (which & WIMLIB_CHANGE_BOOT_INDEX) { if (info->boot_index > wim->hdr.image_count) { @@ -457,16 +356,6 @@ wimlib_set_wim_info(WIMStruct *wim, const struct wimlib_wim_info *info, int whic return 0; } -/* API function documented in wimlib.h */ -WIMLIBAPI int -wimlib_set_boot_idx(WIMStruct *wim, int boot_idx) -{ - struct wimlib_wim_info info; - - info.boot_index = boot_idx; - return wimlib_set_wim_info(wim, &info, WIMLIB_CHANGE_BOOT_INDEX); -} - static int do_open_wim(const tchar *filename, struct filedes *fd_ret) { @@ -559,11 +448,9 @@ begin_read(WIMStruct *wim, const void *wim_filename_or_fd, return ret; } - if (wim->hdr.total_parts != 1 && !(open_flags & WIMLIB_OPEN_FLAG_SPLIT_OK)) { - ERROR("\"%"TS"\": This WIM is part %u of a %u-part WIM", - wimfile, wim->hdr.part_number, wim->hdr.total_parts); - return WIMLIB_ERR_SPLIT_UNSUPPORTED; - } + if ((open_flags & WIMLIB_OPEN_FLAG_ERROR_IF_SPLIT) && + (wim->hdr.total_parts != 1)) + return WIMLIB_ERR_IS_SPLIT_WIM; DEBUG("According to header, WIM contains %u images", wim->hdr.image_count); @@ -793,6 +680,9 @@ int wim_checksum_unhashed_streams(WIMStruct *wim) { int ret; + + if (!wim_has_metadata(wim)) + return 0; for (int i = 0; i < wim->hdr.image_count; i++) { struct wim_lookup_table_entry *lte, *tmp; struct wim_image_metadata *imd = wim->image_metadata[i]; @@ -825,7 +715,7 @@ can_modify_wim(WIMStruct *wim) } } if (wim->hdr.total_parts != 1) { - ERROR("Cannot modify \"%"TS"\": is part of a spanned set", + ERROR("Cannot modify \"%"TS"\": is part of a split WIM", wim->filename); return WIMLIB_ERR_WIM_IS_READONLY; } @@ -865,14 +755,26 @@ can_delete_from_wim(WIMStruct *wim) WIMLIBAPI void wimlib_free(WIMStruct *wim) { - DEBUG("Freeing WIMStruct"); - if (!wim) return; - if (wim->in_fd.fd != -1) - close(wim->in_fd.fd); - if (wim->out_fd.fd != -1) - close(wim->out_fd.fd); + + DEBUG("Freeing WIMStruct (filename=\"%"TS"\", image_count=%u)", + wim->filename, wim->hdr.image_count); + + while (!list_empty(&wim->subwims)) { + WIMStruct *subwim; + + subwim = list_entry(wim->subwims.next, WIMStruct, subwim_node); + list_del(&subwim->subwim_node); + DEBUG("Freeing subwim."); + wimlib_free(subwim); + } + + if (filedes_valid(&wim->in_fd)) + filedes_close(&wim->in_fd); + if (filedes_valid(&wim->out_fd)) + filedes_close(&wim->out_fd); + free_lookup_table(wim->lookup_table); @@ -884,7 +786,6 @@ wimlib_free(WIMStruct *wim) FREE(wim->image_metadata); } FREE(wim); - DEBUG("Freed WIMStruct"); } static bool @@ -907,6 +808,7 @@ WIMLIBAPI int wimlib_global_init(int init_flags) { static bool already_inited = false; + int ret; if (already_inited) return 0; @@ -919,10 +821,14 @@ wimlib_global_init(int init_flags) #endif } #ifdef __WIN32__ - win32_global_init(); + ret = win32_global_init(init_flags); + if (ret) + return ret; +#else + ret = 0; #endif already_inited = true; - return 0; + return ret; } /* API function documented in wimlib.h */