X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fadd_image.c;h=cf89e695dc986389ad7dd5a3d0da72c0f4c6ac66;hp=67a354e4b27b0e3424f020de322a0d22adfc1a3f;hb=541b65d79e0c73238a25e2c2661711d8593d0684;hpb=7acdc3aecd7ce546727ae8239e0d942c2a00db43 diff --git a/src/add_image.c b/src/add_image.c index 67a354e4..cf89e695 100644 --- a/src/add_image.c +++ b/src/add_image.c @@ -51,8 +51,9 @@ * Adds the dentry tree and security data for a new image to the image metadata * array of the WIMStruct. */ -int add_new_dentry_tree(WIMStruct *w, struct wim_dentry *root_dentry, - struct wim_security_data *sd) +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; @@ -108,7 +109,7 @@ err: * modified if successful. Set to NULL if the file or directory was * excluded from capture. * - * @root_disk_path: The path to the root of the directory tree on disk (UTF-8). + * @root_disk_path: The path to the root of the directory tree on disk. * * @lookup_table: The lookup table for the WIM file. For each file added to the * dentry tree being built, an entry is added to the lookup table, @@ -133,14 +134,15 @@ err: * the on-disk files during a call to wimlib_write() or * wimlib_overwrite(). */ -static int unix_build_dentry_tree(struct wim_dentry **root_ret, - const char *root_disk_path, - struct wim_lookup_table *lookup_table, - struct wim_security_data *sd, - const struct capture_config *config, - int add_image_flags, - wimlib_progress_func_t progress_func, - void *extra_arg) +static int +unix_build_dentry_tree(struct wim_dentry **root_ret, + const mbchar *root_disk_path, + struct wim_lookup_table *lookup_table, + struct wim_security_data *sd, + const struct capture_config *config, + int add_image_flags, + wimlib_progress_func_t progress_func, + void *extra_arg) { struct wim_dentry *root = NULL; int ret = 0; @@ -212,16 +214,10 @@ static int unix_build_dentry_tree(struct wim_dentry **root_ret, goto out; } - root = new_dentry_with_timeless_inode(path_basename(root_disk_path)); - if (!root) { - if (errno == EILSEQ) - ret = WIMLIB_ERR_INVALID_UTF8_STRING; - else if (errno == ENOMEM) - ret = WIMLIB_ERR_NOMEM; - else - ret = WIMLIB_ERR_ICONV_NOT_AVAILABLE; + ret = new_dentry_with_timeless_inode(path_basename(root_disk_path), + &root); + if (ret) goto out; - } inode = root->d_inode; @@ -280,7 +276,7 @@ static int unix_build_dentry_tree(struct wim_dentry **root_ret, DEBUG("Add lte reference %u for `%s'", lte->refcnt, root_disk_path); } else { - char *file_on_disk = STRDUP(root_disk_path); + mbchar *file_on_disk = STRDUP(root_disk_path); if (!file_on_disk) { ERROR("Failed to allocate memory for file path"); ret = WIMLIB_ERR_NOMEM; @@ -318,7 +314,7 @@ static int unix_build_dentry_tree(struct wim_dentry **root_ret, /* Buffer for names of files in directory. */ size_t len = strlen(root_disk_path); - char name[len + 1 + FILENAME_MAX + 1]; + mbchar name[len + 1 + FILENAME_MAX + 1]; memcpy(name, root_disk_path, len); name[len] = '/'; @@ -362,7 +358,7 @@ static int unix_build_dentry_tree(struct wim_dentry **root_ret, * drive letter). */ - char deref_name_buf[4096]; + mbchar deref_name_buf[4096]; ssize_t deref_name_len; deref_name_len = readlink(root_disk_path, deref_name_buf, @@ -414,7 +410,7 @@ enum pattern_type { #define COMPAT_DEFAULT_CONFIG /* Default capture configuration file when none is specified. */ -static const char *default_config = +static const mbchar *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. */ @@ -435,12 +431,14 @@ static const char *default_config = ""; #endif -static void destroy_pattern_list(struct pattern_list *list) +static void +destroy_pattern_list(struct pattern_list *list) { FREE(list->pats); } -static void destroy_capture_config(struct capture_config *config) +static void +destroy_capture_config(struct capture_config *config) { destroy_pattern_list(&config->exclusion_list); destroy_pattern_list(&config->exclusion_exception); @@ -451,10 +449,10 @@ static void destroy_capture_config(struct capture_config *config) memset(config, 0, sizeof(*config)); } -static int pattern_list_add_pattern(struct pattern_list *list, - const char *pattern) +static int +pattern_list_add_pattern(struct pattern_list *list, const mbchar *pattern) { - const char **pats; + const mbchar **pats; if (list->num_pats >= list->num_allocated_pats) { pats = REALLOC(list->pats, sizeof(list->pats[0]) * (list->num_allocated_pats + 8)); @@ -469,13 +467,14 @@ static int pattern_list_add_pattern(struct pattern_list *list, /* 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 char *_config_str, size_t config_len) +static int +init_capture_config(struct capture_config *config, + const mbchar *_config_str, size_t config_len) { - char *config_str; - char *p; - char *eol; - char *next_p; + mbchar *config_str; + mbchar *p; + mbchar *eol; + mbchar *next_p; size_t bytes_remaining; enum pattern_type type = NONE; int ret; @@ -514,7 +513,7 @@ static int init_capture_config(struct capture_config *config, *eol = '\0'; /* Translate backslash to forward slash */ - for (char *pp = p; pp != eol; pp++) + for (mbchar *pp = p; pp != eol; pp++) if (*pp == '\\') *pp = '/'; @@ -568,9 +567,9 @@ out_destroy: } static int capture_config_set_prefix(struct capture_config *config, - const char *_prefix) + const mbchar *_prefix) { - char *prefix = STRDUP(_prefix); + mbchar *prefix = STRDUP(_prefix); if (!prefix) return WIMLIB_ERR_NOMEM; @@ -580,12 +579,13 @@ static int capture_config_set_prefix(struct capture_config *config, return 0; } -static bool match_pattern(const char *path, const char *path_basename, +static bool match_pattern(const mbchar *path, + const mbchar *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; + const mbchar *pat = list->pats[i]; + const mbchar *string; if (pat[0] == '/') /* Absolute path from root of capture */ string = path; @@ -623,10 +623,11 @@ static bool match_pattern(const char *path, const char *path_basename, * 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) +bool +exclude_path(const mbchar *path, const struct capture_config *config, + bool exclude_prefix) { - const char *basename = path_basename(path); + const mbchar *basename = path_basename(path); if (exclude_prefix) { wimlib_assert(strlen(path) >= config->prefix_len); if (memcmp(config->prefix, path, config->prefix_len) == 0 @@ -640,7 +641,8 @@ bool exclude_path(const char *path, const struct capture_config *config, /* Strip leading and trailing forward slashes from a string. Modifies it in * place and returns the stripped string. */ -static const char *canonicalize_target_path(char *target_path) +static const char * +canonicalize_target_path(char *target_path) { char *p; if (target_path == NULL) @@ -661,7 +663,8 @@ static const char *canonicalize_target_path(char *target_path) } #ifdef __WIN32__ -static void zap_backslashes(char *s) +static void +zap_backslashes(char *s) { while (*s) { if (*s == '\\') @@ -672,8 +675,8 @@ static void zap_backslashes(char *s) #endif /* Strip leading and trailing slashes from the target paths */ -static void canonicalize_targets(struct wimlib_capture_source *sources, - size_t num_sources) +static void +canonicalize_targets(struct wimlib_capture_source *sources, size_t num_sources) { while (num_sources--) { DEBUG("Canonicalizing { source: \"%s\", target=\"%s\"}", @@ -694,7 +697,8 @@ static void canonicalize_targets(struct wimlib_capture_source *sources, } } -static int capture_source_cmp(const void *p1, const void *p2) +static int +capture_source_cmp(const void *p1, const void *p2) { const struct wimlib_capture_source *s1 = p1, *s2 = p2; return strcmp(s1->wim_target_path, s2->wim_target_path); @@ -705,14 +709,15 @@ static int capture_source_cmp(const void *p1, const void *p2) * * One purpose of this is to make sure that target paths that are inside other * target paths are added after the containing target paths. */ -static void sort_sources(struct wimlib_capture_source *sources, - size_t num_sources) +static void +sort_sources(struct wimlib_capture_source *sources, size_t num_sources) { qsort(sources, num_sources, sizeof(sources[0]), capture_source_cmp); } -static int check_sorted_sources(struct wimlib_capture_source *sources, - size_t num_sources, int add_image_flags) +static int +check_sorted_sources(struct wimlib_capture_source *sources, size_t num_sources, + int add_image_flags) { if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_NTFS) { if (num_sources != 1) { @@ -766,34 +771,38 @@ static int check_sorted_sources(struct wimlib_capture_source *sources, /* Creates a new directory to place in the WIM image. This is to create parent * directories that are not part of any target as needed. */ -static struct wim_dentry * -new_filler_directory(const char *name) +static int +new_filler_directory(const mbchar *name, struct wim_dentry **dentry_ret) { + int ret; struct wim_dentry *dentry; + DEBUG("Creating filler directory \"%s\"", name); - dentry = new_dentry_with_inode(name); - if (dentry) { + 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(). */ dentry->d_inode->i_resolved = 1; dentry->d_inode->i_attributes = FILE_ATTRIBUTE_DIRECTORY; + *dentry_ret = dentry; } - return dentry; + return ret; } /* Transfers the children of @branch to @target. It is an error if @target is * not a directory or if both @branch and @target contain a child dentry with * the same name. */ -static int do_overlay(struct wim_dentry *target, struct wim_dentry *branch) +static int +do_overlay(struct wim_dentry *target, struct wim_dentry *branch) { struct rb_root *rb_root; - DEBUG("Doing overlay %s => %s", - branch->file_name_utf8, target->file_name_utf8); + DEBUG("Doing overlay \"%W\" => \"%W\"", + branch->file_name, target->file_name); if (!dentry_is_directory(target)) { - ERROR("Cannot overlay directory `%s' over non-directory", - branch->file_name_utf8); + ERROR("Cannot overlay directory \"%W\" over non-directory", + branch->file_name); return WIMLIB_ERR_INVALID_OVERLAY; } @@ -806,9 +815,9 @@ static int do_overlay(struct wim_dentry *target, struct wim_dentry *branch) /* Revert the change to avoid leaking the directory tree * rooted at @child */ dentry_add_child(branch, child); - ERROR("Overlay error: file `%s' already exists " - "as a child of `%s'", - child->file_name_utf8, target->file_name_utf8); + ERROR("Overlay error: file \"%W\" already exists " + "as a child of \"%W\"", + child->file_name, target->file_name); return WIMLIB_ERR_INVALID_OVERLAY; } } @@ -828,15 +837,16 @@ static int do_overlay(struct wim_dentry *target, struct wim_dentry *branch) * Path in the WIM image to add the branch, with leading and trailing * slashes stripped. */ -static int attach_branch(struct wim_dentry **root_p, - struct wim_dentry *branch, - char *target_path) +static int +attach_branch(struct wim_dentry **root_p, struct wim_dentry *branch, + mbchar *target_path) { - char *slash; + mbchar *slash; struct wim_dentry *dentry, *parent, *target; + int ret; - DEBUG("Attaching branch \"%s\" => \"%s\"", - branch->file_name_utf8, target_path); + DEBUG("Attaching branch \"%W\" => \"%s\"", + branch->file_name, target_path); if (*target_path == '\0') { /* Target: root directory */ @@ -853,9 +863,9 @@ static int attach_branch(struct wim_dentry **root_p, /* Adding a non-root branch. Create root if it hasn't been created * already. */ if (!*root_p) { - *root_p = new_filler_directory(""); - if (!*root_p) - return WIMLIB_ERR_NOMEM; + ret = new_filler_directory("", root_p); + if (ret) + return ret; } /* Walk the path to the branch, creating filler directories as needed. @@ -865,9 +875,9 @@ static int attach_branch(struct wim_dentry **root_p, *slash = '\0'; dentry = get_dentry_child_with_name(parent, target_path); if (!dentry) { - dentry = new_filler_directory(target_path); - if (!dentry) - return WIMLIB_ERR_NOMEM; + ret = new_filler_directory(target_path, &dentry); + if (ret) + return ret; dentry_add_child(parent, dentry); } parent = dentry; @@ -882,7 +892,8 @@ static int attach_branch(struct wim_dentry **root_p, /* If the target path already existed, overlay the branch onto it. * Otherwise, set the branch as the target path. */ - target = get_dentry_child_with_name(parent, branch->file_name_utf8); + target = get_dentry_child_with_utf16le_name(parent, branch->file_name, + branch->file_name_nbytes); if (target) { return do_overlay(target, branch); } else { @@ -891,20 +902,24 @@ static int attach_branch(struct wim_dentry **root_p, } } -WIMLIBAPI int wimlib_add_image_multisource(WIMStruct *w, - struct wimlib_capture_source *sources, - size_t num_sources, - const char *name, - const char *config_str, - size_t config_len, - int add_image_flags, - wimlib_progress_func_t progress_func) +WIMLIBAPI int +wimlib_add_image_multisource(WIMStruct *w, + struct wimlib_capture_source *sources, + size_t num_sources, + const utf8char *name, + const mbchar *config_str, + size_t config_len, + int add_image_flags, + wimlib_progress_func_t progress_func) { - int (*capture_tree)(struct wim_dentry **, const char *, + int (*capture_tree)(struct wim_dentry **, + const mbchar *, struct wim_lookup_table *, struct wim_security_data *, const struct capture_config *, - int, wimlib_progress_func_t, void *); + int, + wimlib_progress_func_t, + void *); void *extra_arg; struct wim_dentry *root_dentry; struct wim_dentry *branch; @@ -962,8 +977,8 @@ WIMLIBAPI int wimlib_add_image_multisource(WIMStruct *w, } if (wimlib_image_name_in_use(w, name)) { - ERROR("There is already an image named \"%s\" in `%s'", - name, w->filename); + ERROR("There is already an image named \"%U\" in the WIM!", + name); return WIMLIB_ERR_IMAGE_NAME_COLLISION; } @@ -995,92 +1010,84 @@ WIMLIBAPI int wimlib_add_image_multisource(WIMStruct *w, } DEBUG("Building dentry tree."); - if (num_sources == 0) { - root_dentry = new_filler_directory(""); - if (!root_dentry) { - ret = WIMLIB_ERR_NOMEM; - goto out_free_security_data; + root_dentry = NULL; + + for (size_t i = 0; i < num_sources; i++) { + int flags; + union wimlib_progress_info progress; + + DEBUG("Building dentry tree for source %zu of %zu " + "(\"%s\" => \"%s\")", i + 1, num_sources, + sources[i].fs_source_path, + sources[i].wim_target_path); + if (progress_func) { + memset(&progress, 0, sizeof(progress)); + progress.scan.source = sources[i].fs_source_path; + progress.scan.wim_target_path = sources[i].wim_target_path; + progress_func(WIMLIB_PROGRESS_MSG_SCAN_BEGIN, &progress); } - } else { - size_t i; - - #ifdef __WIN32__ - win32_acquire_capture_privileges(); - #endif + ret = capture_config_set_prefix(&config, + sources[i].fs_source_path); + if (ret) + goto out_free_dentry_tree; + 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, sd, + &config, + flags, + progress_func, extra_arg); + if (ret) { + ERROR("Failed to build dentry tree for `%s'", + sources[i].fs_source_path); + goto out_free_dentry_tree; + } + if (branch) { + /* Use the target name, not the source name, for + * the root of each branch from a capture + * source. (This will also set the root dentry + * of the entire image to be unnamed.) */ + ret = set_dentry_name(branch, + path_basename(sources[i].wim_target_path)); + if (ret) + goto out_free_branch; - root_dentry = NULL; - i = 0; - do { - int flags; - union wimlib_progress_info progress; - - DEBUG("Building dentry tree for source %zu of %zu " - "(\"%s\" => \"%s\")", i + 1, num_sources, - sources[i].fs_source_path, - sources[i].wim_target_path); - if (progress_func) { - memset(&progress, 0, sizeof(progress)); - progress.scan.source = sources[i].fs_source_path; - progress.scan.wim_target_path = sources[i].wim_target_path; - progress_func(WIMLIB_PROGRESS_MSG_SCAN_BEGIN, &progress); - } - ret = capture_config_set_prefix(&config, - sources[i].fs_source_path); + ret = attach_branch(&root_dentry, branch, + sources[i].wim_target_path); if (ret) - goto out_free_dentry_tree; - 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, sd, - &config, - flags, - progress_func, extra_arg); - if (ret) { - ERROR("Failed to build dentry tree for `%s'", - sources[i].fs_source_path); - goto out_free_dentry_tree; - } - if (branch) { - /* Use the target name, not the source name, for - * the root of each branch from a capture - * source. (This will also set the root dentry - * of the entire image to be unnamed.) */ - ret = set_dentry_name(branch, - path_basename(sources[i].wim_target_path)); - if (ret) - goto out_free_branch; - - ret = attach_branch(&root_dentry, branch, - sources[i].wim_target_path); - if (ret) - goto out_free_branch; - } - if (progress_func) - progress_func(WIMLIB_PROGRESS_MSG_SCAN_END, &progress); - } while (++i != num_sources); + goto out_free_branch; + } + if (progress_func) + progress_func(WIMLIB_PROGRESS_MSG_SCAN_END, &progress); + } + + if (root_dentry == NULL) { + ret = new_filler_directory("" , &root_dentry); + 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 != 0) + if (ret) goto out_free_dentry_tree; ret = add_new_dentry_tree(w, root_dentry, sd); - if (ret != 0) + if (ret) goto out_free_dentry_tree; imd = &w->image_metadata[w->hdr.image_count - 1]; ret = dentry_tree_fix_inodes(root_dentry, &imd->inode_list); - if (ret != 0) + if (ret) goto out_destroy_imd; DEBUG("Assigning hard link group IDs"); assign_inode_numbers(&imd->inode_list); ret = xml_add_image(w, name); - if (ret != 0) + if (ret) goto out_destroy_imd; if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_BOOT) @@ -1101,21 +1108,22 @@ out_free_security_data: out_destroy_capture_config: destroy_capture_config(&config); out: -#ifdef __WIN32__ - win32_release_capture_privileges(); -#endif return ret; } -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) +WIMLIBAPI int +wimlib_add_image(WIMStruct *w, + const mbchar *source, + const utf8char *name, + const mbchar *config_str, + size_t config_len, + int add_image_flags, + wimlib_progress_func_t progress_func) { if (!source || !*source) return WIMLIB_ERR_INVALID_PARAM; - char *fs_source_path = STRDUP(source); + mbchar *fs_source_path = STRDUP(source); int ret; struct wimlib_capture_source capture_src = { .fs_source_path = fs_source_path,