X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fadd_image.c;h=de9a465f15d012f82065fc0ce700471e21065472;hp=5f7a183c9079885bb7b3b4f8b1eccd048c428e25;hb=c6a1140e085f633273fcf47a6462bd9382ce118a;hpb=650997e4865a090b6856c7ca34b02f42994e8e29 diff --git a/src/add_image.c b/src/add_image.c index 5f7a183c..de9a465f 100644 --- a/src/add_image.c +++ b/src/add_image.c @@ -41,6 +41,7 @@ #include #include #include +#include #include #include @@ -80,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]; @@ -102,64 +101,200 @@ err: } #ifndef __WIN32__ -/* - * unix_build_dentry_tree(): - * Recursively 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, +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, + struct wim_inode_table *inode_table, + const struct wimlib_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 sd_set *sd_set, - 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, - 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, + inode_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, + struct wim_inode_table *inode_table, + const struct wimlib_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); } @@ -170,227 +305,93 @@ 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), - &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(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)) { - if (sizeof(ino_t) >= 8) - inode->i_ino = (u64)root_stbuf.st_ino; - else - inode->i_ino = (u64)root_stbuf.st_ino | - ((u64)root_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 { - char *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); - char 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). - */ - - char 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, inode_table, config, + add_image_flags, progress_func); + else + ret = unix_capture_symlink(path, inode, lookup_table); out: if (ret == 0) *root_ret = root; @@ -398,204 +399,93 @@ out: free_dentry_tree(root, lookup_table); return ret; } -#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" -"\n" -"[CompressionExclusionList]\n" -"*.mp3\n" -"*.zip\n" -"*.cab\n" -"\\WINDOWS\\inf\\*.pnf\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); - FREE(config->prefix); - 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'. */ +/* + * 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.) + * + * @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 -init_capture_config(struct capture_config *config, - const tchar *_config_str, - size_t config_num_tchars) +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 wimlib_capture_config *config, + int add_image_flags, + wimlib_progress_func_t progress_func, + void *extra_arg) { - tchar *config_str; - tchar *p; - tchar *eol; - tchar *next_p; - size_t num_tchars_remaining; - enum pattern_type type = NONE; + char *path_buf; 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'); + size_t path_len; + size_t path_bufsz; - /* Translate backslash to forward slash */ - for (tchar *pp = p; pp != eol; pp++) - if (*pp == T('\\')) - *pp = T('/'); + path_bufsz = min(32790, PATH_MAX + 1); + path_len = strlen(root_disk_path); - /* Remove drive letter (UNIX only) */ - #ifndef __WIN32__ - if (eol - p > 2 && istalpha(*p) && *(p + 1) == T(':')) - 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 int capture_config_set_prefix(struct capture_config *config, - const tchar *_prefix) -{ - tchar *prefix = TSTRDUP(_prefix); + if (path_len >= path_bufsz) + return WIMLIB_ERR_INVALID_PARAM; - if (!prefix) + path_buf = MALLOC(path_bufsz); + if (!path_buf) return WIMLIB_ERR_NOMEM; - FREE(config->prefix); - config->prefix = prefix; - config->prefix_num_tchars = tstrlen(prefix); - return 0; + memcpy(path_buf, root_disk_path, path_len + 1); + ret = unix_build_dentry_tree_recursive(root_ret, + path_buf, + path_len, + lookup_table, + inode_table, + config, + add_image_flags, + progress_func); + FREE(path_buf); + return ret; } +#endif /* !__WIN32__ */ -static bool match_pattern(const tchar *path, - const tchar *path_basename, - const struct pattern_list *list) +static bool +match_pattern(const tchar *path, + const tchar *path_basename, + 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 (pat[0] == '/') + + if (*pat == T('/')) { /* Absolute path from root of capture */ string = path; - else { + } else { if (tstrchr(pat, T('/'))) /* Relative path from root of capture */ string = path + 1; @@ -606,7 +496,7 @@ static bool match_pattern(const tchar *path, /* 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 @@ -615,6 +505,9 @@ static bool match_pattern(const tchar *path, DEBUG("\"%"TS"\" matches the pattern \"%"TS"\"", string, pat); return true; + } else { + DEBUG2("\"%"TS"\" does not match the pattern \"%"TS"\"", + string, pat); } } return false; @@ -630,20 +523,20 @@ static bool match_pattern(const tchar *path, * directory. */ bool -exclude_path(const tchar *path, const struct capture_config *config, - bool exclude_prefix) +exclude_path(const tchar *path, size_t path_len, + const struct wimlib_capture_config *config, bool exclude_prefix) { - const tchar *basename = path_basename(path); + const tchar *basename = path_basename_with_len(path, path_len); if (exclude_prefix) { - wimlib_assert(tstrlen(path) >= 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); } @@ -670,9 +563,11 @@ canonicalize_target_path(tchar *target_path) return target_path; } -/* 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: \"%"TS"\", target=\"%"TS"\"}", @@ -776,8 +671,8 @@ new_filler_directory(const tchar *name, struct wim_dentry **dentry_ret) 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; @@ -898,21 +793,73 @@ attach_branch(struct wim_dentry **root_p, struct wim_dentry *branch, } } +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 *); @@ -920,8 +867,8 @@ wimlib_add_image_multisource(WIMStruct *w, 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; int ret; struct sd_set sd_set; @@ -963,6 +910,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; @@ -979,12 +929,17 @@ wimlib_add_image_multisource(WIMStruct *w, 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; @@ -992,7 +947,7 @@ wimlib_add_image_multisource(WIMStruct *w, 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; @@ -1000,8 +955,9 @@ wimlib_add_image_multisource(WIMStruct *w, 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,6 +965,7 @@ wimlib_add_image_multisource(WIMStruct *w, goto out_free_security_data; } + DEBUG("Building dentry tree."); root_dentry = NULL; @@ -1026,18 +983,17 @@ wimlib_add_image_multisource(WIMStruct *w, 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); - if (ret) - goto out_free_dentry_tree; + 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) { @@ -1081,12 +1037,8 @@ wimlib_add_image_multisource(WIMStruct *w, imd = &w->image_metadata[w->hdr.image_count - 1]; - ret = dentry_tree_fix_inodes(root_dentry, &imd->inode_list); - if (ret) - goto out_destroy_imd; - 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) @@ -1095,22 +1047,21 @@ 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_sd_set; + goto out_destroy_inode_table; 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_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; } @@ -1119,8 +1070,7 @@ WIMLIBAPI int 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) { @@ -1135,8 +1085,8 @@ wimlib_add_image(WIMStruct *w, .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; }