X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fwim.c;h=2907cd31c42f933b03067f10e61cad86954d0a51;hp=4060fa581d4cbf0ebf0146af7f3cd67b5f5667cd;hb=4d9794d1f1a6044c261faae0968af1b2c0480f4b;hpb=f3e97b29c4a8c564d54b0fd11cd43a9b4cd6a8ad diff --git a/src/wim.c b/src/wim.c index 4060fa58..2907cd31 100644 --- a/src/wim.c +++ b/src/wim.c @@ -5,8 +5,6 @@ /* * Copyright (C) 2012, 2013 Eric Biggers * - * wimlib - Library for working with WIM files - * * This file is part of wimlib, a library for working with WIM files. * * wimlib is free software; you can redistribute it and/or modify it under the @@ -23,37 +21,43 @@ * along with wimlib; if not, see http://www.gnu.org/licenses/. */ -#include "config.h" - -#include -#include -#include -#include -#include -#include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif +#include "wimlib/error.h" +#include "wimlib/dentry.h" +#include "wimlib/encoding.h" +#include "wimlib/file_io.h" +#include "wimlib/integrity.h" +#include "wimlib/lookup_table.h" +#include "wimlib/metadata.h" #ifdef WITH_NTFS_3G -# include -# include +# include "wimlib/ntfs_3g.h" /* for do_ntfs_umount() */ #endif +#include "wimlib/security.h" +#include "wimlib/wim.h" +#include "wimlib/xml.h" #ifdef __WIN32__ -# include "win32.h" -#else -# include +# include "wimlib/win32.h" /* for realpath() replacement */ #endif -#include "buffer_io.h" -#include "dentry.h" -#include "lookup_table.h" -#include "wimlib_internal.h" -#include "xml.h" +#include +#include +#ifndef __WIN32__ +# include +#endif +#include +#include +#include +#include static int image_print_metadata(WIMStruct *w) { DEBUG("Printing metadata for image %d", w->current_image); - print_security_data(wim_security_data(w)); + print_wim_security_data(wim_security_data(w)); return for_dentry_in_tree(wim_root_dentry(w), print_dentry, w->lookup_table); } @@ -67,18 +71,14 @@ image_print_files(WIMStruct *w) } static WIMStruct * -new_wim_struct() +new_wim_struct(void) { WIMStruct *w = CALLOC(1, sizeof(WIMStruct)); -#ifdef WITH_FUSE - if (pthread_mutex_init(&w->fp_tab_mutex, NULL) != 0) { - ERROR_WITH_ERRNO("Failed to initialize mutex"); - FREE(w); - w = NULL; + if (w) { + w->in_fd = -1; + w->out_fd = -1; } -#endif return w; - } /* @@ -206,7 +206,7 @@ select_wim_image(WIMStruct *w, int image) } w->current_image = image; imd = wim_get_current_image_metadata(w); - if (imd->root_dentry) { + if (imd->root_dentry || imd->modified) { ret = 0; } else { #ifdef ENABLE_DEBUG @@ -299,6 +299,8 @@ wimlib_print_wim_information(const WIMStruct *w) wim_info_get_total_bytes(w->wim_info)); tprintf(T("Integrity Info: %"TS"\n"), (w->hdr.integrity.offset != 0) ? T("yes") : T("no")); + tprintf(T("Relative path junction: %"TS"\n"), + (hdr->flags & WIM_HDR_FLAG_RP_FIX) ? T("yes") : T("no")); tputchar(T('\n')); } @@ -391,6 +393,37 @@ wimlib_get_boot_idx(const WIMStruct *w) return w->hdr.boot_idx; } +static int +do_open_wim(const tchar *filename, int *fd_ret) +{ + int fd; + + fd = topen(filename, O_RDONLY | O_BINARY); + if (fd == -1) { + ERROR_WITH_ERRNO("Can't open \"%"TS"\" read-only", filename); + return WIMLIB_ERR_OPEN; + } + *fd_ret = fd; + return 0; +} + +int +reopen_wim(WIMStruct *w) +{ + wimlib_assert(w->in_fd == -1); + return do_open_wim(w->filename, &w->in_fd); +} + +int +close_wim(WIMStruct *w) +{ + if (w->in_fd != -1) { + close(w->in_fd); + w->in_fd = -1; + } + return 0; +} + /* * Begins the reading of a WIM file; opens the file and reads its header and * lookup table, and optionally checks the integrity. @@ -404,12 +437,9 @@ begin_read(WIMStruct *w, const tchar *in_wim_path, int open_flags, DEBUG("Reading the WIM file `%"TS"'", in_wim_path); - w->fp = tfopen(in_wim_path, T("rb")); - if (!w->fp) { - ERROR_WITH_ERRNO("Failed to open `%"TS"' for reading", - in_wim_path); - return WIMLIB_ERR_OPEN; - } + ret = do_open_wim(in_wim_path, &w->in_fd); + if (ret) + return ret; /* The absolute path to the WIM is requested so that wimlib_overwrite() * still works even if the process changes its working directory. This @@ -432,7 +462,7 @@ begin_read(WIMStruct *w, const tchar *in_wim_path, int open_flags, return WIMLIB_ERR_OPEN; } - ret = read_header(w->fp, &w->hdr, open_flags); + ret = read_header(w->filename, w->in_fd, &w->hdr, open_flags); if (ret) return ret; @@ -475,8 +505,7 @@ begin_read(WIMStruct *w, const tchar *in_wim_path, int open_flags, if (ret) return ret; - ret = read_xml_data(w->fp, &w->hdr.xml_res_entry, - &w->xml_data, &w->wim_info); + ret = read_xml_data(w->in_fd, &w->hdr.xml_res_entry, &w->wim_info); if (ret) return ret; @@ -526,7 +555,7 @@ destroy_image_metadata(struct wim_image_metadata *imd, { free_dentry_tree(imd->root_dentry, table); imd->root_dentry = NULL; - free_security_data(imd->security_data); + free_wim_security_data(imd->security_data); imd->security_data = NULL; if (free_metadata_lte) { @@ -540,6 +569,12 @@ destroy_image_metadata(struct wim_image_metadata *imd, } 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 @@ -573,10 +608,10 @@ append_image_metadata(WIMStruct *w, struct wim_image_metadata *imd) struct wim_image_metadata * -new_image_metadata() +new_image_metadata(void) { struct wim_image_metadata *imd; - + imd = CALLOC(1, sizeof(*imd)); if (imd) { imd->refcnt = 1; @@ -616,6 +651,26 @@ new_image_metadata_array(unsigned num_images) return imd_array; } +/* Checksum all streams that are unhashed (other than the metadata streams), + * merging them into the lookup table as needed. This is a no-op unless the + * library has previously used to add or mount an image using the same + * WIMStruct. */ +int +wim_checksum_unhashed_streams(WIMStruct *w) +{ + int ret; + for (int i = 0; i < w->hdr.image_count; i++) { + struct wim_lookup_table_entry *lte, *tmp; + struct wim_image_metadata *imd = w->image_metadata[i]; + image_for_each_unhashed_stream_safe(lte, tmp, imd) { + ret = hash_unhashed_stream(lte, w->lookup_table, NULL); + if (ret) + return ret; + } + } + return 0; +} + /* Frees the memory for the WIMStruct, including all internal memory; also * closes all files associated with the WIMStruct. */ WIMLIBAPI void @@ -625,43 +680,26 @@ wimlib_free(WIMStruct *w) if (!w) return; - if (w->fp) - fclose(w->fp); - if (w->out_fp) - fclose(w->out_fp); - -#ifdef WITH_FUSE - if (w->fp_tab) { - for (size_t i = 0; i < w->num_allocated_fps; i++) - if (w->fp_tab[i]) - fclose(w->fp_tab[i]); - FREE(w->fp_tab); - } - pthread_mutex_destroy(&w->fp_tab_mutex); -#endif + if (w->in_fd != -1) + close(w->in_fd); + if (w->out_fd != -1) + close(w->out_fd); free_lookup_table(w->lookup_table); FREE(w->filename); - FREE(w->xml_data); free_wim_info(w->wim_info); if (w->image_metadata) { for (unsigned i = 0; i < w->hdr.image_count; i++) put_image_metadata(w->image_metadata[i], NULL); FREE(w->image_metadata); } -#ifdef WITH_NTFS_3G - if (w->ntfs_vol) { - DEBUG("Unmounting NTFS volume"); - ntfs_umount(w->ntfs_vol, FALSE); - } -#endif FREE(w); DEBUG("Freed WIMStruct"); } static bool -test_locale_ctype_utf8() +test_locale_ctype_utf8(void) { #ifdef __WIN32__ return false; @@ -675,16 +713,17 @@ test_locale_ctype_utf8() #endif } -/* Get global memory allocations out of the way, - * single-threaded programs like 'imagex'. */ WIMLIBAPI int -wimlib_global_init() +wimlib_global_init(int init_flags) { libxml_global_init(); -#ifdef WITH_NTFS_3G - libntfs3g_global_init(); -#endif - wimlib_mbs_is_utf8 = test_locale_ctype_utf8(); + if (!(init_flags & WIMLIB_INIT_FLAG_ASSUME_UTF8)) { + wimlib_mbs_is_utf8 = test_locale_ctype_utf8(); + #ifdef WITH_NTFS_3G + if (!wimlib_mbs_is_utf8) + libntfs3g_global_init(); + #endif + } #ifdef __WIN32__ win32_global_init(); #endif @@ -694,7 +733,7 @@ wimlib_global_init() /* Free global memory allocations. Not strictly necessary if the process using * wimlib is just about to exit (as is the case for 'imagex'). */ WIMLIBAPI void -wimlib_global_cleanup() +wimlib_global_cleanup(void) { libxml_global_cleanup(); iconv_global_cleanup();