* 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
- * terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
+ * 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 Lesser General Public License for more
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more
* details.
*
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
* along with wimlib; if not, see http://www.gnu.org/licenses/.
*/
#include <unistd.h>
/** Private flag: Used to mark that we currently adding the root directory of
- * the WIM. */
+ * the WIM image. */
#define WIMLIB_ADD_IMAGE_FLAG_ROOT 0x80000000
void destroy_image_metadata(struct image_metadata *imd,struct lookup_table *lt)
if (dest_lte) {
dest_lte->refcnt++;
} else {
- dest_lte = new_lookup_table_entry();
+ dest_lte = MALLOC(sizeof(struct lookup_table_entry));
if (!dest_lte)
return WIMLIB_ERR_NOMEM;
- dest_lte->resource_location = RESOURCE_IN_WIM;
- dest_lte->wim = src_wim;
- memcpy(&dest_lte->resource_entry,
- &src_lte->resource_entry,
- sizeof(struct resource_entry));
- copy_hash(dest_lte->hash,
- dentry_stream_hash_unresolved(dentry, i));
+ memcpy(dest_lte, src_lte, sizeof(struct lookup_table_entry));
+ dest_lte->part_number = 1;
+ dest_lte->refcnt = 1;
lookup_table_insert(dest_wim->lookup_table, dest_lte);
}
}
WIMStruct *dest_wim,
const char *dest_name,
const char *dest_description,
- int flags)
+ int flags,
+ WIMStruct **additional_swms,
+ unsigned num_additional_swms)
{
int i;
int ret;
struct dentry *root;
struct wim_pair wims;
struct wim_security_data *sd;
+ struct lookup_table *joined_tab, *src_wim_tab_save;
+
+ if (!src_wim || !dest_wim)
+ return WIMLIB_ERR_INVALID_PARAM;
+
+ if (dest_wim->hdr.total_parts != 1) {
+ ERROR("Exporting an image to a split WIM is "
+ "unsupported");
+ return WIMLIB_ERR_SPLIT_UNSUPPORTED;
+ }
if (src_image == WIM_ALL_IMAGES) {
if (src_wim->hdr.image_count > 1) {
ret = wimlib_export_image(src_wim, i, dest_wim,
NULL,
dest_description,
- export_flags);
+ export_flags,
+ additional_swms,
+ num_additional_swms);
if (ret != 0)
return ret;
}
}
}
- ret = wimlib_select_image(src_wim, src_image);
- if (ret != 0) {
- ERROR("Could not select image %d from the WIM `%s' "
- "to export it", src_image, src_wim->filename);
- return ret;
- }
-
if (!dest_name) {
dest_name = wimlib_get_image_name(src_wim, src_image);
DEBUG("Using name `%s' for source image %d",
return WIMLIB_ERR_IMAGE_NAME_COLLISION;
}
+ ret = verify_swm_set(src_wim, additional_swms, num_additional_swms);
+ if (ret != 0)
+ return ret;
+
+ if (num_additional_swms) {
+ ret = new_joined_lookup_table(src_wim, additional_swms,
+ num_additional_swms,
+ &joined_tab);
+ if (ret != 0)
+ return ret;
+ src_wim_tab_save = src_wim->lookup_table;
+ src_wim->lookup_table = joined_tab;
+ }
+
+ ret = wimlib_select_image(src_wim, src_image);
+ if (ret != 0) {
+ ERROR("Could not select image %d from the WIM `%s' "
+ "to export it", src_image, src_wim->filename);
+ goto out;
+ }
/* Cleaning up here on failure would be hard. For example, we could
* fail to allocate memory in add_lte_to_dest_wim(),
* leaving the lookup table entries in the destination WIM in an
* inconsistent state. Until these issues can be resolved,
- * wimlib_export_image() is documented as leaving dest_wim is an
+ * wimlib_export_image() is documented as leaving dest_wim in an
* indeterminate state. */
root = wim_root_dentry(src_wim);
sd = wim_security_data(src_wim);
wims.dest_wim = dest_wim;
ret = for_dentry_in_tree(root, add_lte_to_dest_wim, &wims);
if (ret != 0)
- return ret;
+ goto out;
ret = add_new_dentry_tree(dest_wim, root, sd);
if (ret != 0)
- return ret;
+ goto out;
sd->refcnt++;
if (flags & WIMLIB_EXPORT_FLAG_BOOT) {
dest_wim->hdr.boot_idx = dest_wim->hdr.image_count;
}
- return xml_export_image(src_wim->wim_info, src_image, &dest_wim->wim_info,
- dest_name, dest_description);
+ ret = xml_export_image(src_wim->wim_info, src_image, &dest_wim->wim_info,
+ dest_name, dest_description);
+out:
+ if (num_additional_swms) {
+ free_lookup_table(src_wim->lookup_table);
+ src_wim->lookup_table = src_wim_tab_save;
+ }
+ return ret;
}
/*
int i;
int ret;
+ if (w->hdr.total_parts != 1) {
+ ERROR("Deleting an image from a split WIM is not supported.");
+ return WIMLIB_ERR_SPLIT_UNSUPPORTED;
+ }
+
if (image == WIM_ALL_IMAGES) {
num_images = w->hdr.image_count;
for (i = 1; i <= num_images; i++) {
ALIGNMENT_LIST,
};
+/* Default capture configuration file when none is specified. */
static const char *default_config =
"[ExclusionList]\n"
"\\$ntfs.log\n"
return 0;
}
+/* Parses the contents of the image capture configuration file and fills in a
+ * `struct capture_config'. */
static int init_capture_config(const char *_config_str, size_t config_len,
const char *_prefix, struct capture_config *config)
{
}
}
+/* Return true if the image capture configuration file indicates we should
+ * exclude the filename @path from capture.
+ *
+ * If @exclude_prefix is %true, the part of the path up and including the name
+ * of the directory being captured is not included in the path for matching
+ * purposes. This allows, for example, a pattern like /hiberfil.sys to match a
+ * file /mnt/windows7/hiberfil.sys if we are capturing the /mnt/windows7
+ * directory.
+ */
bool exclude_path(const char *path, const struct capture_config *config,
bool exclude_prefix)
{
+/*
+ * Adds an image to the WIM, delegating the capture of the dentry tree and
+ * security data to the function @capture_tree passed as a parameter.
+ * Currently, @capture_tree may be build_dentry_tree() for capturing a "regular"
+ * directory tree on disk, or build_dentry_tree_ntfs() for capturing a WIM image
+ * directory from a NTFS volume using libntfs-3g.
+ *
+ * The @capture_tree function is also expected to create lookup table entries
+ * for all the file streams it captures and insert them into @lookup_table,
+ * being careful to look for identical entries that already exist and simply
+ * increment the reference count for them rather than duplicating the entry.
+ */
int do_add_image(WIMStruct *w, const char *dir, const char *name,
const char *config_str, size_t config_len,
int flags,
struct link_group_table *lgt;
int ret;
- DEBUG("Adding dentry tree from dir `%s'.", dir);
+ DEBUG("Adding dentry tree from directory or NTFS volume `%s'.", dir);
if (!name || !*name) {
ERROR("Must specify a non-empty string for the image name");
return WIMLIB_ERR_INVALID_PARAM;
}
if (!dir) {
- ERROR("Must specify the name of a directory");
+ ERROR("Must specify the name of a directory or NTFS volume");
return WIMLIB_ERR_INVALID_PARAM;
}
+ if (w->hdr.total_parts != 1) {
+ ERROR("Cannot add an image to a split WIM");
+ return WIMLIB_ERR_SPLIT_UNSUPPORTED;
+ }
+
if (wimlib_image_name_in_use(w, name)) {
ERROR("There is already an image named \"%s\" in `%s'",
name, w->filename);
git://wimlib.net / wimlib / blobdiff