#include <dirent.h>
#include <string.h>
#include <errno.h>
+#include <fnmatch.h>
+#include <ctype.h>
#include <unistd.h>
/** Private flag: Used to mark that we currently adding the root directory of
* to the WIM may still occur later when trying to actually read
* the regular files in the tree into the WIM as file resources.
*/
-static int build_dentry_tree(struct dentry *root, const char *root_disk_path,
- struct lookup_table* lookup_table,
- int add_flags)
+static int build_dentry_tree(struct dentry **root_ret, const char *root_disk_path,
+ struct lookup_table *lookup_table,
+ struct wim_security_data *sd,
+ const struct capture_config *config,
+ int add_flags,
+ void *extra_arg)
{
- DEBUG("%s", root_disk_path);
struct stat root_stbuf;
- int ret;
+ int ret = 0;
int (*stat_fn)(const char *restrict, struct stat *restrict);
+ struct dentry *root;
+
+ if (exclude_path(root_disk_path, config, true)) {
+ if (add_flags & WIMLIB_ADD_IMAGE_FLAG_VERBOSE)
+ printf("Excluding file `%s' from capture\n",
+ root_disk_path);
+ *root_ret = NULL;
+ return 0;
+ }
+
if (add_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("`%s' is not a directory", root_disk_path);
return WIMLIB_ERR_NOTDIR;
}
+ if (!S_ISREG(root_stbuf.st_mode) && !S_ISDIR(root_stbuf.st_mode)
+ && !S_ISLNK(root_stbuf.st_mode)) {
+ ERROR("`%s' is not a regular file, directory, or symbolic link.");
+ return WIMLIB_ERR_SPECIAL_FILE;
+ }
+
+ root = new_dentry(path_basename(root_disk_path));
+ if (!root)
+ return WIMLIB_ERR_NOMEM;
+
stbuf_to_dentry(&root_stbuf, root);
add_flags &= ~WIMLIB_ADD_IMAGE_FLAG_ROOT;
+ root->resolved = true;
if (dentry_is_directory(root)) {
/* Open the directory on disk */
|| (p->d_name[1] == '.' && p->d_name[2] == '\0')))
continue;
strcpy(name + len + 1, p->d_name);
- child = new_dentry(p->d_name);
- if (!child)
- return WIMLIB_ERR_NOMEM;
- ret = build_dentry_tree(child, name, lookup_table,
- add_flags);
- link_dentry(child, root);
+ ret = build_dentry_tree(&child, name, lookup_table,
+ sd, config,
+ add_flags, extra_arg);
if (ret != 0)
break;
+ if (child)
+ link_dentry(child, root);
}
closedir(dir);
} else if (dentry_is_symlink(root)) {
/* Archiving a symbolic link */
size_t symlink_buf_len;
char deref_name_buf[4096];
- ssize_t ret = readlink(root_disk_path, deref_name_buf,
- sizeof(deref_name_buf) - 1);
- if (ret == -1) {
+ ssize_t deref_name_len;
+
+ deref_name_len = readlink(root_disk_path, deref_name_buf,
+ sizeof(deref_name_buf) - 1);
+ if (deref_name_len == -1) {
ERROR_WITH_ERRNO("Failed to read target of "
"symbolic link `%s'", root_disk_path);
- return WIMLIB_ERR_STAT;
+ return WIMLIB_ERR_READLINK;
}
- deref_name_buf[ret] = '\0';
+ deref_name_buf[deref_name_len] = '\0';
DEBUG("Read symlink `%s'", deref_name_buf);
ret = dentry_set_symlink(root, deref_name_buf,
lookup_table, NULL);
} else {
/* Regular file */
struct lookup_table_entry *lte;
+ u8 hash[SHA1_HASH_SIZE];
+
+ /* Empty files do not have to have a lookup table entry. */
+ if (root_stbuf.st_size == 0)
+ goto out;
/* For each regular file, we must check to see if the file is in
* the lookup table already; if it is, we increment its refcnt;
* otherwise, we create a new lookup table entry and insert it.
* */
- ret = sha1sum(root_disk_path, root->hash);
+ ret = sha1sum(root_disk_path, hash);
if (ret != 0)
return ret;
- lte = __lookup_resource(lookup_table, root->hash);
+ lte = __lookup_resource(lookup_table, hash);
if (lte) {
lte->refcnt++;
+ DEBUG("Add lte reference %u for `%s'", lte->refcnt,
+ root_disk_path);
} else {
char *file_on_disk = STRDUP(root_disk_path);
if (!file_on_disk) {
return WIMLIB_ERR_NOMEM;
}
lte->file_on_disk = file_on_disk;
+ lte->resource_location = RESOURCE_IN_FILE_ON_DISK;
lte->resource_entry.original_size = root_stbuf.st_size;
lte->resource_entry.size = root_stbuf.st_size;
- memcpy(lte->hash, root->hash, WIM_HASH_SIZE);
+ copy_hash(lte->hash, hash);
lookup_table_insert(lookup_table, lte);
}
+ root->lte = lte;
}
+out:
+ *root_ret = root;
return ret;
}
* entry is created that references the location of the file resource in the
* source WIM file through the other_wim_fp field of the lookup table entry.
*/
-static int add_lookup_table_entry_to_dest_wim(struct dentry *dentry, void *arg)
+static int add_lte_to_dest_wim(struct dentry *dentry, void *arg)
{
WIMStruct *src_wim, *dest_wim;
- struct lookup_table_entry *src_table_entry;
- struct lookup_table_entry *dest_table_entry;
src_wim = ((struct wim_pair*)arg)->src_wim;
dest_wim = ((struct wim_pair*)arg)->dest_wim;
- if (dentry_is_directory(dentry))
- return 0;
-
- /* XXX ADS */
- src_table_entry = __lookup_resource(src_wim->lookup_table, dentry->hash);
- if (!src_table_entry)
- return 0;
-
- /* XXX ADS */
- dest_table_entry = __lookup_resource(dest_wim->lookup_table, dentry->hash);
- if (dest_table_entry) {
- dest_table_entry->refcnt++;
- } else {
- dest_table_entry = new_lookup_table_entry();
- if (!dest_table_entry)
- return WIMLIB_ERR_NOMEM;
- dest_table_entry->other_wim_fp = src_wim->fp;
- dest_table_entry->other_wim_ctype =
- wimlib_get_compression_type(src_wim);
- dest_table_entry->refcnt = 1;
- memcpy(&dest_table_entry->resource_entry,
- &src_table_entry->resource_entry,
- sizeof(struct resource_entry));
- memcpy(dest_table_entry->hash, dentry->hash, WIM_HASH_SIZE);
- lookup_table_insert(dest_wim->lookup_table, dest_table_entry);
+ wimlib_assert(!dentry->resolved);
+
+ for (unsigned i = 0; i < (unsigned)dentry->num_ads + 1; i++) {
+ struct lookup_table_entry *src_lte, *dest_lte;
+ src_lte = dentry_stream_lte_unresolved(dentry, i,
+ src_wim->lookup_table);
+ if (!src_lte)
+ continue;
+ dest_lte = dentry_stream_lte_unresolved(dentry, i,
+ dest_wim->lookup_table);
+ if (dest_lte) {
+ dest_lte->refcnt++;
+ } else {
+ dest_lte = new_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));
+ lookup_table_insert(dest_wim->lookup_table, dest_lte);
+ }
}
return 0;
}
* @w: The WIMStruct for the WIM file.
* @root_dentry: The root of the directory tree for the image.
*/
-static int add_new_dentry_tree(WIMStruct *w, struct dentry *root_dentry)
+static int add_new_dentry_tree(WIMStruct *w, struct dentry *root_dentry,
+ struct wim_security_data *sd)
{
struct lookup_table_entry *metadata_lte;
struct image_metadata *imd;
struct image_metadata *new_imd;
- struct wim_security_data *sd;
struct link_group_table *lgt;
DEBUG("Reallocating image metadata array for image_count = %u",
metadata_lte = new_lookup_table_entry();
if (!metadata_lte)
goto out_free_imd;
- sd = CALLOC(1, sizeof(struct wim_security_data));
- if (!sd)
- goto out_free_metadata_lte;
- sd->refcnt = 1;
- sd->total_length = 8;
lgt = new_link_group_table(9001);
if (!lgt)
goto out_free_security_data;
metadata_lte->resource_entry.flags = WIM_RESHDR_FLAG_METADATA;
- randomize_byte_array(metadata_lte->hash, WIM_HASH_SIZE);
+ random_hash(metadata_lte->hash);
lookup_table_insert(w->lookup_table, metadata_lte);
new_imd = &imd[w->hdr.image_count];
int ret;
struct dentry *root;
struct wim_pair wims;
+ struct wim_security_data *sd;
if (src_image == WIM_ALL_IMAGES) {
if (src_wim->hdr.image_count > 1) {
/* Cleaning up here on failure would be hard. For example, we could
- * fail to allocate memory in add_lookup_table_entry_to_dest_wim(),
+ * 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
* indeterminate state. */
root = wim_root_dentry(src_wim);
+ sd = wim_security_data(src_wim);
for_dentry_in_tree(root, increment_dentry_refcnt, NULL);
wims.src_wim = src_wim;
wims.dest_wim = dest_wim;
- ret = for_dentry_in_tree(root, add_lookup_table_entry_to_dest_wim, &wims);
+ ret = for_dentry_in_tree(root, add_lte_to_dest_wim, &wims);
if (ret != 0)
return ret;
- ret = add_new_dentry_tree(dest_wim, root);
+ ret = add_new_dentry_tree(dest_wim, root, sd);
if (ret != 0)
return ret;
- /* Bring over old security data */
- struct wim_security_data *sd = wim_security_data(src_wim);
- struct image_metadata *new_imd = wim_get_current_image_metadata(dest_wim);
- wimlib_assert(sd);
- free_security_data(new_imd->security_data);
- new_imd->security_data = sd;
sd->refcnt++;
if (flags & WIMLIB_EXPORT_FLAG_BOOT) {
return 0;
}
-/*
- * 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 *description,
- const char *flags_element, int flags)
+enum pattern_type {
+ NONE = 0,
+ EXCLUSION_LIST,
+ EXCLUSION_EXCEPTION,
+ COMPRESSION_EXCLUSION_LIST,
+ ALIGNMENT_LIST,
+};
+
+static const char *default_config =
+"[ExclusionList]\n"
+"\\$ntfs.log\n"
+"\\hiberfil.sys\n"
+"\\pagefile.sys\n"
+"\\System Volume Information\n"
+"\\RECYCLER\n"
+"\\Windows\\CSC\n"
+"\n"
+"[CompressionExclusionList]\n"
+"*.mp3\n"
+"*.zip\n"
+"*.cab\n"
+"\\WINDOWS\\inf\\*.pnf\n";
+
+static void destroy_pattern_list(struct pattern_list *list)
+{
+ FREE(list->pats);
+}
+
+static void destroy_capture_config(struct capture_config *config)
+{
+ destroy_pattern_list(&config->exclusion_list);
+ destroy_pattern_list(&config->exclusion_exception);
+ destroy_pattern_list(&config->compression_exclusion_list);
+ destroy_pattern_list(&config->alignment_list);
+ FREE(config->config_str);
+ FREE(config->prefix);
+ memset(config, 0, sizeof(*config));
+}
+
+static int pattern_list_add_pattern(struct pattern_list *list,
+ const char *pattern)
{
- struct dentry *root_dentry;
+ const char **pats;
+ if (list->num_pats >= list->num_allocated_pats) {
+ pats = REALLOC(list->pats,
+ sizeof(list->pats[0]) * (list->num_allocated_pats + 8));
+ if (!pats)
+ return WIMLIB_ERR_NOMEM;
+ list->num_allocated_pats += 8;
+ list->pats = pats;
+ }
+ list->pats[list->num_pats++] = pattern;
+ return 0;
+}
+
+static int init_capture_config(const char *_config_str, size_t config_len,
+ const char *_prefix, struct capture_config *config)
+{
+ char *config_str;
+ char *prefix;
+ char *p;
+ char *eol;
+ char *next_p;
+ size_t next_bytes_remaining;
+ size_t bytes_remaining;
+ enum pattern_type type = NONE;
+ int ret;
+ unsigned long line_no = 0;
+
+ DEBUG("config_len = %zu", config_len);
+ bytes_remaining = config_len;
+ memset(config, 0, sizeof(*config));
+ config_str = MALLOC(config_len);
+ if (!config_str) {
+ ERROR("Could not duplicate capture config string");
+ return WIMLIB_ERR_NOMEM;
+ }
+ prefix = STRDUP(_prefix);
+ if (!prefix) {
+ FREE(config_str);
+ return WIMLIB_ERR_NOMEM;
+ }
+
+ memcpy(config_str, _config_str, config_len);
+ next_p = config_str;
+ config->config_str = config_str;
+ config->prefix = prefix;
+ config->prefix_len = strlen(prefix);
+ while (bytes_remaining) {
+ line_no++;
+ p = next_p;
+ eol = memchr(p, '\n', bytes_remaining);
+ if (!eol) {
+ ERROR("Expected end-of-line in capture config file on "
+ "line %lu", line_no);
+ ret = WIMLIB_ERR_INVALID_CAPTURE_CONFIG;
+ goto out_destroy;
+ }
+
+ next_p = eol + 1;
+ bytes_remaining -= (eol - p) + 1;
+ if (eol == p)
+ continue;
+
+ if (*(eol - 1) == '\r')
+ eol--;
+ *eol = '\0';
+
+ /* Translate backslash to forward slash */
+ for (char *pp = p; pp != eol; pp++)
+ if (*pp == '\\')
+ *pp = '/';
+
+ /* Remove drive letter */
+ if (eol - p > 2 && isalpha(*p) && *(p + 1) == ':')
+ p += 2;
+
+ if (strcmp(p, "[ExclusionList]") == 0)
+ type = EXCLUSION_LIST;
+ else if (strcmp(p, "[ExclusionException]") == 0)
+ type = EXCLUSION_EXCEPTION;
+ else if (strcmp(p, "[CompressionExclusionList]") == 0)
+ type = COMPRESSION_EXCLUSION_LIST;
+ else if (strcmp(p, "[AlignmentList]") == 0)
+ type = ALIGNMENT_LIST;
+ else switch (type) {
+ case EXCLUSION_LIST:
+ DEBUG("Adding pattern \"%s\" to exclusion list", p);
+ ret = pattern_list_add_pattern(&config->exclusion_list, p);
+ break;
+ case EXCLUSION_EXCEPTION:
+ DEBUG("Adding pattern \"%s\" to exclusion exception list", p);
+ ret = pattern_list_add_pattern(&config->exclusion_exception, p);
+ break;
+ case COMPRESSION_EXCLUSION_LIST:
+ DEBUG("Adding pattern \"%s\" to compression exclusion list", p);
+ ret = pattern_list_add_pattern(&config->compression_exclusion_list, p);
+ break;
+ case ALIGNMENT_LIST:
+ DEBUG("Adding pattern \"%s\" to alignment list", p);
+ ret = pattern_list_add_pattern(&config->alignment_list, p);
+ break;
+ default:
+ ERROR("Line %lu of capture configuration is not "
+ "in a block (such as [ExclusionList])",
+ line_no);
+ ret = WIMLIB_ERR_INVALID_CAPTURE_CONFIG;
+ goto out_destroy;
+ }
+ if (ret != 0)
+ goto out_destroy;
+ }
+ return 0;
+out_destroy:
+ destroy_capture_config(config);
+ return ret;
+}
+
+static bool match_pattern(const char *path, const char *path_basename,
+ const struct pattern_list *list)
+{
+ for (size_t i = 0; i < list->num_pats; i++) {
+ const char *pat = list->pats[i];
+ const char *string;
+ if (pat[0] == '/')
+ /* Absolute path from root of capture */
+ string = path;
+ else {
+ if (strchr(pat, '/'))
+ /* Relative path from root of capture */
+ string = path + 1;
+ else
+ /* A file name pattern */
+ string = path_basename;
+ }
+ if (fnmatch(pat, string, FNM_PATHNAME
+ #ifdef FNM_CASEFOLD
+ | FNM_CASEFOLD
+ #endif
+ ) == 0)
+ {
+ DEBUG("`%s' matches the pattern \"%s\"",
+ string, pat);
+ return true;
+ }
+ }
+ return false;
+}
+
+static void print_pattern_list(const struct pattern_list *list)
+{
+ for (size_t i = 0; i < list->num_pats; i++)
+ printf(" %s\n", list->pats[i]);
+}
+
+static void print_capture_config(const struct capture_config *config)
+{
+ if (config->exclusion_list.num_pats) {
+ puts("Files or folders excluded from image capture:");
+ print_pattern_list(&config->exclusion_list);
+ putchar('\n');
+ }
+}
+
+bool exclude_path(const char *path, const struct capture_config *config,
+ bool exclude_prefix)
+{
+ const char *basename = path_basename(path);
+ if (exclude_prefix) {
+ wimlib_assert(strlen(path) >= config->prefix_len);
+ if (memcmp(config->prefix, path, config->prefix_len) == 0
+ && path[config->prefix_len] == '/')
+ path += config->prefix_len;
+ }
+ return match_pattern(path, basename, &config->exclusion_list) &&
+ !match_pattern(path, basename, &config->exclusion_exception);
+
+}
+
+
+
+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)
+{
+ struct dentry *root_dentry = NULL;
struct image_metadata *imd;
+ struct wim_security_data *sd;
+ struct capture_config config;
+ struct link_group_table *lgt;
int ret;
DEBUG("Adding dentry tree from dir `%s'.", dir);
return WIMLIB_ERR_IMAGE_NAME_COLLISION;
}
- DEBUG("Creating root dentry.");
-
- root_dentry = new_dentry("");
- if (!root_dentry)
- return WIMLIB_ERR_NOMEM;
- ret = calculate_dentry_full_path(root_dentry, NULL);
-
+ DEBUG("Initializing capture configuration");
+ if (!config_str) {
+ DEBUG("Using default capture configuration");
+ config_str = default_config;
+ config_len = strlen(default_config);
+ }
+ ret = init_capture_config(config_str, config_len, dir, &config);
if (ret != 0)
- goto out_free_dentry_tree;
+ return ret;
+ print_capture_config(&config);
- root_dentry->attributes |= FILE_ATTRIBUTE_DIRECTORY;
+ DEBUG("Allocating security data");
+
+ sd = CALLOC(1, sizeof(struct wim_security_data));
+ if (!sd)
+ goto out_destroy_config;
+ sd->total_length = 8;
+ sd->refcnt = 1;
DEBUG("Building dentry tree.");
- ret = build_dentry_tree(root_dentry, dir, w->lookup_table,
- flags | WIMLIB_ADD_IMAGE_FLAG_ROOT);
+ ret = (*capture_tree)(&root_dentry, dir, w->lookup_table, sd,
+ &config, flags | WIMLIB_ADD_IMAGE_FLAG_ROOT,
+ extra_arg);
+ destroy_capture_config(&config);
if (ret != 0) {
ERROR("Failed to build dentry tree for `%s'", dir);
goto out_free_dentry_tree;
}
- DEBUG("Recalculating full paths of dentries.");
+ DEBUG("Calculating full paths of dentries.");
ret = for_dentry_in_tree(root_dentry, calculate_dentry_full_path, NULL);
if (ret != 0)
goto out_free_dentry_tree;
- ret = add_new_dentry_tree(w, root_dentry);
+ ret = add_new_dentry_tree(w, root_dentry, sd);
if (ret != 0)
goto out_free_dentry_tree;
+ lgt = w->image_metadata[w->hdr.image_count - 1].lgt;
DEBUG("Inserting dentries into hard link group table");
- ret = for_dentry_in_tree(root_dentry, link_group_table_insert,
- w->image_metadata[w->hdr.image_count - 1].lgt);
+ ret = for_dentry_in_tree(root_dentry, link_group_table_insert, lgt);
+
if (ret != 0)
goto out_destroy_imd;
- DEBUG("Assigning hard link groups");
- assign_link_groups(w->image_metadata[w->hdr.image_count - 1].lgt);
+
+ DEBUG("Cleanup up the hard link groups");
+ ret = fix_link_groups(lgt);
+ if (ret != 0)
+ goto out_destroy_imd;
+
+ DEBUG("Assigning hard link group IDs");
+ assign_link_group_ids(w->image_metadata[w->hdr.image_count - 1].lgt);
if (flags & WIMLIB_ADD_IMAGE_FLAG_BOOT)
wimlib_set_boot_idx(w, w->hdr.image_count);
- ret = xml_add_image(w, root_dentry, name, description, flags_element);
+ ret = xml_add_image(w, root_dentry, name);
if (ret != 0)
goto out_destroy_imd;
return ret;
out_free_dentry_tree:
free_dentry_tree(root_dentry, w->lookup_table);
+out_free_sd:
+ free_security_data(sd);
+out_destroy_config:
+ 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