X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fntfs-3g_capture.c;h=6255f09a5ac6521efd002130224ca4776b4eba6e;hp=a0b370998e939bd4ca640284b1e6ae2c077f6698;hb=c3e9bd8344d97960e8e6cf29cc1ff633e925f986;hpb=00ae9e9cf11e1f7a108b63db0fc538180a81880a diff --git a/src/ntfs-3g_capture.c b/src/ntfs-3g_capture.c index a0b37099..6255f09a 100644 --- a/src/ntfs-3g_capture.c +++ b/src/ntfs-3g_capture.c @@ -1,27 +1,25 @@ /* * ntfs-3g_capture.c * - * Capture a WIM image directly from a NTFS volume using libntfs-3g. We capture + * Capture a WIM image directly from an NTFS volume using libntfs-3g. We capture * everything we can, including security data and alternate data streams. */ /* - * Copyright (C) 2012, 2013 Eric Biggers + * Copyright (C) 2012, 2013, 2014 Eric Biggers * - * This file is part of wimlib, a library for working with WIM files. + * This file is free software; you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the Free + * Software Foundation; either version 3 of the License, or (at your option) any + * later version. * - * wimlib is free software; you can redistribute it and/or modify it under the - * terms of the GNU General Public License as published by the Free - * Software Foundation; either version 3 of the License, or (at your option) - * any later version. - * - * wimlib is distributed in the hope that it will be useful, but WITHOUT ANY - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR - * A PARTICULAR PURPOSE. See the GNU General Public License for more + * This file is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more * details. * - * You should have received a copy of the GNU General Public License - * along with wimlib; if not, see http://www.gnu.org/licenses/. + * You should have received a copy of the GNU Lesser General Public License + * along with this file; if not, see http://www.gnu.org/licenses/. */ #ifdef HAVE_CONFIG_H @@ -245,12 +243,19 @@ capture_ntfs_streams(struct wim_inode *inode, * dentry's inode. */ if (inode->i_lte) { if (lte) { - ERROR("Found two un-named data streams for \"%s\" " - "(sizes = %"PRIu64", %"PRIu64")", - path, inode->i_lte->size, - lte->size); - ret = WIMLIB_ERR_NTFS_3G; - goto out_free_lte; + if (!(inode->i_attributes & + FILE_ATTRIBUTE_REPARSE_POINT)) + { + WARNING("Found two un-named " + "data streams for \"%s\" " + "(sizes = %"PRIu64", " + "%"PRIu64")", + path, + inode->i_lte->size, + lte->size); + } + free_lookup_table_entry(lte); + continue; } } else { stream_id = 0; @@ -301,88 +306,82 @@ out_put_actx: return ret; } -/* Red-black tree that maps NTFS inode numbers to DOS names */ +/* Binary tree that maps NTFS inode numbers to DOS names */ struct dos_name_map { - struct rb_root rb_root; + struct avl_tree_node *root; }; struct dos_name_node { - struct rb_node rb_node; + struct avl_tree_node index_node; char dos_name[24]; int name_nbytes; le64 ntfs_ino; }; +#define DOS_NAME_NODE(avl_node) \ + avl_tree_entry(avl_node, struct dos_name_node, index_node) + +static int +_avl_cmp_by_ntfs_ino(const struct avl_tree_node *n1, + const struct avl_tree_node *n2) +{ + return cmp_u64(DOS_NAME_NODE(n1)->ntfs_ino, + DOS_NAME_NODE(n2)->ntfs_ino); +} + /* Inserts a new DOS name into the map */ static int insert_dos_name(struct dos_name_map *map, const ntfschar *dos_name, size_t name_nbytes, le64 ntfs_ino) { struct dos_name_node *new_node; - struct rb_node **p; - struct rb_root *root; - struct rb_node *rb_parent; DEBUG("DOS name_len = %zu", name_nbytes); new_node = MALLOC(sizeof(struct dos_name_node)); if (!new_node) - return -1; + return WIMLIB_ERR_NOMEM; /* DOS names are supposed to be 12 characters max (that's 24 bytes, * assuming 2-byte ntfs characters) */ wimlib_assert(name_nbytes <= sizeof(new_node->dos_name)); /* Initialize the DOS name, DOS name length, and NTFS inode number of - * the red-black tree node */ + * the search tree node */ memcpy(new_node->dos_name, dos_name, name_nbytes); new_node->name_nbytes = name_nbytes; new_node->ntfs_ino = ntfs_ino; - /* Insert the red-black tree node */ - root = &map->rb_root; - p = &root->rb_node; - rb_parent = NULL; - while (*p) { - struct dos_name_node *this; - - this = container_of(*p, struct dos_name_node, rb_node); - rb_parent = *p; - if (new_node->ntfs_ino < this->ntfs_ino) - p = &((*p)->rb_left); - else if (new_node->ntfs_ino > this->ntfs_ino) - p = &((*p)->rb_right); - else { - /* This should be impossible since a NTFS inode cannot - * have multiple DOS names, and we only should get each - * DOS name entry once from the ntfs_readdir() calls. */ - ERROR("NTFS inode %"PRIu64" has multiple DOS names", - le64_to_cpu(ntfs_ino)); - return -1; - } + /* Insert the search tree node */ + if (avl_tree_insert(&map->root, &new_node->index_node, + _avl_cmp_by_ntfs_ino)) + { + /* This should be impossible since an NTFS inode cannot + * have multiple DOS names, and we only should get each + * DOS name entry once from the ntfs_readdir() calls. */ + ERROR("NTFS inode %"PRIu64" has multiple DOS names", + le64_to_cpu(ntfs_ino)); + FREE(new_node); + return WIMLIB_ERR_NOMEM; } - rb_link_node(&new_node->rb_node, rb_parent, p); - rb_insert_color(&new_node->rb_node, root); DEBUG("Inserted DOS name for inode %"PRIu64, le64_to_cpu(ntfs_ino)); return 0; } -/* Returns a structure that contains the DOS name and its length for a NTFS +/* Returns a structure that contains the DOS name and its length for an NTFS * inode, or NULL if the inode has no DOS name. */ static struct dos_name_node * lookup_dos_name(const struct dos_name_map *map, u64 ntfs_ino) { - struct rb_node *node = map->rb_root.rb_node; - while (node) { - struct dos_name_node *this; - this = container_of(node, struct dos_name_node, rb_node); - if (ntfs_ino < this->ntfs_ino) - node = node->rb_left; - else if (ntfs_ino > this->ntfs_ino) - node = node->rb_right; - else - return this; - } - return NULL; + struct dos_name_node dummy; + struct avl_tree_node *res; + + dummy.ntfs_ino = cpu_to_le64(ntfs_ino); + + res = avl_tree_lookup_node(map->root, &dummy.index_node, + _avl_cmp_by_ntfs_ino); + if (!res) + return NULL; + return DOS_NAME_NODE(res); } static int @@ -393,12 +392,10 @@ set_dentry_dos_name(struct wim_dentry *dentry, const struct dos_name_map *map) if (dentry->is_win32_name) { node = lookup_dos_name(map, dentry->d_inode->i_ino); if (node) { - dentry->short_name = MALLOC(node->name_nbytes + 2); + dentry->short_name = utf16le_dupz((const utf16lechar *)node->dos_name, + node->name_nbytes); if (!dentry->short_name) return WIMLIB_ERR_NOMEM; - memcpy(dentry->short_name, node->dos_name, - node->name_nbytes); - dentry->short_name[node->name_nbytes / 2] = 0; dentry->short_name_nbytes = node->name_nbytes; DEBUG("Assigned DOS name to ino %"PRIu64, dentry->d_inode->i_ino); @@ -412,18 +409,18 @@ set_dentry_dos_name(struct wim_dentry *dentry, const struct dos_name_map *map) } static void -free_dos_name_tree(struct rb_node *node) { +free_dos_name_tree(struct avl_tree_node *node) { if (node) { - free_dos_name_tree(node->rb_left); - free_dos_name_tree(node->rb_right); - FREE(container_of(node, struct dos_name_node, rb_node)); + free_dos_name_tree(node->left); + free_dos_name_tree(node->right); + FREE(DOS_NAME_NODE(node)); } } static void destroy_dos_name_map(struct dos_name_map *map) { - free_dos_name_tree(map->rb_root.rb_node); + free_dos_name_tree(map->root); } struct readdir_ctx { @@ -433,6 +430,7 @@ struct readdir_ctx { struct dos_name_map *dos_name_map; ntfs_volume *vol; struct add_image_params *params; + int ret; }; static int @@ -514,10 +512,11 @@ out_free_mbs_name: FREE(mbs_name); out: ctx->path[ctx->path_len] = '\0'; + ctx->ret = ret; return ret; } -/* Recursively build a WIM dentry tree corresponding to a NTFS volume. +/* Recursively build a WIM dentry tree corresponding to an NTFS volume. * At the same time, update the WIM lookup table with lookup table entries for * the NTFS streams, and build an array of security descriptors. */ @@ -530,18 +529,16 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_ret, ntfs_volume *vol, struct add_image_params *params) { - le32 attributes; + u32 attributes; int ret; struct wim_dentry *root = NULL; struct wim_inode *inode = NULL; - ATTR_TYPES stream_type; - if (exclude_path(path, path_len, params->config, false)) { - /* Exclude a file or directory tree based on the capture - * configuration file. */ - ret = 0; + ret = try_exclude(path, path_len, params); + if (ret < 0) /* Excluded? */ goto out_progress; - } + if (ret > 0) /* Error? */ + goto out; /* Get file attributes */ ret = ntfs_get_ntfs_attrib(ni, (char*)&attributes, sizeof(attributes)); @@ -561,13 +558,12 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_ret, goto out; } params->progress.scan.cur_path = path; - do_capture_progress(params, WIMLIB_SCAN_DENTRY_UNSUPPORTED, NULL); - ret = 0; + ret = do_capture_progress(params, WIMLIB_SCAN_DENTRY_UNSUPPORTED, NULL); goto out; } /* Create a WIM dentry with an associated inode, which may be shared */ - ret = inode_table_new_dentry(¶ms->inode_table, + ret = inode_table_new_dentry(params->inode_table, path_basename_with_len(path, path_len), ni->mft_no, 0, false, &root); if (ret) @@ -580,30 +576,39 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_ret, if (inode->i_nlink > 1) { /* Shared inode; nothing more to do */ - ret = 0; goto out_progress; } inode->i_creation_time = le64_to_cpu(ni->creation_time); inode->i_last_write_time = le64_to_cpu(ni->last_data_change_time); inode->i_last_access_time = le64_to_cpu(ni->last_access_time); - inode->i_attributes = le32_to_cpu(attributes); + inode->i_attributes = attributes; inode->i_resolved = 1; - if (attributes & FILE_ATTR_REPARSE_POINT) - stream_type = AT_REPARSE_POINT; - else - stream_type = AT_DATA; + /* Capture streams. */ - /* Capture the file's streams; more specifically, this is supposed to: + if (attributes & FILE_ATTR_REPARSE_POINT) { + /* Capture reparse data stream. */ + ret = capture_ntfs_streams(inode, ni, path, path_len, + params->unhashed_streams, + vol, AT_REPARSE_POINT); + if (ret) + goto out; + } + + /* Capture data streams. + * + * Directories should not have an unnamed data stream, but they may have + * named data streams. + * + * Reparse points may have an unnamed data stream (which will be ignored + * in favor of the reparse data stream), and they also may have named + * data streams. * - * - Regular files: capture unnamed data stream and any named data - * streams - * - Directories: capture any named data streams - * - Reparse points: capture reparse data only - */ + * Regular files can have an unnamed data stream as well as named data + * streams. */ ret = capture_ntfs_streams(inode, ni, path, path_len, - params->unhashed_streams, vol, stream_type); + params->unhashed_streams, vol, AT_DATA); if (ret) goto out; @@ -611,7 +616,7 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_ret, /* Recurse to directory children */ s64 pos = 0; - struct dos_name_map dos_name_map = { .rb_root = {.rb_node = NULL} }; + struct dos_name_map dos_name_map = { .root = NULL }; struct readdir_ctx ctx = { .parent = root, .path = path, @@ -619,11 +624,18 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_ret, .dos_name_map = &dos_name_map, .vol = vol, .params = params, + .ret = 0, }; ret = ntfs_readdir(ni, &pos, &ctx, wim_ntfs_capture_filldir); if (ret) { - ERROR_WITH_ERRNO("Error reading directory \"%s\"", path); - ret = WIMLIB_ERR_NTFS_3G; + if (ctx.ret) { + /* wimlib error */ + ret = ctx.ret; + } else { + /* error from ntfs_readdir() itself */ + ERROR_WITH_ERRNO("Error reading directory \"%s\"", path); + ret = WIMLIB_ERR_NTFS_3G; + } } else { struct wim_dentry *child; @@ -663,7 +675,7 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_ret, ret = ntfs_get_ntfs_acl(&sec_ctx, ni, sd, ret); } if (ret > 0) { - inode->i_security_id = sd_set_add_sd(¶ms->sd_set, + inode->i_security_id = sd_set_add_sd(params->sd_set, sd, ret); if (inode->i_security_id == -1) { ERROR("Out of memory"); @@ -688,14 +700,16 @@ build_dentry_tree_ntfs_recursive(struct wim_dentry **root_ret, out_progress: params->progress.scan.cur_path = path; if (root == NULL) - do_capture_progress(params, WIMLIB_SCAN_DENTRY_EXCLUDED, NULL); + ret = do_capture_progress(params, WIMLIB_SCAN_DENTRY_EXCLUDED, NULL); else - do_capture_progress(params, WIMLIB_SCAN_DENTRY_OK, inode); + ret = do_capture_progress(params, WIMLIB_SCAN_DENTRY_OK, inode); out: - if (ret == 0) - *root_ret = root; - else + if (unlikely(ret)) { free_dentry_tree(root, params->lookup_table); + root = NULL; + ret = report_capture_error(params, ret, path); + } + *root_ret = root; return ret; } @@ -784,8 +798,6 @@ out: if (do_ntfs_umount(vol)) { ERROR_WITH_ERRNO("Failed to unmount NTFS volume `%s'", device); - if (ret == 0) - ret = WIMLIB_ERR_NTFS_3G; } } else { /* We need to leave the NTFS volume mounted so that we can read