/*
- * wim.c - Stuff that doesn't fit into any other file
+ * wim.c - High-level code dealing with WIMStructs and images.
*/
/*
- * Copyright (C) 2012, 2013 Eric Biggers
+ * Copyright (C) 2012, 2013, 2014 Eric Biggers
*
- * This file is part of wimlib, a library for working with WIM files.
+ * This file is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
*
- * wimlib is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 3 of the License, or (at your option)
- * any later version.
- *
- * wimlib is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
* details.
*
- * You should have received a copy of the GNU General Public License
- * along with wimlib; if not, see http://www.gnu.org/licenses/.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this file; if not, see http://www.gnu.org/licenses/.
*/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
-#include "wimlib/error.h"
+#include <errno.h>
+#include <fcntl.h>
+#ifndef __WIN32__
+# include <langinfo.h>
+#endif
+#include <pthread.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include "wimlib.h"
+#include "wimlib/assert.h"
+#include "wimlib/blob_table.h"
+#include "wimlib/bitops.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 "wimlib/ntfs_3g.h" /* for do_ntfs_umount() */
#include "wimlib/security.h"
#include "wimlib/wim.h"
#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 */
#endif
-#include <errno.h>
-#include <fcntl.h>
-#ifndef __WIN32__
-# include <langinfo.h>
-#endif
-#include <limits.h>
-#include <stdarg.h>
-#include <stdlib.h>
-#include <unistd.h>
-
static int
-wim_default_pack_compression_type(void)
+wim_default_solid_compression_type(void)
{
return WIMLIB_COMPRESSION_TYPE_LZMS;
}
static u32
-wim_default_pack_chunk_size(int ctype) {
+wim_default_solid_chunk_size(int ctype) {
switch (ctype) {
case WIMLIB_COMPRESSION_TYPE_LZMS:
- return 1U << 26; /* 67108864 */
+ return (u32)1 << 26; /* 67108864 */
default:
- return 1U << 15; /* 32768 */
+ return (u32)1 << 15; /* 32768 */
}
}
new_wim_struct(void)
{
WIMStruct *wim = CALLOC(1, sizeof(WIMStruct));
- if (wim) {
- 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);
- INIT_LIST_HEAD(&wim->subwims);
- }
+ if (!wim)
+ return NULL;
+
+ filedes_invalidate(&wim->in_fd);
+ filedes_invalidate(&wim->out_fd);
+ wim->out_solid_compression_type = wim_default_solid_compression_type();
+ wim->out_solid_chunk_size = wim_default_solid_chunk_size(
+ wim->out_solid_compression_type);
+ INIT_LIST_HEAD(&wim->subwims);
return wim;
}
/* Chunk size must be power of 2. */
if (chunk_size == 0)
return false;
- order = bsr32(chunk_size);
+ order = fls32(chunk_size);
if (chunk_size != 1U << order)
return false;
switch (ctype) {
case WIMLIB_COMPRESSION_TYPE_LZX:
return order >= 15 && order <= 21;
-
case WIMLIB_COMPRESSION_TYPE_XPRESS:
- return order >= 12 && order <= 26;
+ return order >= 12 && order <= 16;
case WIMLIB_COMPRESSION_TYPE_LZMS:
return order >= 15 && order <= 30;
}
}
}
+static int
+is_blob_in_solid_resource(struct blob_descriptor *blob, void *_ignore)
+{
+ return blob->blob_location == BLOB_IN_WIM &&
+ (blob->rdesc->flags & WIM_RESHDR_FLAG_SOLID);
+}
+
+bool
+wim_has_solid_resources(const WIMStruct *wim)
+{
+ return for_blob_in_table(wim->blob_table, is_blob_in_solid_resource, NULL);
+}
+
/*
* 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
wimlib_create_new_wim(int ctype, WIMStruct **wim_ret)
{
WIMStruct *wim;
- struct wim_lookup_table *table;
int ret;
- wimlib_global_init(WIMLIB_INIT_FLAG_ASSUME_UTF8);
-
- DEBUG("Creating new WIM with %"TS" compression.",
- wimlib_get_compression_type_string(ctype));
+ ret = wimlib_global_init(WIMLIB_INIT_FLAG_ASSUME_UTF8);
+ if (ret)
+ return ret;
- /* Allocate the WIMStruct. */
wim = new_wim_struct();
- if (wim == NULL)
+ if (!wim)
return WIMLIB_ERR_NOMEM;
ret = init_wim_header(&wim->hdr, ctype, wim_default_chunk_size(ctype));
if (ret)
- goto out_free;
+ goto out_free_wim;
- table = new_lookup_table(9001);
- if (table == NULL) {
+ wim->blob_table = new_blob_table(9001);
+ if (!wim->blob_table) {
ret = WIMLIB_ERR_NOMEM;
- goto out_free;
+ goto out_free_wim;
}
- wim->lookup_table = table;
- wim->refcnts_ok = 1;
wim->compression_type = ctype;
wim->out_compression_type = ctype;
wim->chunk_size = wim->hdr.chunk_size;
wim->out_chunk_size = wim->hdr.chunk_size;
*wim_ret = wim;
return 0;
-out_free:
+
+out_free_wim:
FREE(wim);
return ret;
}
static void
destroy_image_metadata(struct wim_image_metadata *imd,
- struct wim_lookup_table *table,
- bool free_metadata_lte)
+ struct blob_table *table,
+ bool free_metadata_blob_descriptor)
{
free_dentry_tree(imd->root_dentry, table);
imd->root_dentry = NULL;
free_wim_security_data(imd->security_data);
imd->security_data = NULL;
- if (free_metadata_lte) {
- free_lookup_table_entry(imd->metadata_lte);
- imd->metadata_lte = NULL;
+ if (free_metadata_blob_descriptor) {
+ free_blob_descriptor(imd->metadata_blob);
+ imd->metadata_blob = NULL;
}
- if (table == NULL) {
- struct wim_lookup_table_entry *lte, *tmp;
- list_for_each_entry_safe(lte, tmp, &imd->unhashed_streams, unhashed_list)
- free_lookup_table_entry(lte);
+ if (!table) {
+ struct blob_descriptor *blob, *tmp;
+ list_for_each_entry_safe(blob, tmp, &imd->unhashed_blobs, unhashed_list)
+ free_blob_descriptor(blob);
}
- INIT_LIST_HEAD(&imd->unhashed_streams);
+ INIT_LIST_HEAD(&imd->unhashed_blobs);
INIT_LIST_HEAD(&imd->inode_list);
#ifdef WITH_NTFS_3G
if (imd->ntfs_vol) {
}
void
-put_image_metadata(struct wim_image_metadata *imd,
- struct wim_lookup_table *table)
+put_image_metadata(struct wim_image_metadata *imd, struct blob_table *table)
{
if (imd && --imd->refcnt == 0) {
destroy_image_metadata(imd, table, true);
{
struct wim_image_metadata **imd_array;
- DEBUG("Reallocating image metadata array for image_count = %u",
- wim->hdr.image_count + 1);
imd_array = REALLOC(wim->image_metadata,
sizeof(wim->image_metadata[0]) * (wim->hdr.image_count + 1));
- if (imd_array == NULL)
+ if (!imd_array)
return WIMLIB_ERR_NOMEM;
wim->image_metadata = imd_array;
imd_array[wim->hdr.image_count++] = imd;
if (imd) {
imd->refcnt = 1;
INIT_LIST_HEAD(&imd->inode_list);
- INIT_LIST_HEAD(&imd->unhashed_streams);
- DEBUG("Created new image metadata (refcnt=1)");
- } else {
- ERROR_WITH_ERRNO("Failed to allocate new image metadata structure");
+ INIT_LIST_HEAD(&imd->unhashed_blobs);
}
return imd;
}
{
struct wim_image_metadata **imd_array;
- DEBUG("Creating new image metadata array for %u images",
- num_images);
-
imd_array = CALLOC(num_images, sizeof(imd_array[0]));
- if (imd_array == NULL) {
- ERROR("Failed to allocate memory for %u image metadata structures",
- num_images);
+ if (!imd_array)
return NULL;
- }
for (unsigned i = 0; i < num_images; i++) {
imd_array[i] = new_image_metadata();
- if (imd_array[i] == NULL) {
+ if (unlikely(!imd_array[i])) {
for (unsigned j = 0; j < i; j++)
put_image_metadata(imd_array[j], NULL);
FREE(imd_array);
struct wim_image_metadata *imd;
int ret;
- DEBUG("Selecting image %d", image);
-
- if (image == WIMLIB_NO_IMAGE) {
- ERROR("Invalid image: %d", WIMLIB_NO_IMAGE);
+ if (image == WIMLIB_NO_IMAGE)
return WIMLIB_ERR_INVALID_IMAGE;
- }
if (image == wim->current_image)
return 0;
- if (image < 1 || image > wim->hdr.image_count) {
- ERROR("Cannot select image %d: There are only %u images",
- image, wim->hdr.image_count);
+ if (image < 1 || image > wim->hdr.image_count)
return WIMLIB_ERR_INVALID_IMAGE;
- }
- 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.");
+ if (!wim_has_metadata(wim))
return WIMLIB_ERR_METADATA_NOT_FOUND;
- }
/* 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) {
- wimlib_assert(list_empty(&imd->unhashed_streams));
- DEBUG("Freeing image %u", wim->current_image);
- destroy_image_metadata(imd, NULL, false);
- }
- }
+ deselect_current_wim_image(wim);
wim->current_image = image;
imd = wim_get_current_image_metadata(wim);
if (imd->root_dentry || imd->modified) {
ret = 0;
} else {
- ret = read_metadata_resource(wim, imd);
+ ret = read_metadata_resource(imd);
if (ret)
wim->current_image = WIMLIB_NO_IMAGE;
}
return ret;
}
+void
+deselect_current_wim_image(WIMStruct *wim)
+{
+ struct wim_image_metadata *imd;
+ if (wim->current_image == WIMLIB_NO_IMAGE)
+ return;
+ imd = wim_get_current_image_metadata(wim);
+ if (!imd->modified) {
+ wimlib_assert(list_empty(&imd->unhashed_blobs));
+ destroy_image_metadata(imd, NULL, false);
+ }
+ wim->current_image = WIMLIB_NO_IMAGE;
+}
/* API function documented in wimlib.h */
WIMLIBAPI const tchar *
wimlib_get_compression_type_string(int ctype)
{
switch (ctype) {
- case WIMLIB_COMPRESSION_TYPE_NONE:
- return T("None");
- case WIMLIB_COMPRESSION_TYPE_LZX:
- return T("LZX");
- case WIMLIB_COMPRESSION_TYPE_XPRESS:
- return T("XPRESS");
- case WIMLIB_COMPRESSION_TYPE_LZMS:
- return T("LZMS");
- default:
- return T("Invalid");
+ case WIMLIB_COMPRESSION_TYPE_NONE:
+ return T("None");
+ case WIMLIB_COMPRESSION_TYPE_XPRESS:
+ return T("XPRESS");
+ case WIMLIB_COMPRESSION_TYPE_LZX:
+ return T("LZX");
+ case WIMLIB_COMPRESSION_TYPE_LZMS:
+ return T("LZMS");
+ default:
+ return T("Invalid");
}
}
WIMLIBAPI int
wimlib_set_wim_info(WIMStruct *wim, const struct wimlib_wim_info *info, int which)
{
- 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_BOOT_INDEX) &&
+ info->boot_index > wim->hdr.image_count)
+ return WIMLIB_ERR_INVALID_IMAGE;
+
if (which & WIMLIB_CHANGE_READONLY_FLAG) {
if (info->is_marked_readonly)
wim->hdr.flags |= WIM_HDR_FLAG_READONLY;
wim->hdr.flags &= ~WIM_HDR_FLAG_READONLY;
}
- if ((which & ~WIMLIB_CHANGE_READONLY_FLAG) == 0)
- return 0;
-
- ret = can_modify_wim(wim);
- if (ret)
- return ret;
-
if (which & WIMLIB_CHANGE_GUID)
memcpy(wim->hdr.guid, info->guid, WIM_GUID_LEN);
- if (which & WIMLIB_CHANGE_BOOT_INDEX) {
- if (info->boot_index > wim->hdr.image_count) {
- ERROR("%u is not 0 or a valid image in the WIM to mark as bootable",
- info->boot_index);
- return WIMLIB_ERR_INVALID_IMAGE;
- }
+ if (which & WIMLIB_CHANGE_BOOT_INDEX)
wim->hdr.boot_idx = info->boot_index;
- }
if (which & WIMLIB_CHANGE_RPFIX_FLAG) {
if (info->has_rpfix)
WIMLIBAPI int
wimlib_set_output_pack_compression_type(WIMStruct *wim, int ctype)
{
- int ret = set_out_ctype(ctype, &wim->out_pack_compression_type);
+ int ret = set_out_ctype(ctype, &wim->out_solid_compression_type);
if (ret)
return ret;
/* Reset the chunk size if it's no longer valid. */
- if (!wim_chunk_size_valid(wim->out_pack_chunk_size, ctype))
- wim->out_pack_chunk_size = wim_default_pack_chunk_size(ctype);
+ if (!wim_chunk_size_valid(wim->out_solid_chunk_size, ctype))
+ wim->out_solid_chunk_size = wim_default_solid_chunk_size(ctype);
return 0;
}
static int
set_out_chunk_size(u32 chunk_size, int ctype, u32 *out_chunk_size_p)
{
- if (!wim_chunk_size_valid(chunk_size, ctype)) {
- ERROR("Invalid chunk size (%"PRIu32" bytes) "
- "for compression type %"TS"!",
- chunk_size,
- wimlib_get_compression_type_string(ctype));
+ if (!wim_chunk_size_valid(chunk_size, ctype))
return WIMLIB_ERR_INVALID_CHUNK_SIZE;
- }
*out_chunk_size_p = chunk_size;
return 0;
wimlib_set_output_pack_chunk_size(WIMStruct *wim, uint32_t chunk_size)
{
if (chunk_size == 0) {
- wim->out_pack_chunk_size =
- wim_default_pack_chunk_size(wim->out_pack_compression_type);
+ wim->out_solid_chunk_size =
+ wim_default_solid_chunk_size(wim->out_solid_compression_type);
return 0;
}
return set_out_chunk_size(chunk_size,
- wim->out_pack_compression_type,
- &wim->out_pack_chunk_size);
+ wim->out_solid_compression_type,
+ &wim->out_solid_chunk_size);
}
WIMLIBAPI void
/*
* Begins the reading of a WIM file; opens the file and reads its header and
- * lookup table, and optionally checks the integrity.
+ * blob table, and optionally checks the integrity.
*/
static int
begin_read(WIMStruct *wim, const void *wim_filename_or_fd, int open_flags)
* replacement function in win32_replacements.c.
*/
wim->filename = realpath(wimfile, NULL);
- if (wim->filename == NULL) {
- ERROR_WITH_ERRNO("Failed to resolve WIM filename");
+ if (!wim->filename) {
+ ERROR_WITH_ERRNO("Failed to get full path to file "
+ "\"%"TS"\"", wimfile);
if (errno == ENOMEM)
return WIMLIB_ERR_NOMEM;
else
- return WIMLIB_ERR_OPEN;
+ return WIMLIB_ERR_NO_FILENAME;
}
}
(wim->hdr.total_parts != 1))
return WIMLIB_ERR_IS_SPLIT_WIM;
- DEBUG("According to header, WIM contains %u images", wim->hdr.image_count);
-
/* If the boot index is invalid, print a warning and set it to 0 */
if (wim->hdr.boot_idx > wim->hdr.image_count) {
- WARNING("In `%"TS"', image %u is marked as bootable, "
- "but there are only %u images in the WIM",
- wimfile, wim->hdr.boot_idx, wim->hdr.image_count);
+ WARNING("Ignoring invalid boot index.");
wim->hdr.boot_idx = 0;
}
} else if (wim->hdr.flags & WIM_HDR_FLAG_COMPRESS_LZMS) {
wim->compression_type = WIMLIB_COMPRESSION_TYPE_LZMS;
} else {
- ERROR("The compression flag is set on \"%"TS"\", but "
- "a flag for a recognized format is not",
- wimfile);
return WIMLIB_ERR_INVALID_COMPRESSION_TYPE;
}
} else {
wim->out_chunk_size = wim->chunk_size;
if (!wim_chunk_size_valid(wim->chunk_size, wim->compression_type)) {
ERROR("Invalid chunk size (%"PRIu32" bytes) "
- "for compression type %"TS"!",
- wim->chunk_size,
+ "for compression type %"TS"!", wim->chunk_size,
wimlib_get_compression_type_string(wim->compression_type));
return WIMLIB_ERR_INVALID_CHUNK_SIZE;
}
if (open_flags & WIMLIB_OPEN_FLAG_CHECK_INTEGRITY) {
ret = check_wim_integrity(wim);
if (ret == WIM_INTEGRITY_NONEXISTENT) {
- WARNING("No integrity information for `%"TS"'; skipping "
- "integrity check.", wimfile);
+ WARNING("\"%"TS"\" does not contain integrity "
+ "information. Skipping integrity check.",
+ wimfile);
} else if (ret == WIM_INTEGRITY_NOT_OK) {
- ERROR("WIM is not intact! (Failed integrity check)");
return WIMLIB_ERR_INTEGRITY;
} else if (ret != WIM_INTEGRITY_OK) {
return ret;
if (wim->hdr.image_count != 0 && wim->hdr.part_number == 1) {
wim->image_metadata = new_image_metadata_array(wim->hdr.image_count);
- if (wim->image_metadata == NULL)
+ if (!wim->image_metadata)
return WIMLIB_ERR_NOMEM;
}
if (open_flags & WIMLIB_OPEN_FLAG_FROM_PIPE) {
- wim->lookup_table = new_lookup_table(9001);
- if (wim->lookup_table == NULL)
+ wim->blob_table = new_blob_table(9001);
+ if (!wim->blob_table)
return WIMLIB_ERR_NOMEM;
} else {
xml_num_images = wim_info_get_num_images(wim->wim_info);
if (xml_num_images != wim->hdr.image_count) {
- ERROR("In the file `%"TS"', there are %u <IMAGE> elements "
- "in the XML data,", wimfile, xml_num_images);
- ERROR("but %u images in the WIM! There must be exactly one "
- "<IMAGE> element per image.", wim->hdr.image_count);
+ ERROR("The WIM's header is inconsistent with its XML data.\n"
+ " Please submit a bug report if you believe this "
+ "WIM file should be considered valid.");
return WIMLIB_ERR_IMAGE_COUNT;
}
- ret = read_wim_lookup_table(wim);
+ ret = read_blob_table(wim);
if (ret)
return ret;
-
- DEBUG("Done beginning read of WIM file `%"TS"'.", wimfile);
}
return 0;
}
WIMStruct *wim;
int ret;
- if (open_flags & WIMLIB_OPEN_FLAG_FROM_PIPE)
- DEBUG("Opening pipable WIM from file descriptor %d.", *(const int*)wim_filename_or_fd);
- else
- DEBUG("Opening WIM file \"%"TS"\"", (const tchar*)wim_filename_or_fd);
-
- wimlib_global_init(WIMLIB_INIT_FLAG_ASSUME_UTF8);
-
- if (wim_ret == NULL)
- return WIMLIB_ERR_INVALID_PARAM;
+ ret = wimlib_global_init(WIMLIB_INIT_FLAG_ASSUME_UTF8);
+ if (ret)
+ return ret;
wim = new_wim_struct();
- if (wim == NULL)
+ if (!wim)
return WIMLIB_ERR_NOMEM;
wim->progfunc = progfunc;
return ret;
}
- DEBUG("Successfully opened WIM and created WIMStruct.");
*wim_ret = wim;
return 0;
}
WIMLIB_OPEN_FLAG_WRITE_ACCESS))
return WIMLIB_ERR_INVALID_PARAM;
+ if (!wimfile || !*wimfile || !wim_ret)
+ return WIMLIB_ERR_INVALID_PARAM;
+
return open_wim_as_WIMStruct(wimfile, open_flags, wim_ret,
progfunc, progctx);
}
NULL, NULL);
}
-/* 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. */
+/* Checksum all blobs that are unhashed (other than the metadata blobs), merging
+ * them into the blob table as needed. This is a no-op unless files have been
+ * added to an image in the same WIMStruct. */
int
-wim_checksum_unhashed_streams(WIMStruct *wim)
+wim_checksum_unhashed_blobs(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 blob_descriptor *blob, *tmp;
struct wim_image_metadata *imd = wim->image_metadata[i];
- image_for_each_unhashed_stream_safe(lte, tmp, imd) {
- struct wim_lookup_table_entry *new_lte;
- ret = hash_unhashed_stream(lte, wim->lookup_table, &new_lte);
+ image_for_each_unhashed_blob_safe(blob, tmp, imd) {
+ struct blob_descriptor *new_blob;
+ ret = hash_unhashed_blob(blob, wim->blob_table, &new_blob);
if (ret)
return ret;
- if (new_lte != lte)
- free_lookup_table_entry(lte);
+ if (new_blob != blob)
+ free_blob_descriptor(blob);
}
}
return 0;
return 0;
}
-/*
- * can_delete_from_wim - Check if files or images can be deleted from a given
- * WIM file.
- *
- * This theoretically should be exactly the same as can_modify_wim(), but
- * unfortunately, due to bugs in Microsoft's software that generate incorrect
- * reference counts for some WIM resources, we need to run expensive
- * verifications to make sure the reference counts are correct on all WIM
- * resources. Otherwise we might delete a WIM resource whose reference count
- * has fallen to 0, but is actually still referenced somewhere.
- */
-int
-can_delete_from_wim(WIMStruct *wim)
-{
- int ret;
-
- ret = can_modify_wim(wim);
- if (ret)
- return ret;
- if (!wim->refcnts_ok) {
- ret = wim_recalculate_refcnts(wim);
- if (ret)
- return ret;
- }
- return 0;
-}
-
/* API function documented in wimlib.h */
WIMLIBAPI void
wimlib_free(WIMStruct *wim)
{
- if (wim == NULL)
+ if (!wim)
return;
- 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->out_fd))
filedes_close(&wim->out_fd);
- free_lookup_table(wim->lookup_table);
+ free_blob_table(wim->blob_table);
wimlib_free_decompressor(wim->decompressor);
WIMLIBAPI u32
wimlib_get_version(void)
{
- return WIMLIB_VERSION_CODE;
+ return (WIMLIB_MAJOR_VERSION << 20) |
+ (WIMLIB_MINOR_VERSION << 10) |
+ WIMLIB_PATCH_VERSION;
}
static bool lib_initialized = false;
+static pthread_mutex_t lib_initialization_mutex = PTHREAD_MUTEX_INITIALIZER;
/* API function documented in wimlib.h */
WIMLIBAPI int
wimlib_global_init(int init_flags)
{
+ int ret;
+
if (lib_initialized)
return 0;
+ pthread_mutex_lock(&lib_initialization_mutex);
+
+ ret = 0;
+ if (lib_initialized)
+ goto out;
+
#ifdef ENABLE_ERROR_MESSAGES
- if (wimlib_error_file == NULL)
+ if (!wimlib_error_file)
wimlib_error_file = stderr;
#endif
+ ret = WIMLIB_ERR_INVALID_PARAM;
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;
+ goto out;
libxml_global_init();
if (!(init_flags & WIMLIB_INIT_FLAG_ASSUME_UTF8)) {
#endif
}
#ifdef __WIN32__
- {
- int ret = win32_global_init(init_flags);
- if (ret)
- return ret;
- }
+ ret = win32_global_init(init_flags);
+ if (ret)
+ goto out;
#endif
iconv_global_init();
init_upcase();
else if (init_flags & WIMLIB_INIT_FLAG_DEFAULT_CASE_INSENSITIVE)
default_ignore_case = true;
lib_initialized = true;
- return 0;
+ ret = 0;
+out:
+ pthread_mutex_unlock(&lib_initialization_mutex);
+ return ret;
}
/* API function documented in wimlib.h */
{
if (!lib_initialized)
return;
+
+ pthread_mutex_lock(&lib_initialization_mutex);
+
+ if (!lib_initialized)
+ goto out;
+
libxml_global_cleanup();
iconv_global_cleanup();
#ifdef __WIN32__
win32_global_cleanup();
#endif
- cleanup_decompressor_params();
- cleanup_compressor_params();
wimlib_set_error_file(NULL);
lib_initialized = false;
+
+out:
+ pthread_mutex_unlock(&lib_initialization_mutex);
}
git://wimlib.net / wimlib / blobdiff