X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fntfs-capture.c;h=8f123f805a9afb4d10d035fbac8aeea98c617521;hp=c4770a5dc3ae22ca4b20f478e6aa8b491a6bb79d;hb=b3d65ccab09cc7f33380cb5bf43709349d079087;hpb=9b9a502863318d6208da2818b1d522346e5eee9e diff --git a/src/ntfs-capture.c b/src/ntfs-capture.c index c4770a5d..8f123f80 100644 --- a/src/ntfs-capture.c +++ b/src/ntfs-capture.c @@ -35,7 +35,7 @@ #include "dentry.h" #include "lookup_table.h" -#include "io.h" +#include "buffer_io.h" #include #include #include @@ -362,10 +362,12 @@ static int capture_ntfs_streams(struct dentry *dentry, ntfs_inode *ni, * alternate data stream entries */ struct ads_entry *new_ads_entry; size_t stream_name_utf8_len; - stream_name_utf8 = utf16_to_utf8((const char*)attr_record_name(actx->attr), - name_length * 2, - &stream_name_utf8_len); - if (!stream_name_utf8) + + ret = utf16_to_utf8((const char*)attr_record_name(actx->attr), + name_length * 2, + &stream_name_utf8, + &stream_name_utf8_len); + if (ret != 0) goto out_free_lte; new_ads_entry = inode_add_ads(dentry->d_inode, stream_name_utf8); FREE(stream_name_utf8); @@ -405,7 +407,8 @@ struct readdir_ctx { struct sd_set *sd_set; const struct capture_config *config; ntfs_volume **ntfs_vol_p; - int flags; + int add_image_flags; + wimlib_progress_func_t progress_func; }; static int @@ -416,7 +419,8 @@ build_dentry_tree_ntfs_recursive(struct dentry **root_p, ntfs_inode *dir_ni, struct sd_set *sd_set, const struct capture_config *config, ntfs_volume **ntfs_vol_p, - int flags); + int add_image_flags, + wimlib_progress_func_t progress_func); static int wim_ntfs_capture_filldir(void *dirent, const ntfschar *name, const int name_len, const int name_type, @@ -433,12 +437,10 @@ static int wim_ntfs_capture_filldir(void *dirent, const ntfschar *name, if (name_type == FILE_NAME_DOS) return 0; - ret = -1; - - utf8_name = utf16_to_utf8((const char*)name, name_len * 2, - &utf8_name_len); - if (!utf8_name) - goto out; + ret = utf16_to_utf8((const char*)name, name_len * 2, + &utf8_name, &utf8_name_len); + if (ret != 0) + return -1; if (utf8_name[0] == '.' && (utf8_name[1] == '\0' || @@ -463,7 +465,8 @@ static int wim_ntfs_capture_filldir(void *dirent, const ntfschar *name, ni, ctx->path, path_len, name_type, ctx->lookup_table, ctx->sd_set, ctx->config, ctx->ntfs_vol_p, - ctx->flags); + ctx->add_image_flags, + ctx->progress_func); if (child) dentry_add_child(ctx->parent, child); @@ -471,7 +474,6 @@ static int wim_ntfs_capture_filldir(void *dirent, const ntfschar *name, ntfs_inode_close(ni); out_free_utf8_name: FREE(utf8_name); -out: return ret; } @@ -481,15 +483,15 @@ static int change_dentry_short_name(struct dentry *dentry, { size_t short_name_utf16_len; char *short_name_utf16; - short_name_utf16 = utf8_to_utf16(short_name_utf8, short_name_utf8_len, - &short_name_utf16_len); - if (!short_name_utf16) { - ERROR_WITH_ERRNO("Failed to convert short name to UTF-16"); - return WIMLIB_ERR_NOMEM; + int ret; + + ret = utf8_to_utf16(short_name_utf8, short_name_utf8_len, + &short_name_utf16, &short_name_utf16_len); + if (ret == 0) { + dentry->short_name = short_name_utf16; + dentry->short_name_len = short_name_utf16_len; } - dentry->short_name = short_name_utf16; - dentry->short_name_len = short_name_utf16_len; - return 0; + return ret; } /* Recursively build a WIM dentry tree corresponding to a NTFS volume. @@ -506,14 +508,27 @@ static int build_dentry_tree_ntfs_recursive(struct dentry **root_p, struct sd_set *sd_set, const struct capture_config *config, ntfs_volume **ntfs_vol_p, - int flags) + int add_image_flags, + wimlib_progress_func_t progress_func) { u32 attributes; int mrec_flags; int ret; - char dos_name_utf8[64]; struct dentry *root; + if (exclude_path(path, config, false)) { + if ((add_image_flags & WIMLIB_ADD_IMAGE_FLAG_VERBOSE) + && progress_func) + { + union wimlib_progress_info info; + info.scan.cur_path = path; + info.scan.excluded = true; + progress_func(WIMLIB_PROGRESS_MSG_SCAN_DENTRY, &info); + } + *root_p = NULL; + return 0; + } + mrec_flags = ni->mrec->flags; struct SECURITY_CONTEXT ctx; memset(&ctx, 0, sizeof(ctx)); @@ -527,33 +542,32 @@ static int build_dentry_tree_ntfs_recursive(struct dentry **root_p, return WIMLIB_ERR_NTFS_3G; } - if (exclude_path(path, config, false)) { - if (flags & WIMLIB_ADD_IMAGE_FLAG_VERBOSE) { - const char *file_type; - if (attributes & MFT_RECORD_IS_DIRECTORY) - file_type = "directory"; - else - file_type = "file"; - printf("Excluding %s `%s' from capture\n", - file_type, path); - } - *root_p = NULL; - return 0; + if ((add_image_flags & WIMLIB_ADD_IMAGE_FLAG_VERBOSE) + && progress_func) + { + union wimlib_progress_info info; + info.scan.cur_path = path; + info.scan.excluded = false; + progress_func(WIMLIB_PROGRESS_MSG_SCAN_DENTRY, &info); } - if (flags & WIMLIB_ADD_IMAGE_FLAG_VERBOSE) - printf("Scanning `%s'\n", path); - root = new_dentry_with_timeless_inode(path_basename(path)); - if (!root) - return WIMLIB_ERR_NOMEM; + if (!root) { + if (errno == EILSEQ) + return WIMLIB_ERR_INVALID_UTF8_STRING; + else if (errno == ENOMEM) + return WIMLIB_ERR_NOMEM; + else + return WIMLIB_ERR_ICONV_NOT_AVAILABLE; + } *root_p = root; if (dir_ni && (name_type == FILE_NAME_WIN32_AND_DOS || name_type == FILE_NAME_WIN32)) { + char dos_name_utf8[12 * 4 + 1] = {0}; ret = ntfs_get_ntfs_dos_name(ni, dir_ni, dos_name_utf8, - sizeof(dos_name_utf8)); + sizeof(dos_name_utf8) - 1); if (ret > 0) { DEBUG("Changing short name of `%s'", path); ret = change_dentry_short_name(root, dos_name_utf8, @@ -596,7 +610,8 @@ static int build_dentry_tree_ntfs_recursive(struct dentry **root_p, .sd_set = sd_set, .config = config, .ntfs_vol_p = ntfs_vol_p, - .flags = flags, + .add_image_flags = add_image_flags, + .progress_func = progress_func, }; ret = ntfs_readdir(ni, &pos, &ctx, wim_ntfs_capture_filldir); if (ret != 0) { @@ -648,7 +663,8 @@ int build_dentry_tree_ntfs(struct dentry **root_p, struct lookup_table *lookup_table, struct wim_security_data *sd, const struct capture_config *config, - int flags, + int add_image_flags, + wimlib_progress_func_t progress_func, void *extra_arg) { ntfs_volume *vol; @@ -697,13 +713,18 @@ int build_dentry_tree_ntfs(struct dentry **root_p, ret = build_dentry_tree_ntfs_recursive(root_p, NULL, root_ni, path, 1, FILE_NAME_POSIX, lookup_table, &sd_set, config, ntfs_vol_p, - flags); + add_image_flags, + progress_func); out_cleanup: FREE(path); ntfs_inode_close(root_ni); destroy_sd_set(&sd_set); out: + ntfs_index_ctx_put(vol->secure_xsii); + ntfs_index_ctx_put(vol->secure_xsdh); + ntfs_inode_close(vol->secure_ni); + if (ret) { if (ntfs_umount(vol, FALSE) != 0) { ERROR_WITH_ERRNO("Failed to unmount NTFS volume `%s'",