#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
int (*stat_fn)(const char *restrict, struct stat *restrict);
struct dentry *root;
- DEBUG("%s", root_disk_path);
-
- if (exclude_path(root_disk_path, config)) {
+ 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;
}
ret = build_dentry_tree(&child, name, lookup_table,
sd, config,
add_flags, extra_arg);
- link_dentry(child, root);
if (ret != 0)
break;
+ if (child)
+ link_dentry(child, root);
}
closedir(dir);
} else if (dentry_is_symlink(root)) {
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.
}
root->lte = lte;
}
+out:
*root_ret = root;
return ret;
}
"\\$ntfs.log\n"
"\\hiberfil.sys\n"
"\\pagefile.sys\n"
-"\"\\System Volume Information\"\n"
+"\\System Volume Information\n"
"\\RECYCLER\n"
"\\Windows\\CSC\n"
"\n"
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 init_capture_config(const char *_config_str, size_t config_len,
- struct capture_config *config)
+ const char *_prefix, struct capture_config *config)
{
char *config_str;
+ char *prefix;
char *p;
char *eol;
char *next_p;
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;
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)
const char *pat = list->pats[i];
const char *string;
if (pat[0] == '/')
+ /* Absolute path from root of capture */
string = path;
- else
- string = path_basename;
- if (fnmatch(pat, string, FNM_PATHNAME) == 0) {
+ 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;
}
}
-bool exclude_path(const char *path, const struct capture_config *config)
+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 *description, const char *flags_element,
const char *config_str, size_t config_len,
int flags,
int (*capture_tree)(struct dentry **, const char *,
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);
config_str = default_config;
config_len = strlen(default_config);
}
- ret = init_capture_config(config_str, config_len, &config);
+ ret = init_capture_config(config_str, config_len, dir, &config);
if (ret != 0)
return ret;
print_capture_config(&config);
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("Cleanup up the hard link groups");
+ ret = fix_link_groups(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("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;
* 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,
- const char *config_str,
+ const char *name, const char *config_str,
size_t config_len, int flags)
{
- return do_add_image(w, dir, name, description, flags_element,
- config_str, config_len, flags,
+ return do_add_image(w, dir, name, config_str, config_len, flags,
build_dentry_tree, NULL);
}
git://wimlib.net / wimlib / blobdiff