* the WIM image. */
#define WIMLIB_ADD_IMAGE_FLAG_ROOT 0x80000000
-void destroy_image_metadata(struct image_metadata *imd, struct lookup_table *lt)
+void destroy_image_metadata(struct image_metadata *imd,
+ struct lookup_table *table)
{
- free_dentry_tree(imd->root_dentry, lt);
+ free_dentry_tree(imd->root_dentry, table);
free_security_data(imd->security_data);
/* Get rid of the lookup table entry for this image's metadata resource
* */
- if (lt)
- lookup_table_remove(lt, imd->metadata_lte);
+ if (table) {
+ lookup_table_unlink(table, imd->metadata_lte);
+ free_lookup_table_entry(imd->metadata_lte);
+ }
}
/*
struct lookup_table *lookup_table,
struct wim_security_data *sd,
const struct capture_config *config,
- int add_flags,
+ int add_image_flags,
+ wimlib_progress_func_t progress_func,
void *extra_arg)
{
struct stat root_stbuf;
struct inode *inode;
if (exclude_path(root_disk_path, config, true)) {
- if (add_flags & WIMLIB_ADD_IMAGE_FLAG_ROOT) {
+ if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_ROOT) {
ERROR("Cannot exclude the root directory from capture");
return WIMLIB_ERR_INVALID_CAPTURE_CONFIG;
}
- if (add_flags & WIMLIB_ADD_IMAGE_FLAG_VERBOSE)
- printf("Excluding file `%s' from capture\n",
- root_disk_path);
+ if ((add_image_flags & WIMLIB_ADD_IMAGE_FLAG_VERBOSE)
+ && progress_func)
+ {
+ union wimlib_progress_info info;
+ info.scan.cur_path = root_disk_path;
+ info.scan.excluded = true;
+ progress_func(WIMLIB_PROGRESS_MSG_SCAN_DENTRY, &info);
+ }
*root_ret = NULL;
return 0;
}
+ if ((add_image_flags & WIMLIB_ADD_IMAGE_FLAG_VERBOSE)
+ && progress_func)
+ {
+ union wimlib_progress_info info;
+ info.scan.cur_path = root_disk_path;
+ info.scan.excluded = false;
+ progress_func(WIMLIB_PROGRESS_MSG_SCAN_DENTRY, &info);
+ }
- if (add_flags & WIMLIB_ADD_IMAGE_FLAG_DEREFERENCE)
+ if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_DEREFERENCE)
stat_fn = stat;
else
stat_fn = lstat;
- if (add_flags & WIMLIB_ADD_IMAGE_FLAG_VERBOSE)
- printf("Scanning `%s'\n", root_disk_path);
-
ret = (*stat_fn)(root_disk_path, &root_stbuf);
if (ret != 0) {
ERROR_WITH_ERRNO("Failed to stat `%s'", root_disk_path);
return WIMLIB_ERR_STAT;
}
- if ((add_flags & WIMLIB_ADD_IMAGE_FLAG_ROOT) &&
+ if ((add_image_flags & WIMLIB_ADD_IMAGE_FLAG_ROOT) &&
!S_ISDIR(root_stbuf.st_mode)) {
ERROR("`%s' is not a directory", root_disk_path);
return WIMLIB_ERR_NOTDIR;
return WIMLIB_ERR_SPECIAL_FILE;
}
- if (add_flags & WIMLIB_ADD_IMAGE_FLAG_ROOT)
+ if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_ROOT)
filename = "";
else
filename = path_basename(root_disk_path);
inode = root->d_inode;
+#ifdef HAVE_STAT_NANOSECOND_PRECISION
inode->creation_time = timespec_to_wim_timestamp(&root_stbuf.st_mtim);
inode->last_write_time = timespec_to_wim_timestamp(&root_stbuf.st_mtim);
inode->last_access_time = timespec_to_wim_timestamp(&root_stbuf.st_atim);
+#else
+ inode->creation_time = unix_timestamp_to_wim(root_stbuf.st_mtime);
+ inode->last_write_time = unix_timestamp_to_wim(root_stbuf.st_mtime);
+ inode->last_access_time = unix_timestamp_to_wim(root_stbuf.st_atime);
+#endif
if (sizeof(ino_t) >= 8)
inode->ino = (u64)root_stbuf.st_ino;
else
inode->ino = (u64)root_stbuf.st_ino |
((u64)root_stbuf.st_dev << ((sizeof(ino_t) * 8) & 63));
- add_flags &= ~WIMLIB_ADD_IMAGE_FLAG_ROOT;
+ add_image_flags &= ~WIMLIB_ADD_IMAGE_FLAG_ROOT;
inode->resolved = true;
if (S_ISREG(root_stbuf.st_mode)) { /* Archiving a regular file */
inode->attributes = FILE_ATTRIBUTE_DIRECTORY;
DIR *dir;
- struct dirent *p;
+ struct dirent entry, *result;
struct dentry *child;
dir = opendir(root_disk_path);
* to any subdirectories. */
while (1) {
errno = 0;
- p = readdir(dir);
- if (p == NULL) {
- if (errno) {
- ret = WIMLIB_ERR_READ;
- ERROR_WITH_ERRNO("Error reading the "
- "directory `%s'",
- root_disk_path);
- }
+ ret = readdir_r(dir, &entry, &result);
+ if (ret != 0) {
+ ret = WIMLIB_ERR_READ;
+ ERROR_WITH_ERRNO("Error reading the "
+ "directory `%s'",
+ root_disk_path);
break;
}
- if (p->d_name[0] == '.' && (p->d_name[1] == '\0'
- || (p->d_name[1] == '.' && p->d_name[2] == '\0')))
+ if (result == NULL)
+ break;
+ if (result->d_name[0] == '.' && (result->d_name[1] == '\0'
+ || (result->d_name[1] == '.' && result->d_name[2] == '\0')))
continue;
- strcpy(name + len + 1, p->d_name);
+ strcpy(name + len + 1, result->d_name);
ret = build_dentry_tree(&child, name, lookup_table,
- NULL, config,
- add_flags, NULL);
+ NULL, config, add_image_flags,
+ progress_func, NULL);
if (ret != 0)
break;
if (child)
WIMStruct *dest_wim,
const char *dest_name,
const char *dest_description,
- int flags,
+ int export_flags,
WIMStruct **additional_swms,
- unsigned num_additional_swms)
+ unsigned num_additional_swms,
+ wimlib_progress_func_t progress_func)
{
int i;
int ret;
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_image == WIMLIB_ALL_IMAGES) {
if (src_wim->hdr.image_count > 1) {
/* multi-image export. */
- if ((flags & WIMLIB_EXPORT_FLAG_BOOT) &&
+ if ((export_flags & WIMLIB_EXPORT_FLAG_BOOT) &&
(src_wim->hdr.boot_idx == 0))
{
/* Specifying the boot flag on a multi-image
return WIMLIB_ERR_INVALID_PARAM;
}
for (i = 1; i <= src_wim->hdr.image_count; i++) {
- int export_flags = flags;
+ int new_flags = export_flags;
if (i != src_wim->hdr.boot_idx)
- export_flags &= ~WIMLIB_EXPORT_FLAG_BOOT;
+ new_flags &= ~WIMLIB_EXPORT_FLAG_BOOT;
ret = wimlib_export_image(src_wim, i, dest_wim,
NULL, NULL,
- export_flags,
+ new_flags,
additional_swms,
- num_additional_swms);
+ num_additional_swms,
+ progress_func);
if (ret != 0)
return ret;
}
for_dentry_in_tree(root, add_lte_to_dest_wim, &wims);
wimlib_assert(list_empty(&wims.lte_list_head));
- if (flags & WIMLIB_EXPORT_FLAG_BOOT) {
+ if (export_flags & WIMLIB_EXPORT_FLAG_BOOT) {
DEBUG("Setting boot_idx to %d", dest_wim->hdr.image_count);
- dest_wim->hdr.boot_idx = dest_wim->hdr.image_count;
+ wimlib_set_boot_idx(dest_wim, dest_wim->hdr.image_count);
}
ret = 0;
goto out;
return ret;
}
+static int image_run_full_verifications(WIMStruct *w)
+{
+ return for_dentry_in_tree(wim_root_dentry(w), verify_dentry, w);
+}
+
+static int lte_fix_refcnt(struct lookup_table_entry *lte, void *ctr)
+{
+ if (lte->refcnt != lte->real_refcnt) {
+ WARNING("The following lookup table entry has a reference "
+ "count of %u, but", lte->refcnt);
+ WARNING("We found %u references to it",
+ lte->real_refcnt);
+ print_lookup_table_entry(lte);
+ lte->refcnt = lte->real_refcnt;
+ ++*(unsigned long *)ctr;
+ }
+ return 0;
+}
+
+/* Ideally this would be unnecessary... however, the WIMs for Windows 8 are
+ * screwed up because some lookup table entries are referenced more times than
+ * their stated reference counts. So theoretically, if we do the delete all the
+ * references to a stream and then remove it, it might still be referenced
+ * somewhere else... So, work around this problem by looking at ALL the images
+ * to re-calculate the reference count of EVERY lookup table entry. */
+int wim_run_full_verifications(WIMStruct *w)
+{
+ int ret;
+
+ for_lookup_table_entry(w->lookup_table, lte_zero_real_refcnt, NULL);
+ w->all_images_verified = true;
+ w->full_verification_in_progress = true;
+ ret = for_image(w, WIMLIB_ALL_IMAGES, image_run_full_verifications);
+ w->full_verification_in_progress = false;
+ if (ret == 0) {
+ unsigned long num_ltes_with_bogus_refcnt = 0;
+ for (int i = 0; i < w->hdr.image_count; i++)
+ w->image_metadata[i].metadata_lte->real_refcnt++;
+ for_lookup_table_entry(w->lookup_table, lte_fix_refcnt,
+ &num_ltes_with_bogus_refcnt);
+ if (num_ltes_with_bogus_refcnt != 0) {
+ WARNING("A total of %lu entries in the WIM's stream "
+ "lookup table had to have\n"
+ " their reference counts fixed.",
+ num_ltes_with_bogus_refcnt);
+ }
+ } else {
+ w->all_images_verified = false;
+ }
+ return ret;
+}
+
/*
* Deletes an image from the WIM.
*/
return WIMLIB_ERR_SPLIT_UNSUPPORTED;
}
- if (image == WIM_ALL_IMAGES) {
+ if (image == WIMLIB_ALL_IMAGES) {
for (i = w->hdr.image_count; i >= 1; i--) {
ret = wimlib_delete_image(w, i);
if (ret != 0)
return 0;
}
+ if (!w->all_images_verified) {
+ ret = wim_run_full_verifications(w);
+ if (ret != 0)
+ return ret;
+ }
+
DEBUG("Deleting image %d", image);
/* Even if the dentry tree is not allocated, we must select it (and
else if (w->hdr.boot_idx > image)
w->hdr.boot_idx--;
- w->current_image = WIM_NO_IMAGE;
+ w->current_image = WIMLIB_NO_IMAGE;
/* Remove the image from the XML information. */
xml_delete_image(&w->wim_info, image);
}
-
-
-/*
- * 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,
- int (*capture_tree)(struct dentry **, const char *,
- struct lookup_table *,
- struct wim_security_data *,
- const struct capture_config *,
- int, void *),
- void *extra_arg)
+WIMLIBAPI int wimlib_add_image(WIMStruct *w, const char *source,
+ const char *name, const char *config_str,
+ size_t config_len, int add_image_flags,
+ wimlib_progress_func_t progress_func)
{
+ int (*capture_tree)(struct dentry **, const char *,
+ struct lookup_table *,
+ struct wim_security_data *,
+ const struct capture_config *,
+ int, wimlib_progress_func_t, void *);
+ void *extra_arg;
+
struct dentry *root_dentry = NULL;
struct wim_security_data *sd;
struct capture_config config;
struct hlist_head inode_list;
int ret;
- DEBUG("Adding dentry tree from directory or NTFS volume `%s'.", dir);
+ if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_NTFS) {
+#ifdef WITH_NTFS_3G
+ if (add_image_flags & (WIMLIB_ADD_IMAGE_FLAG_DEREFERENCE)) {
+ ERROR("Cannot dereference files when capturing directly from NTFS");
+ return WIMLIB_ERR_INVALID_PARAM;
+ }
+ capture_tree = build_dentry_tree_ntfs;
+ extra_arg = &w->ntfs_vol;
+#else
+ ERROR("wimlib was compiled without support for NTFS-3g, so\n"
+ " cannot capture a WIM image directly from a NTFS volume!");
+ return WIMLIB_ERR_UNSUPPORTED;
+#endif
+ } else {
+ capture_tree = build_dentry_tree;
+ extra_arg = NULL;
+ }
+
+ DEBUG("Adding dentry tree from directory or NTFS volume `%s'.", source);
if (!name || !*name) {
ERROR("Must specify a non-empty string for the image name");
return WIMLIB_ERR_INVALID_PARAM;
}
- if (!dir) {
+ if (!source) {
ERROR("Must specify the name of a directory or NTFS volume");
return WIMLIB_ERR_INVALID_PARAM;
}
config_str = default_config;
config_len = strlen(default_config);
}
- ret = init_capture_config(config_str, config_len, dir, &config);
+ ret = init_capture_config(config_str, config_len, source, &config);
if (ret != 0)
return ret;
print_capture_config(&config);
sd->total_length = 8;
sd->refcnt = 1;
- DEBUG("Building dentry tree.");
- if (flags & WIMLIB_ADD_IMAGE_FLAG_SHOW_PROGRESS) {
- printf("Scanning `%s'...\n", dir);
+ if (progress_func) {
+ union wimlib_progress_info progress;
+ progress.scan.source = source;
+ progress_func(WIMLIB_PROGRESS_MSG_SCAN_BEGIN, &progress);
}
- ret = (*capture_tree)(&root_dentry, dir, w->lookup_table, sd,
- &config, flags | WIMLIB_ADD_IMAGE_FLAG_ROOT,
- extra_arg);
+
+ DEBUG("Building dentry tree.");
+ ret = (*capture_tree)(&root_dentry, source, w->lookup_table, sd,
+ &config, add_image_flags | WIMLIB_ADD_IMAGE_FLAG_ROOT,
+ progress_func, extra_arg);
destroy_capture_config(&config);
if (ret != 0) {
- ERROR("Failed to build dentry tree for `%s'", dir);
+ ERROR("Failed to build dentry tree for `%s'", source);
goto out_free_security_data;
}
+ if (progress_func) {
+ union wimlib_progress_info progress;
+ progress.scan.source = source;
+ progress_func(WIMLIB_PROGRESS_MSG_SCAN_END, &progress);
+ }
+
DEBUG("Calculating full paths of dentries.");
ret = for_dentry_in_tree(root_dentry, calculate_dentry_full_path, NULL);
if (ret != 0)
if (ret != 0)
goto out_destroy_imd;
- if (flags & WIMLIB_ADD_IMAGE_FLAG_BOOT)
- w->hdr.boot_idx = w->hdr.image_count;
-
+ if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_BOOT)
+ wimlib_set_boot_idx(w, w->hdr.image_count);
return 0;
out_destroy_imd:
destroy_image_metadata(&w->image_metadata[w->hdr.image_count - 1],
destroy_capture_config(&config);
return ret;
}
-
-/*
- * Adds an image to a WIM file from a directory tree on disk.
- */
-WIMLIBAPI int wimlib_add_image(WIMStruct *w, const char *dir,
- const char *name, const char *config_str,
- size_t config_len, int flags)
-{
- return do_add_image(w, dir, name, config_str, config_len, flags,
- build_dentry_tree, NULL);
-}
git://wimlib.net / wimlib / blobdiff