# include "config.h"
#endif
+#include <errno.h>
+#include <fcntl.h>
+#ifndef __WIN32__
+# include <langinfo.h>
+#endif
+#include <stdlib.h>
+#include <unistd.h>
+
#include "wimlib.h"
+#include "wimlib/assert.h"
+#include "wimlib/bitops.h"
#include "wimlib/dentry.h"
#include "wimlib/encoding.h"
#include "wimlib/file_io.h"
#include "wimlib/security.h"
#include "wimlib/wim.h"
#include "wimlib/xml.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 <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 << 25; /* 33554432 */
+ return (u32)1 << 26; /* 67108864 */
default:
- return 1U << 15; /* 32768 */
+ return (u32)1 << 15; /* 32768 */
}
}
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);
+ 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;
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;
/* 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));
- 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_streams));
+ destroy_image_metadata(imd, NULL, false);
+ }
+ wim->current_image = WIMLIB_NO_IMAGE;
+}
/* API function documented in wimlib.h */
WIMLIBAPI const tchar *
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)
- 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;
}
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
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)
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;