* Adds the dentry tree and security data for a new image to the image metadata
* array of the WIMStruct.
*/
-int
+static int
add_new_dentry_tree(WIMStruct *w, struct wim_dentry *root_dentry,
struct wim_security_data *sd)
{
- struct wim_lookup_table_entry *metadata_lte;
- struct wim_image_metadata *imd;
struct wim_image_metadata *new_imd;
-
- wimlib_assert(root_dentry != NULL);
-
- DEBUG("Reallocating image metadata array for image_count = %u",
- w->hdr.image_count + 1);
- imd = CALLOC((w->hdr.image_count + 1), sizeof(struct wim_image_metadata));
-
- if (!imd) {
- ERROR("Failed to allocate memory for new image metadata array");
- goto err;
- }
-
- memcpy(imd, w->image_metadata,
- w->hdr.image_count * sizeof(struct wim_image_metadata));
+ struct wim_lookup_table_entry *metadata_lte;
+ int ret;
metadata_lte = new_lookup_table_entry();
if (!metadata_lte)
- goto err_free_imd;
+ return WIMLIB_ERR_NOMEM;
metadata_lte->resource_entry.flags = WIM_RESHDR_FLAG_METADATA;
+ metadata_lte->unhashed = 1;
- new_imd = &imd[w->hdr.image_count];
+ new_imd = new_image_metadata();
+ if (!new_imd) {
+ free_lookup_table_entry(metadata_lte);
+ return WIMLIB_ERR_NOMEM;
+ }
new_imd->root_dentry = root_dentry;
new_imd->metadata_lte = metadata_lte;
new_imd->security_data = sd;
new_imd->modified = 1;
- FREE(w->image_metadata);
- w->image_metadata = imd;
- w->hdr.image_count++;
- return 0;
-err_free_imd:
- FREE(imd);
-err:
- return WIMLIB_ERR_NOMEM;
+ ret = append_image_metadata(w, new_imd);
+ if (ret)
+ put_image_metadata(new_imd, NULL);
+ return ret;
}
static int
unix_capture_regular_file(const char *path,
- uint64_t size,
+ u64 size,
struct wim_inode *inode,
struct wim_lookup_table *lookup_table)
{
- struct wim_lookup_table_entry *lte;
- u8 hash[SHA1_HASH_SIZE];
- int ret;
-
inode->i_attributes = FILE_ATTRIBUTE_NORMAL;
/* Empty files do not have to have a lookup table entry. */
- if (size == 0)
- return 0;
-
- /* 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(path, hash);
- if (ret)
- return ret;
+ if (size != 0) {
+ struct wim_lookup_table_entry *lte;
+ char *file_on_disk;
- lte = __lookup_resource(lookup_table, hash);
- if (lte) {
- lte->refcnt++;
- DEBUG("Add lte reference %u for `%s'", lte->refcnt,
- path);
- } else {
- char *file_on_disk = STRDUP(path);
- if (!file_on_disk) {
- ERROR("Failed to allocate memory for file path");
+ file_on_disk = STRDUP(path);
+ if (!file_on_disk)
return WIMLIB_ERR_NOMEM;
- }
lte = new_lookup_table_entry();
if (!lte) {
FREE(file_on_disk);
lte->file_on_disk = file_on_disk;
lte->resource_location = RESOURCE_IN_FILE_ON_DISK;
lte->resource_entry.original_size = size;
- lte->resource_entry.size = size;
- copy_hash(lte->hash, hash);
- lookup_table_insert(lookup_table, lte);
+ lookup_table_insert_unhashed(lookup_table, lte, inode, 0);
+ inode->i_lte = lte;
}
- inode->i_lte = lte;
return 0;
}
char *path,
size_t path_len,
struct wim_lookup_table *lookup_table,
- const struct capture_config *config,
+ struct wim_inode_table *inode_table,
+ const struct wimlib_capture_config *config,
int add_image_flags,
wimlib_progress_func_t progress_func);
char *path,
size_t path_len,
struct wim_lookup_table *lookup_table,
- const struct capture_config *config,
+ struct wim_inode_table *inode_table,
+ const struct wimlib_capture_config *config,
int add_image_flags,
wimlib_progress_func_t progress_func)
{
path,
path_len + 1 + name_len,
lookup_table,
+ inode_table,
config,
add_image_flags,
progress_func);
char *path,
size_t path_len,
struct wim_lookup_table *lookup_table,
- const struct capture_config *config,
+ struct wim_inode_table *inode_table,
+ const struct wimlib_capture_config *config,
int add_image_flags,
wimlib_progress_func_t progress_func)
{
goto out;
}
- ret = new_dentry_with_timeless_inode(path_basename_with_len(path, path_len),
- &root);
+ ret = inode_table_new_dentry(inode_table,
+ path_basename_with_len(path, path_len),
+ stbuf.st_ino,
+ stbuf.st_dev,
+ &root);
if (ret)
goto out;
inode = root->d_inode;
+ if (inode->i_nlink > 1) /* Already captured this inode? */
+ goto out;
+
#ifdef HAVE_STAT_NANOSECOND_PRECISION
inode->i_creation_time = timespec_to_wim_timestamp(stbuf.st_mtim);
inode->i_last_write_time = timespec_to_wim_timestamp(stbuf.st_mtim);
inode->i_last_write_time = unix_timestamp_to_wim(stbuf.st_mtime);
inode->i_last_access_time = unix_timestamp_to_wim(stbuf.st_atime);
#endif
- /* Leave the inode number at 0 for directories. Otherwise grab the
- * inode number from the `stat' buffer, including the device number if
- * possible. */
- if (!S_ISDIR(stbuf.st_mode)) {
- if (sizeof(ino_t) >= 8)
- inode->i_ino = (u64)stbuf.st_ino;
- else
- inode->i_ino = (u64)stbuf.st_ino |
- ((u64)stbuf.st_dev <<
- ((sizeof(ino_t) * 8) & 63));
- }
inode->i_resolved = 1;
if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_UNIX_DATA) {
ret = inode_set_unix_data(inode, stbuf.st_uid,
inode, lookup_table);
else if (S_ISDIR(stbuf.st_mode))
ret = unix_capture_directory(root, path, path_len,
- lookup_table, config,
+ lookup_table, inode_table, config,
add_image_flags, progress_func);
else
ret = unix_capture_symlink(path, inode, lookup_table);
*
* @sd_set: Ignored. (Security data only captured in NTFS mode.)
*
- * @capture_config:
+ * @config:
* Configuration for files to be excluded from capture.
*
* @add_flags: Bitwise or of WIMLIB_ADD_IMAGE_FLAG_*
unix_build_dentry_tree(struct wim_dentry **root_ret,
const char *root_disk_path,
struct wim_lookup_table *lookup_table,
+ struct wim_inode_table *inode_table,
struct sd_set *sd_set,
- const struct capture_config *config,
+ const struct wimlib_capture_config *config,
int add_image_flags,
wimlib_progress_func_t progress_func,
void *extra_arg)
path_buf,
path_len,
lookup_table,
+ inode_table,
config,
add_image_flags,
progress_func);
}
#endif /* !__WIN32__ */
-enum pattern_type {
- NONE = 0,
- EXCLUSION_LIST,
- EXCLUSION_EXCEPTION,
- COMPRESSION_EXCLUSION_LIST,
- ALIGNMENT_LIST,
-};
-
-#define COMPAT_DEFAULT_CONFIG
-
-/* Default capture configuration file when none is specified. */
-static const tchar *default_config =
-#ifdef COMPAT_DEFAULT_CONFIG /* XXX: This policy is being moved to library
- users. The next ABI-incompatible library
- version will default to the empty string here. */
-T(
-"[ExclusionList]\n"
-"\\$ntfs.log\n"
-"\\hiberfil.sys\n"
-"\\pagefile.sys\n"
-"\\System Volume Information\n"
-"\\RECYCLER\n"
-"\\Windows\\CSC\n"
-);
-#else
-T("");
-#endif
-
-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);
- memset(config, 0, sizeof(*config));
-}
-
-static int
-pattern_list_add_pattern(struct pattern_list *list, const tchar *pattern)
-{
- const tchar **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;
-}
-
-/* Parses the contents of the image capture configuration file and fills in a
- * `struct capture_config'. */
-static int
-init_capture_config(struct capture_config *config,
- const tchar *_config_str,
- size_t config_num_tchars)
-{
- tchar *config_str;
- tchar *p;
- tchar *eol;
- tchar *next_p;
- size_t num_tchars_remaining;
- enum pattern_type type = NONE;
- int ret;
- unsigned long line_no = 0;
-
- DEBUG("config_num_tchars = %zu", config_num_tchars);
- num_tchars_remaining = config_num_tchars;
- memset(config, 0, sizeof(*config));
- config_str = TMALLOC(config_num_tchars);
- if (!config_str) {
- ERROR("Could not duplicate capture config string");
- return WIMLIB_ERR_NOMEM;
- }
-
- tmemcpy(config_str, _config_str, config_num_tchars);
- next_p = config_str;
- config->config_str = config_str;
- while (num_tchars_remaining != 0) {
- line_no++;
- p = next_p;
- eol = tmemchr(p, T('\n'), num_tchars_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;
- num_tchars_remaining -= (next_p - p);
- if (eol == p)
- continue;
-
- if (*(eol - 1) == T('\r'))
- eol--;
- *eol = T('\0');
-
- /* Translate backslash to forward slash */
- for (tchar *pp = p; pp != eol; pp++)
- if (*pp == T('\\'))
- *pp = T('/');
-
- /* Check if the path begins with a drive letter */
- if (eol - p > 2 && *p != T('/') && *(p + 1) == T(':')) {
- /* Don't allow relative paths on other drives */
- if (eol - p < 3 || *(p + 2) != T('/')) {
- ERROR("Relative paths including a drive letter "
- "are not allowed!\n"
- " Perhaps you meant "
- "\"%"TS":/%"TS"\"?\n",
- *p, p + 2);
- ret = WIMLIB_ERR_INVALID_CAPTURE_CONFIG;
- goto out_destroy;
- }
- #ifndef __WIN32__
- /* UNIX: strip the drive letter */
- p += 2;
- #endif
- }
-
- ret = 0;
- if (!tstrcmp(p, T("[ExclusionList]")))
- type = EXCLUSION_LIST;
- else if (!tstrcmp(p, T("[ExclusionException]")))
- type = EXCLUSION_EXCEPTION;
- else if (!tstrcmp(p, T("[CompressionExclusionList]")))
- type = COMPRESSION_EXCLUSION_LIST;
- else if (!tstrcmp(p, T("[AlignmentList]")))
- type = ALIGNMENT_LIST;
- else if (p[0] == T('[') && tstrrchr(p, T(']'))) {
- ERROR("Unknown capture configuration section \"%"TS"\"", p);
- ret = WIMLIB_ERR_INVALID_CAPTURE_CONFIG;
- } else switch (type) {
- case EXCLUSION_LIST:
- DEBUG("Adding pattern \"%"TS"\" to exclusion list", p);
- ret = pattern_list_add_pattern(&config->exclusion_list, p);
- break;
- case EXCLUSION_EXCEPTION:
- DEBUG("Adding pattern \"%"TS"\" to exclusion exception list", p);
- ret = pattern_list_add_pattern(&config->exclusion_exception, p);
- break;
- case COMPRESSION_EXCLUSION_LIST:
- DEBUG("Adding pattern \"%"TS"\" to compression exclusion list", p);
- ret = pattern_list_add_pattern(&config->compression_exclusion_list, p);
- break;
- case ALIGNMENT_LIST:
- DEBUG("Adding pattern \"%"TS"\" 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;
- break;
- }
- if (ret != 0)
- goto out_destroy;
- }
- return 0;
-out_destroy:
- destroy_capture_config(config);
- return ret;
-}
-
-static bool
-is_absolute_path(const tchar *path)
-{
- if (*path == T('/'))
- return true;
-#ifdef __WIN32__
- /* Drive letter */
- if (*path && *(path + 1) == T(':'))
- return true;
-#endif
- return false;
-}
-
static bool
match_pattern(const tchar *path,
const tchar *path_basename,
- const struct pattern_list *list)
+ const struct wimlib_pattern_list *list)
{
for (size_t i = 0; i < list->num_pats; i++) {
+
const tchar *pat = list->pats[i];
const tchar *string;
- if (is_absolute_path(pat)) {
+
+ if (*pat == T('/')) {
/* Absolute path from root of capture */
string = path;
} else {
/* Warning: on Windows native builds, fnmatch() calls the
* replacement function in win32.c. */
- if (fnmatch(pat, string, FNM_PATHNAME
+ if (fnmatch(pat, string, FNM_PATHNAME | FNM_NOESCAPE
#ifdef FNM_CASEFOLD
| FNM_CASEFOLD
#endif
DEBUG("\"%"TS"\" matches the pattern \"%"TS"\"",
string, pat);
return true;
+ } else {
+ DEBUG2("\"%"TS"\" does not match the pattern \"%"TS"\"",
+ string, pat);
}
}
return false;
*/
bool
exclude_path(const tchar *path, size_t path_len,
- const struct capture_config *config, bool exclude_prefix)
+ const struct wimlib_capture_config *config, bool exclude_prefix)
{
const tchar *basename = path_basename_with_len(path, path_len);
if (exclude_prefix) {
- wimlib_assert(path_len >= config->prefix_num_tchars);
- if (!tmemcmp(config->prefix, path, config->prefix_num_tchars) &&
- path[config->prefix_num_tchars] == T('/'))
+ wimlib_assert(path_len >= config->_prefix_num_tchars);
+ if (!tmemcmp(config->_prefix, path, config->_prefix_num_tchars) &&
+ path[config->_prefix_num_tchars] == T('/'))
{
- path += config->prefix_num_tchars;
+ path += config->_prefix_num_tchars;
}
}
- return match_pattern(path, basename, &config->exclusion_list) &&
- !match_pattern(path, basename, &config->exclusion_exception);
+ return match_pattern(path, basename, &config->exclusion_pats) &&
+ !match_pattern(path, basename, &config->exclusion_exception_pats);
}
DEBUG("Creating filler directory \"%"TS"\"", name);
ret = new_dentry_with_inode(name, &dentry);
if (ret == 0) {
- /* Leave the inode number as 0 for now. The final inode number
- * will be assigned later by assign_inode_numbers(). */
+ /* Leave the inode number as 0; this is allowed for non
+ * hard-linked files. */
dentry->d_inode->i_resolved = 1;
dentry->d_inode->i_attributes = FILE_ATTRIBUTE_DIRECTORY;
*dentry_ret = dentry;
}
}
+static int
+canonicalize_pat(tchar **pat_p)
+{
+ tchar *pat = *pat_p;
+
+ /* Turn all backslashes in the pattern into forward slashes. */
+ zap_backslashes(pat);
+
+ if (*pat != T('/') && *pat != T('\0') && *(pat + 1) == T(':')) {
+ /* Pattern begins with drive letter */
+ if (*(pat + 2) != T('/')) {
+ /* Something like c:file, which is actually a path
+ * relative to the current working directory on the c:
+ * drive. We require paths with drive letters to be
+ * absolute. */
+ ERROR("Invalid path \"%"TS"\"; paths including drive letters "
+ "must be absolute!", pat);
+ ERROR("Maybe try \"%"TC":/%"TS"\"?",
+ *pat, pat + 2);
+ return WIMLIB_ERR_INVALID_CAPTURE_CONFIG;
+ }
+
+ WARNING("Pattern \"%"TS"\" starts with a drive letter, which is "
+ "being removed.", pat);
+ /* Strip the drive letter */
+ pat += 2;
+ *pat_p = pat;
+ }
+ return 0;
+}
+
+static int
+canonicalize_pat_list(struct wimlib_pattern_list *pat_list)
+{
+ int ret = 0;
+ for (size_t i = 0; i < pat_list->num_pats; i++) {
+ ret = canonicalize_pat(&pat_list->pats[i]);
+ if (ret)
+ break;
+ }
+ return ret;
+}
+
+static int
+canonicalize_capture_config(struct wimlib_capture_config *config)
+{
+ int ret = canonicalize_pat_list(&config->exclusion_pats);
+ if (ret)
+ return ret;
+ return canonicalize_pat_list(&config->exclusion_exception_pats);
+}
+
WIMLIBAPI int
wimlib_add_image_multisource(WIMStruct *w,
struct wimlib_capture_source *sources,
size_t num_sources,
const tchar *name,
- const tchar *config_str,
- size_t config_len,
+ struct wimlib_capture_config *config,
int add_image_flags,
wimlib_progress_func_t progress_func)
{
int (*capture_tree)(struct wim_dentry **,
const tchar *,
struct wim_lookup_table *,
+ struct wim_inode_table *,
struct sd_set *,
- const struct capture_config *,
+ const struct wimlib_capture_config *,
int,
wimlib_progress_func_t,
void *);
struct wim_dentry *root_dentry;
struct wim_dentry *branch;
struct wim_security_data *sd;
- struct capture_config config;
struct wim_image_metadata *imd;
+ struct wim_inode_table inode_table;
+ struct list_head unhashed_streams;
int ret;
struct sd_set sd_set;
+#ifdef WITH_NTFS_3G
+ struct _ntfs_volume *ntfs_vol = NULL;
+#endif
if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_NTFS) {
#ifdef WITH_NTFS_3G
return WIMLIB_ERR_INVALID_PARAM;
}
capture_tree = build_dentry_tree_ntfs;
- extra_arg = &w->ntfs_vol;
+ extra_arg = &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_IMAGE_NAME_COLLISION;
}
- if (!config_str) {
- DEBUG("Using default capture configuration");
- config_str = default_config;
- config_len = tstrlen(default_config);
+ if (!config) {
+ DEBUG("Capture config not provided; using empty config");
+ config = alloca(sizeof(*config));
+ memset(config, 0, sizeof(*config));
}
- ret = init_capture_config(&config, config_str, config_len);
+
+ ret = canonicalize_capture_config(config);
+ if (ret)
+ goto out;
+
+ ret = init_inode_table(&inode_table, 9001);
if (ret)
goto out;
sd = CALLOC(1, sizeof(struct wim_security_data));
if (!sd) {
ret = WIMLIB_ERR_NOMEM;
- goto out_destroy_capture_config;
+ goto out_destroy_inode_table;
}
sd->total_length = 8;
- sd->refcnt = 1;
sd_set.sd = sd;
sd_set.rb_root.rb_node = NULL;
+
DEBUG("Using %zu capture sources", num_sources);
canonicalize_sources_and_targets(sources, num_sources);
sort_sources(sources, num_sources);
goto out_free_security_data;
}
- DEBUG("Building dentry tree.");
+ INIT_LIST_HEAD(&unhashed_streams);
+ w->lookup_table->unhashed_streams = &unhashed_streams;
root_dentry = NULL;
-
for (size_t i = 0; i < num_sources; i++) {
int flags;
union wimlib_progress_info progress;
progress.scan.wim_target_path = sources[i].wim_target_path;
progress_func(WIMLIB_PROGRESS_MSG_SCAN_BEGIN, &progress);
}
- config.prefix = sources[i].fs_source_path;
- config.prefix_num_tchars = tstrlen(sources[i].fs_source_path);
+ config->_prefix = sources[i].fs_source_path;
+ config->_prefix_num_tchars = tstrlen(sources[i].fs_source_path);
flags = add_image_flags | WIMLIB_ADD_IMAGE_FLAG_SOURCE;
if (!*sources[i].wim_target_path)
flags |= WIMLIB_ADD_IMAGE_FLAG_ROOT;
ret = (*capture_tree)(&branch,
sources[i].fs_source_path,
w->lookup_table,
+ &inode_table,
&sd_set,
- &config,
+ config,
flags,
progress_func, extra_arg);
if (ret) {
goto out_free_dentry_tree;
}
- DEBUG("Calculating full paths of dentries.");
- ret = for_dentry_in_tree(root_dentry, calculate_dentry_full_path, NULL);
- if (ret)
- goto out_free_dentry_tree;
-
ret = add_new_dentry_tree(w, root_dentry, sd);
- if (ret)
+
+ if (ret) {
+#ifdef WITH_NTFS_3G
+ if (ntfs_vol)
+ do_ntfs_umount(ntfs_vol);
+#endif
goto out_free_dentry_tree;
+ }
- imd = &w->image_metadata[w->hdr.image_count - 1];
+ imd = w->image_metadata[w->hdr.image_count - 1];
+ INIT_LIST_HEAD(&imd->unhashed_streams);
+ list_splice(&unhashed_streams, &imd->unhashed_streams);
- ret = dentry_tree_fix_inodes(root_dentry, &imd->inode_list);
- if (ret)
- goto out_destroy_imd;
+#ifdef WITH_NTFS_3G
+ imd->ntfs_vol = ntfs_vol;
+#endif
DEBUG("Assigning hard link group IDs");
- assign_inode_numbers(&imd->inode_list);
+ inode_table_prepare_inode_list(&inode_table, &imd->inode_list);
ret = xml_add_image(w, name);
if (ret)
- goto out_destroy_imd;
+ goto out_put_imd;
if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_BOOT)
wimlib_set_boot_idx(w, w->hdr.image_count);
+
ret = 0;
- goto out_destroy_sd_set;
-out_destroy_imd:
- destroy_image_metadata(&w->image_metadata[w->hdr.image_count - 1],
- w->lookup_table);
- w->hdr.image_count--;
- goto out_destroy_sd_set;
+ goto out_destroy_inode_table;
+out_put_imd:
+ put_image_metadata(w->image_metadata[--w->hdr.image_count],
+ w->lookup_table);
+ goto out_destroy_inode_table;
out_free_branch:
free_dentry_tree(branch, w->lookup_table);
out_free_dentry_tree:
free_dentry_tree(root_dentry, w->lookup_table);
out_free_security_data:
free_security_data(sd);
-out_destroy_sd_set:
+out_destroy_inode_table:
+ destroy_inode_table(&inode_table);
destroy_sd_set(&sd_set);
-out_destroy_capture_config:
- destroy_capture_config(&config);
out:
return ret;
}
wimlib_add_image(WIMStruct *w,
const tchar *source,
const tchar *name,
- const tchar *config_str,
- size_t config_len,
+ struct wimlib_capture_config *config,
int add_image_flags,
wimlib_progress_func_t progress_func)
{
.reserved = 0,
};
ret = wimlib_add_image_multisource(w, &capture_src, 1, name,
- config_str, config_len,
- add_image_flags, progress_func);
+ config, add_image_flags,
+ progress_func);
FREE(fs_source_path);
return ret;
}
git://wimlib.net / wimlib / blobdiff