X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fadd_image.c;h=0e55a981e6e2e8ca2a4ba88ee812417ff9d83fb7;hp=ab4adc97176e459bc38f27406a4d186b6b92df29;hb=237947e198385359a0c618b664d73bf4db36c405;hpb=b5d427e440402aff987a060ff6ceefcb97117fa4 diff --git a/src/add_image.c b/src/add_image.c index ab4adc97..0e55a981 100644 --- a/src/add_image.c +++ b/src/add_image.c @@ -36,11 +36,14 @@ #include "dentry.h" #include "lookup_table.h" #include "xml.h" +#include "security.h" #include #include #include +#include #include + #include #ifdef HAVE_ALLOCA_H @@ -78,8 +81,6 @@ add_new_dentry_tree(WIMStruct *w, struct wim_dentry *root_dentry, goto err_free_imd; metadata_lte->resource_entry.flags = WIM_RESHDR_FLAG_METADATA; - random_hash(metadata_lte->hash); - lookup_table_insert(w->lookup_table, metadata_lte); new_imd = &imd[w->hdr.image_count]; @@ -100,65 +101,196 @@ err: } #ifndef __WIN32__ -/* - * build_dentry_tree(): - * Recursively builds a tree of WIM dentries from an on-disk directory - * tree. - * - * @root_ret: Place to return a pointer to the root of the dentry tree. Only - * 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. - * - * @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, - * unless an identical stream is already in the lookup table. - * These lookup table entries that are added point to the path of - * the file on disk. - * - * @sd: Ignored. (Security data only captured in NTFS mode.) - * - * @capture_config: - * Configuration for files to be excluded from capture. - * - * @add_flags: Bitwise or of WIMLIB_ADD_IMAGE_FLAG_* - * - * @extra_arg: Ignored in UNIX builds; used to pass sd_set pointer in Windows - * builds. - * - * @return: 0 on success, nonzero on failure. It is a failure if any of - * the files cannot be `stat'ed, or if any of the needed - * directories cannot be opened or read. Failure to add the files - * to the WIM may still occur later when trying to actually read - * 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 mbchar *root_disk_path, +unix_capture_regular_file(const char *path, + uint64_t 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; + + 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"); + return WIMLIB_ERR_NOMEM; + } + lte = new_lookup_table_entry(); + if (!lte) { + FREE(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 = size; + lte->resource_entry.size = size; + copy_hash(lte->hash, hash); + lookup_table_insert(lookup_table, lte); + } + inode->i_lte = lte; + return 0; +} + +static int +unix_build_dentry_tree_recursive(struct wim_dentry **root_ret, + char *path, + size_t path_len, + struct wim_lookup_table *lookup_table, + const struct capture_config *config, + int add_image_flags, + wimlib_progress_func_t progress_func); + +static int +unix_capture_directory(struct wim_dentry *dir_dentry, + char *path, + size_t path_len, 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) + wimlib_progress_func_t progress_func) +{ + + DIR *dir; + struct dirent entry, *result; + struct wim_dentry *child; + int ret; + + dir_dentry->d_inode->i_attributes = FILE_ATTRIBUTE_DIRECTORY; + dir = opendir(path); + if (!dir) { + ERROR_WITH_ERRNO("Failed to open the directory `%s'", + path); + return WIMLIB_ERR_OPEN; + } + + /* Recurse on directory contents */ + while (1) { + errno = 0; + ret = readdir_r(dir, &entry, &result); + if (ret != 0) { + ret = WIMLIB_ERR_READ; + ERROR_WITH_ERRNO("Error reading the " + "directory `%s'", + path); + break; + } + if (result == NULL) + break; + if (result->d_name[0] == '.' && (result->d_name[1] == '\0' + || (result->d_name[1] == '.' && result->d_name[2] == '\0'))) + continue; + + size_t name_len = strlen(result->d_name); + + path[path_len] = '/'; + memcpy(&path[path_len + 1], result->d_name, name_len + 1); + ret = unix_build_dentry_tree_recursive(&child, + path, + path_len + 1 + name_len, + lookup_table, + config, + add_image_flags, + progress_func); + if (ret) + break; + if (child) + dentry_add_child(dir_dentry, child); + } + closedir(dir); + return ret; +} + +static int +unix_capture_symlink(const char *path, + struct wim_inode *inode, + struct wim_lookup_table *lookup_table) +{ + char deref_name_buf[4096]; + ssize_t deref_name_len; + int ret; + + inode->i_attributes = FILE_ATTRIBUTE_REPARSE_POINT; + inode->i_reparse_tag = WIM_IO_REPARSE_TAG_SYMLINK; + + /* The idea here is to call readlink() to get the UNIX target of + * the symbolic link, then turn the target into a reparse point + * data buffer that contains a relative or absolute symbolic + * link (NOT a junction point or *full* path symbolic link with + * drive letter). + */ + deref_name_len = readlink(path, deref_name_buf, + sizeof(deref_name_buf) - 1); + if (deref_name_len >= 0) { + deref_name_buf[deref_name_len] = '\0'; + DEBUG("Read symlink `%s'", deref_name_buf); + ret = inode_set_symlink(inode, deref_name_buf, + lookup_table, NULL); + if (ret == 0) { + /* Unfortunately, Windows seems to have the concept of + * "file" symbolic links as being different from + * "directory" symbolic links... so + * FILE_ATTRIBUTE_DIRECTORY needs to be set on the + * symbolic link if the *target* of the symbolic link is + * a directory. */ + struct stat stbuf; + if (stat(path, &stbuf) == 0 && S_ISDIR(stbuf.st_mode)) + inode->i_attributes |= FILE_ATTRIBUTE_DIRECTORY; + } + } else { + ERROR_WITH_ERRNO("Failed to read target of " + "symbolic link `%s'", path); + ret = WIMLIB_ERR_READLINK; + } + return ret; +} + +static int +unix_build_dentry_tree_recursive(struct wim_dentry **root_ret, + char *path, + size_t path_len, + struct wim_lookup_table *lookup_table, + const struct capture_config *config, + int add_image_flags, + wimlib_progress_func_t progress_func) { struct wim_dentry *root = NULL; int ret = 0; struct wim_inode *inode; - if (exclude_path(root_disk_path, config, true)) { + if (exclude_path(path, path_len, config, true)) { if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_ROOT) { ERROR("Cannot exclude the root directory from capture"); ret = WIMLIB_ERR_INVALID_CAPTURE_CONFIG; goto out; } - if ((add_image_flags & WIMLIB_ADD_IMAGE_FLAG_VERBOSE) + if ((add_image_flags & WIMLIB_ADD_IMAGE_FLAG_EXCLUDE_VERBOSE) && progress_func) { union wimlib_progress_info info; - info.scan.cur_path = root_disk_path; + info.scan.cur_path = path; info.scan.excluded = true; progress_func(WIMLIB_PROGRESS_MSG_SCAN_DENTRY, &info); } @@ -169,52 +301,52 @@ unix_build_dentry_tree(struct wim_dentry **root_ret, && progress_func) { union wimlib_progress_info info; - info.scan.cur_path = root_disk_path; + info.scan.cur_path = path; info.scan.excluded = false; progress_func(WIMLIB_PROGRESS_MSG_SCAN_DENTRY, &info); } /* UNIX version of capturing a directory tree */ - struct stat root_stbuf; + struct stat stbuf; int (*stat_fn)(const char *restrict, struct stat *restrict); if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_DEREFERENCE) stat_fn = stat; else stat_fn = lstat; - ret = (*stat_fn)(root_disk_path, &root_stbuf); + ret = (*stat_fn)(path, &stbuf); if (ret != 0) { - ERROR_WITH_ERRNO("Failed to stat `%s'", root_disk_path); + ERROR_WITH_ERRNO("Failed to stat `%s'", path); goto out; } if ((add_image_flags & WIMLIB_ADD_IMAGE_FLAG_ROOT) && - !S_ISDIR(root_stbuf.st_mode)) + !S_ISDIR(stbuf.st_mode)) { /* Do a dereference-stat in case the root is a symbolic link. * This case is allowed, provided that the symbolic link points * to a directory. */ - ret = stat(root_disk_path, &root_stbuf); + ret = stat(path, &stbuf); if (ret != 0) { - ERROR_WITH_ERRNO("Failed to stat `%s'", root_disk_path); + ERROR_WITH_ERRNO("Failed to stat `%s'", path); ret = WIMLIB_ERR_STAT; goto out; } - if (!S_ISDIR(root_stbuf.st_mode)) { - ERROR("`%s' is not a directory", root_disk_path); + if (!S_ISDIR(stbuf.st_mode)) { + ERROR("`%s' is not a directory", path); ret = WIMLIB_ERR_NOTDIR; goto out; } } - if (!S_ISREG(root_stbuf.st_mode) && !S_ISDIR(root_stbuf.st_mode) - && !S_ISLNK(root_stbuf.st_mode)) { + if (!S_ISREG(stbuf.st_mode) && !S_ISDIR(stbuf.st_mode) + && !S_ISLNK(stbuf.st_mode)) { ERROR("`%s' is not a regular file, directory, or symbolic link.", - root_disk_path); + path); ret = WIMLIB_ERR_SPECIAL_FILE; goto out; } - ret = new_dentry_with_timeless_inode(path_basename(root_disk_path), + ret = new_dentry_with_timeless_inode(path_basename_with_len(path, path_len), &root); if (ret) goto out; @@ -222,174 +354,45 @@ unix_build_dentry_tree(struct wim_dentry **root_ret, inode = root->d_inode; #ifdef HAVE_STAT_NANOSECOND_PRECISION - inode->i_creation_time = timespec_to_wim_timestamp(root_stbuf.st_mtim); - inode->i_last_write_time = timespec_to_wim_timestamp(root_stbuf.st_mtim); - inode->i_last_access_time = timespec_to_wim_timestamp(root_stbuf.st_atim); + 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_access_time = timespec_to_wim_timestamp(stbuf.st_atim); #else - inode->i_creation_time = unix_timestamp_to_wim(root_stbuf.st_mtime); - inode->i_last_write_time = unix_timestamp_to_wim(root_stbuf.st_mtime); - inode->i_last_access_time = unix_timestamp_to_wim(root_stbuf.st_atime); + inode->i_creation_time = unix_timestamp_to_wim(stbuf.st_mtime); + 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. */ - if (!S_ISDIR(root_stbuf.st_mode)) { + /* 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)root_stbuf.st_ino; + inode->i_ino = (u64)stbuf.st_ino; else - inode->i_ino = (u64)root_stbuf.st_ino | - ((u64)root_stbuf.st_dev << + 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, root_stbuf.st_uid, - root_stbuf.st_gid, - root_stbuf.st_mode, + ret = inode_set_unix_data(inode, stbuf.st_uid, + stbuf.st_gid, + stbuf.st_mode, lookup_table, UNIX_DATA_ALL | UNIX_DATA_CREATE); if (ret) goto out; } add_image_flags &= ~(WIMLIB_ADD_IMAGE_FLAG_ROOT | WIMLIB_ADD_IMAGE_FLAG_SOURCE); - if (S_ISREG(root_stbuf.st_mode)) { /* Archiving a regular file */ - - struct wim_lookup_table_entry *lte; - u8 hash[SHA1_HASH_SIZE]; - - inode->i_attributes = FILE_ATTRIBUTE_NORMAL; - - /* 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, hash); - if (ret != 0) - goto out; - - lte = __lookup_resource(lookup_table, hash); - if (lte) { - lte->refcnt++; - DEBUG("Add lte reference %u for `%s'", lte->refcnt, - root_disk_path); - } else { - mbchar *file_on_disk = STRDUP(root_disk_path); - if (!file_on_disk) { - ERROR("Failed to allocate memory for file path"); - ret = WIMLIB_ERR_NOMEM; - goto out; - } - lte = new_lookup_table_entry(); - if (!lte) { - FREE(file_on_disk); - ret = WIMLIB_ERR_NOMEM; - goto out; - } - 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; - copy_hash(lte->hash, hash); - lookup_table_insert(lookup_table, lte); - } - root->d_inode->i_lte = lte; - } else if (S_ISDIR(root_stbuf.st_mode)) { /* Archiving a directory */ - - inode->i_attributes = FILE_ATTRIBUTE_DIRECTORY; - - DIR *dir; - struct dirent entry, *result; - struct wim_dentry *child; - - dir = opendir(root_disk_path); - if (!dir) { - ERROR_WITH_ERRNO("Failed to open the directory `%s'", - root_disk_path); - ret = WIMLIB_ERR_OPEN; - goto out; - } - - /* Buffer for names of files in directory. */ - size_t len = strlen(root_disk_path); - mbchar name[len + 1 + FILENAME_MAX + 1]; - memcpy(name, root_disk_path, len); - name[len] = '/'; - - /* Create a dentry for each entry in the directory on disk, and recurse - * to any subdirectories. */ - while (1) { - errno = 0; - 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 (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, result->d_name); - ret = unix_build_dentry_tree(&child, name, - lookup_table, - NULL, config, - add_image_flags, - progress_func, NULL); - if (ret != 0) - break; - if (child) - dentry_add_child(root, child); - } - closedir(dir); - } else { /* Archiving a symbolic link */ - inode->i_attributes = FILE_ATTRIBUTE_REPARSE_POINT; - inode->i_reparse_tag = WIM_IO_REPARSE_TAG_SYMLINK; - - /* The idea here is to call readlink() to get the UNIX target of - * the symbolic link, then turn the target into a reparse point - * data buffer that contains a relative or absolute symbolic - * link (NOT a junction point or *full* path symbolic link with - * drive letter). - */ - - mbchar deref_name_buf[4096]; - ssize_t deref_name_len; - - deref_name_len = readlink(root_disk_path, deref_name_buf, - sizeof(deref_name_buf) - 1); - if (deref_name_len >= 0) { - deref_name_buf[deref_name_len] = '\0'; - DEBUG("Read symlink `%s'", deref_name_buf); - ret = inode_set_symlink(root->d_inode, deref_name_buf, - lookup_table, NULL); - if (ret == 0) { - /* - * Unfortunately, Windows seems to have the - * concept of "file" symbolic links as being - * different from "directory" symbolic links... - * so FILE_ATTRIBUTE_DIRECTORY needs to be set - * on the symbolic link if the *target* of the - * symbolic link is a directory. - */ - struct stat stbuf; - if (stat(root_disk_path, &stbuf) == 0 && - S_ISDIR(stbuf.st_mode)) - { - inode->i_attributes |= FILE_ATTRIBUTE_DIRECTORY; - } - } - } else { - ERROR_WITH_ERRNO("Failed to read target of " - "symbolic link `%s'", root_disk_path); - ret = WIMLIB_ERR_READLINK; - } - } + if (S_ISREG(stbuf.st_mode)) + ret = unix_capture_regular_file(path, stbuf.st_size, + inode, lookup_table); + else if (S_ISDIR(stbuf.st_mode)) + ret = unix_capture_directory(root, path, path_len, + lookup_table, config, + add_image_flags, progress_func); + else + ret = unix_capture_symlink(path, inode, lookup_table); out: if (ret == 0) *root_ret = root; @@ -397,6 +400,75 @@ out: free_dentry_tree(root, lookup_table); return ret; } + +/* + * unix_build_dentry_tree(): + * Builds a tree of WIM dentries from an on-disk directory tree (UNIX + * version; no NTFS-specific data is captured). + * + * @root_ret: Place to return a pointer to the root of the dentry tree. Only + * 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. + * + * @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, + * unless an identical stream is already in the lookup table. + * These lookup table entries that are added point to the path of + * the file on disk. + * + * @sd_set: Ignored. (Security data only captured in NTFS mode.) + * + * @capture_config: + * Configuration for files to be excluded from capture. + * + * @add_flags: Bitwise or of WIMLIB_ADD_IMAGE_FLAG_* + * + * @extra_arg: Ignored + * + * @return: 0 on success, nonzero on failure. It is a failure if any of + * the files cannot be `stat'ed, or if any of the needed + * directories cannot be opened or read. Failure to add the files + * to the WIM may still occur later when trying to actually read + * 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 sd_set *sd_set, + const struct capture_config *config, + int add_image_flags, + wimlib_progress_func_t progress_func, + void *extra_arg) +{ + char *path_buf; + int ret; + size_t path_len; + size_t path_bufsz; + + path_bufsz = min(32790, PATH_MAX + 1); + path_len = strlen(root_disk_path); + + if (path_len >= path_bufsz) + return WIMLIB_ERR_INVALID_PARAM; + + path_buf = MALLOC(path_bufsz); + if (!path_buf) + return WIMLIB_ERR_NOMEM; + memcpy(path_buf, root_disk_path, path_len + 1); + ret = unix_build_dentry_tree_recursive(root_ret, + path_buf, + path_len, + lookup_table, + config, + add_image_flags, + progress_func); + FREE(path_buf); + return ret; +} #endif /* !__WIN32__ */ enum pattern_type { @@ -410,10 +482,11 @@ enum pattern_type { #define COMPAT_DEFAULT_CONFIG /* Default capture configuration file when none is specified. */ -static const mbchar *default_config = +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" @@ -421,14 +494,9 @@ static const mbchar *default_config = "\\System Volume Information\n" "\\RECYCLER\n" "\\Windows\\CSC\n" -"\n" -"[CompressionExclusionList]\n" -"*.mp3\n" -"*.zip\n" -"*.cab\n" -"\\WINDOWS\\inf\\*.pnf\n"; +); #else -""; +T(""); #endif static void @@ -445,14 +513,13 @@ destroy_capture_config(struct capture_config *config) 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 mbchar *pattern) +pattern_list_add_pattern(struct pattern_list *list, const tchar *pattern) { - const char **pats; + const tchar **pats; if (list->num_pats >= list->num_allocated_pats) { pats = REALLOC(list->pats, sizeof(list->pats[0]) * (list->num_allocated_pats + 8)); @@ -469,33 +536,34 @@ pattern_list_add_pattern(struct pattern_list *list, const mbchar *pattern) * `struct capture_config'. */ static int init_capture_config(struct capture_config *config, - const mbchar *_config_str, size_t config_len) + const tchar *_config_str, + size_t config_num_tchars) { - mbchar *config_str; - mbchar *p; - mbchar *eol; - mbchar *next_p; - size_t bytes_remaining; + 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_len = %zu", config_len); - bytes_remaining = config_len; + DEBUG("config_num_tchars = %zu", config_num_tchars); + num_tchars_remaining = config_num_tchars; memset(config, 0, sizeof(*config)); - config_str = MALLOC(config_len); + config_str = TMALLOC(config_num_tchars); if (!config_str) { ERROR("Could not duplicate capture config string"); return WIMLIB_ERR_NOMEM; } - memcpy(config_str, _config_str, config_len); + tmemcpy(config_str, _config_str, config_num_tchars); next_p = config_str; config->config_str = config_str; - while (bytes_remaining) { + while (num_tchars_remaining != 0) { line_no++; p = next_p; - eol = memchr(p, '\n', bytes_remaining); + eol = tmemchr(p, T('\n'), num_tchars_remaining); if (!eol) { ERROR("Expected end-of-line in capture config file on " "line %lu", line_no); @@ -504,50 +572,64 @@ init_capture_config(struct capture_config *config, } next_p = eol + 1; - bytes_remaining -= (next_p - p); + num_tchars_remaining -= (next_p - p); if (eol == p) continue; - if (*(eol - 1) == '\r') + if (*(eol - 1) == T('\r')) eol--; - *eol = '\0'; + *eol = T('\0'); /* Translate backslash to forward slash */ - for (mbchar *pp = p; pp != eol; pp++) - if (*pp == '\\') - *pp = '/'; - - /* Remove drive letter */ - if (eol - p > 2 && isalpha(*p) && *(p + 1) == ':') + 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 (strcmp(p, "[ExclusionList]") == 0) + if (!tstrcmp(p, T("[ExclusionList]"))) type = EXCLUSION_LIST; - else if (strcmp(p, "[ExclusionException]") == 0) + else if (!tstrcmp(p, T("[ExclusionException]"))) type = EXCLUSION_EXCEPTION; - else if (strcmp(p, "[CompressionExclusionList]") == 0) + else if (!tstrcmp(p, T("[CompressionExclusionList]"))) type = COMPRESSION_EXCLUSION_LIST; - else if (strcmp(p, "[AlignmentList]") == 0) + else if (!tstrcmp(p, T("[AlignmentList]"))) type = ALIGNMENT_LIST; - else if (p[0] == '[' && strrchr(p, ']')) { - ERROR("Unknown capture configuration section `%s'", p); + 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 \"%s\" to exclusion list", p); + DEBUG("Adding pattern \"%"TS"\" 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); + 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 \"%s\" to compression exclusion list", p); + 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 \"%s\" to alignment list", p); + DEBUG("Adding pattern \"%"TS"\" to alignment list", p); ret = pattern_list_add_pattern(&config->alignment_list, p); break; default: @@ -566,31 +648,32 @@ out_destroy: return ret; } -static int capture_config_set_prefix(struct capture_config *config, - const mbchar *_prefix) +static bool +is_absolute_path(const tchar *path) { - mbchar *prefix = STRDUP(_prefix); - - if (!prefix) - return WIMLIB_ERR_NOMEM; - FREE(config->prefix); - config->prefix = prefix; - config->prefix_len = strlen(prefix); - return 0; + if (*path == T('/')) + return true; +#ifdef __WIN32__ + /* Drive letter */ + if (*path && *(path + 1) == T(':')) + return true; +#endif + return false; } -static bool match_pattern(const mbchar *path, - const mbchar *path_basename, - const struct pattern_list *list) +static bool +match_pattern(const tchar *path, + const tchar *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] == '/') + const tchar *pat = list->pats[i]; + const tchar *string; + if (is_absolute_path(pat)) { /* Absolute path from root of capture */ string = path; - else { - if (strchr(pat, '/')) + } else { + if (tstrchr(pat, T('/'))) /* Relative path from root of capture */ string = path + 1; else @@ -606,7 +689,7 @@ static bool match_pattern(const mbchar *path, #endif ) == 0) { - DEBUG("`%s' matches the pattern \"%s\"", + DEBUG("\"%"TS"\" matches the pattern \"%"TS"\"", string, pat); return true; } @@ -624,15 +707,17 @@ static bool match_pattern(const mbchar *path, * directory. */ bool -exclude_path(const mbchar *path, const struct capture_config *config, - bool exclude_prefix) +exclude_path(const tchar *path, size_t path_len, + const struct capture_config *config, bool exclude_prefix) { - const mbchar *basename = path_basename(path); + const tchar *basename = path_basename_with_len(path, path_len); 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; + 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; + } } return match_pattern(path, basename, &config->exclusion_list) && !match_pattern(path, basename, &config->exclusion_exception); @@ -641,58 +726,48 @@ exclude_path(const mbchar *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 tchar * +canonicalize_target_path(tchar *target_path) { - char *p; + tchar *p; if (target_path == NULL) - return ""; + return T(""); for (;;) { - if (*target_path == '\0') + if (*target_path == T('\0')) return target_path; - else if (*target_path == '/') + else if (*target_path == T('/')) target_path++; else break; } - p = target_path + strlen(target_path) - 1; - while (*p == '/') - *p-- = '\0'; + p = tstrchr(target_path, T('\0')) - 1; + while (*p == T('/')) + *p-- = T('\0'); return target_path; } -#ifdef __WIN32__ -static void -zap_backslashes(char *s) -{ - while (*s) { - if (*s == '\\') - *s = '/'; - s++; - } -} -#endif - -/* Strip leading and trailing slashes from the target paths */ +/* Strip leading and trailing slashes from the target paths, and translate all + * backslashes in the source and target paths into forward slashes. */ static void -canonicalize_targets(struct wimlib_capture_source *sources, size_t num_sources) +canonicalize_sources_and_targets(struct wimlib_capture_source *sources, + size_t num_sources) { while (num_sources--) { - DEBUG("Canonicalizing { source: \"%s\", target=\"%s\"}", + DEBUG("Canonicalizing { source: \"%"TS"\", target=\"%"TS"\"}", sources->fs_source_path, sources->wim_target_path); -#ifdef __WIN32__ + /* The Windows API can handle forward slashes. Just get rid of * backslashes to avoid confusing other parts of the library * code. */ zap_backslashes(sources->fs_source_path); if (sources->wim_target_path) zap_backslashes(sources->wim_target_path); -#endif + sources->wim_target_path = - (char*)canonicalize_target_path(sources->wim_target_path); - DEBUG("Canonical target: \"%s\"", sources->wim_target_path); + (tchar*)canonicalize_target_path(sources->wim_target_path); + DEBUG("Canonical target: \"%"TS"\"", sources->wim_target_path); sources++; } } @@ -701,7 +776,7 @@ 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); + return tstrcmp(s1->wim_target_path, s2->wim_target_path); } /* Sorts the capture sources lexicographically by target path. This occurs @@ -725,7 +800,7 @@ check_sorted_sources(struct wimlib_capture_source *sources, size_t num_sources, "(the NTFS volume) in NTFS mode!"); return WIMLIB_ERR_INVALID_PARAM; } - if (sources[0].wim_target_path[0] != '\0') { + if (sources[0].wim_target_path[0] != T('\0')) { ERROR("In NTFS capture mode the target path inside " "the image must be the root directory!"); return WIMLIB_ERR_INVALID_PARAM; @@ -772,18 +847,19 @@ check_sorted_sources(struct wimlib_capture_source *sources, size_t num_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 int -new_filler_directory(const mbchar *name, struct wim_dentry **dentry_ret) +new_filler_directory(const tchar *name, struct wim_dentry **dentry_ret) { int ret; struct wim_dentry *dentry; - DEBUG("Creating filler directory \"%s\"", name); + 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(). */ dentry->d_inode->i_resolved = 1; dentry->d_inode->i_attributes = FILE_ATTRIBUTE_DIRECTORY; + *dentry_ret = dentry; } return ret; } @@ -796,12 +872,12 @@ do_overlay(struct wim_dentry *target, struct wim_dentry *branch) { struct rb_root *rb_root; - DEBUG("Doing overlay \"%W\" => \"%W\"", + DEBUG("Doing overlay \"%"WS"\" => \"%"WS"\"", branch->file_name, target->file_name); if (!dentry_is_directory(target)) { - ERROR("Cannot overlay directory \"%W\" over non-directory", - branch->file_name); + ERROR("Cannot overlay directory \"%"WS"\" " + "over non-directory", branch->file_name); return WIMLIB_ERR_INVALID_OVERLAY; } @@ -814,8 +890,8 @@ 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 \"%W\" already exists " - "as a child of \"%W\"", + ERROR("Overlay error: file \"%"WS"\" already exists " + "as a child of \"%"WS"\"", child->file_name, target->file_name); return WIMLIB_ERR_INVALID_OVERLAY; } @@ -838,16 +914,16 @@ do_overlay(struct wim_dentry *target, struct wim_dentry *branch) */ static int attach_branch(struct wim_dentry **root_p, struct wim_dentry *branch, - mbchar *target_path) + tchar *target_path) { - char *slash; + tchar *slash; struct wim_dentry *dentry, *parent, *target; int ret; - DEBUG("Attaching branch \"%W\" => \"%s\"", + DEBUG("Attaching branch \"%"WS"\" => \"%"TS"\"", branch->file_name, target_path); - if (*target_path == '\0') { + if (*target_path == T('\0')) { /* Target: root directory */ if (*root_p) { /* Overlay on existing root */ @@ -862,7 +938,7 @@ attach_branch(struct wim_dentry **root_p, struct wim_dentry *branch, /* Adding a non-root branch. Create root if it hasn't been created * already. */ if (!*root_p) { - ret = new_filler_directory("", root_p); + ret = new_filler_directory(T(""), root_p); if (ret) return ret; } @@ -870,8 +946,8 @@ attach_branch(struct wim_dentry **root_p, struct wim_dentry *branch, /* Walk the path to the branch, creating filler directories as needed. * */ parent = *root_p; - while ((slash = strchr(target_path, '/'))) { - *slash = '\0'; + while ((slash = tstrchr(target_path, T('/')))) { + *slash = T('\0'); dentry = get_dentry_child_with_name(parent, target_path); if (!dentry) { ret = new_filler_directory(target_path, &dentry); @@ -886,7 +962,7 @@ attach_branch(struct wim_dentry **root_p, struct wim_dentry *branch, * trailing slashes were tripped. */ do { ++target_path; - } while (*target_path == '/'); + } while (*target_path == T('/')); } /* If the target path already existed, overlay the branch onto it. @@ -905,16 +981,16 @@ WIMLIBAPI int wimlib_add_image_multisource(WIMStruct *w, struct wimlib_capture_source *sources, size_t num_sources, - const utf8char *name, - const mbchar *config_str, + const tchar *name, + const tchar *config_str, size_t config_len, int add_image_flags, wimlib_progress_func_t progress_func) { int (*capture_tree)(struct wim_dentry **, - const mbchar *, + const tchar *, struct wim_lookup_table *, - struct wim_security_data *, + struct sd_set *, const struct capture_config *, int, wimlib_progress_func_t, @@ -926,6 +1002,7 @@ wimlib_add_image_multisource(WIMStruct *w, struct capture_config config; struct wim_image_metadata *imd; int ret; + struct sd_set sd_set; if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_NTFS) { #ifdef WITH_NTFS_3G @@ -965,6 +1042,9 @@ wimlib_add_image_multisource(WIMStruct *w, } #endif + if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_VERBOSE) + add_image_flags |= WIMLIB_ADD_IMAGE_FLAG_EXCLUDE_VERBOSE; + if (!name || !*name) { ERROR("Must specify a non-empty string for the image name"); return WIMLIB_ERR_INVALID_PARAM; @@ -976,7 +1056,7 @@ wimlib_add_image_multisource(WIMStruct *w, } if (wimlib_image_name_in_use(w, name)) { - ERROR("There is already an image named \"%U\" in the WIM!", + ERROR("There is already an image named \"%"TS"\" in the WIM!", name); return WIMLIB_ERR_IMAGE_NAME_COLLISION; } @@ -984,7 +1064,7 @@ wimlib_add_image_multisource(WIMStruct *w, if (!config_str) { DEBUG("Using default capture configuration"); config_str = default_config; - config_len = strlen(default_config); + config_len = tstrlen(default_config); } ret = init_capture_config(&config, config_str, config_len); if (ret) @@ -999,8 +1079,11 @@ wimlib_add_image_multisource(WIMStruct *w, 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_targets(sources, num_sources); + canonicalize_sources_and_targets(sources, num_sources); sort_sources(sources, num_sources); ret = check_sorted_sources(sources, num_sources, add_image_flags); if (ret) { @@ -1009,68 +1092,62 @@ wimlib_add_image_multisource(WIMStruct *w, } DEBUG("Building dentry tree."); - if (num_sources == 0) { - ret = new_filler_directory("", &root_dentry); - if (ret) - goto out_free_security_data; - } else { - size_t i; - - #ifdef __WIN32__ - win32_acquire_capture_privileges(); - #endif + 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 " + "(\"%"TS"\" => \"%"TS"\")", 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); + } + 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, + &sd_set, + &config, + flags, + progress_func, extra_arg); + if (ret) { + ERROR("Failed to build dentry tree for `%"TS"'", + 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(T(""), &root_dentry); + if (ret) + goto out_free_dentry_tree; } DEBUG("Calculating full paths of dentries."); @@ -1098,32 +1175,31 @@ wimlib_add_image_multisource(WIMStruct *w, if (add_image_flags & WIMLIB_ADD_IMAGE_FLAG_BOOT) wimlib_set_boot_idx(w, w->hdr.image_count); ret = 0; - goto out_destroy_capture_config; + 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; + goto out_destroy_sd_set; 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: + destroy_sd_set(&sd_set); 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 mbchar *source, - const utf8char *name, - const mbchar *config_str, + const tchar *source, + const tchar *name, + const tchar *config_str, size_t config_len, int add_image_flags, wimlib_progress_func_t progress_func) @@ -1131,7 +1207,7 @@ wimlib_add_image(WIMStruct *w, if (!source || !*source) return WIMLIB_ERR_INVALID_PARAM; - char *fs_source_path = STRDUP(source); + tchar *fs_source_path = TSTRDUP(source); int ret; struct wimlib_capture_source capture_src = { .fs_source_path = fs_source_path,