/*
* 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/.
*/
#ifndef __WIN32__
return WIMLIB_ERR_NOMEM;
}
lte->file_on_disk = file_on_disk;
+ lte->file_inode = inode;
lte->resource_location = RESOURCE_IN_FILE_ON_DISK;
lte->size = size;
add_unhashed_stream(lte, inode, 0, unhashed_streams);
unix_build_dentry_tree_recursive(struct wim_dentry **tree_ret,
char *path, size_t path_len,
int dirfd, const char *relpath,
- struct add_image_params *params);
+ struct capture_params *params);
static int
unix_scan_directory(struct wim_dentry *dir_dentry,
char *full_path, size_t full_path_len,
int parent_dirfd, const char *dir_relpath,
- struct add_image_params *params)
+ struct capture_params *params)
{
int dirfd;
}
static int
-unix_scan_symlink(struct wim_dentry **root_p, const char *full_path,
- int dirfd, const char *relpath,
- struct wim_inode *inode, struct add_image_params *params)
+unix_scan_symlink(const char *full_path, int dirfd, const char *relpath,
+ struct wim_inode *inode, struct capture_params *params)
{
char deref_name_buf[4096];
ssize_t deref_name_len;
if ((params->add_flags & WIMLIB_ADD_FLAG_RPFIX) &&
dest[0] == '/')
{
- dest = unix_fixup_abslink(dest,
- params->capture_root_ino,
- params->capture_root_dev);
- if (!dest) {
- /* RPFIX (reparse point fixup) mode: Ignore
- * absolute symbolic link that points out of the
- * tree to be captured. */
- free_dentry(*root_p);
- *root_p = NULL;
- params->progress.scan.cur_path = full_path;
- params->progress.scan.symlink_target = deref_name_buf;
- return do_capture_progress(params,
- WIMLIB_SCAN_DENTRY_EXCLUDED_SYMLINK,
- NULL);
+ char *fixed_dest;
+
+ /* RPFIX (reparse point fixup) mode: Change target of absolute
+ * symbolic link to be "absolute" relative to the tree being
+ * captured. */
+ fixed_dest = unix_fixup_abslink(dest,
+ params->capture_root_ino,
+ params->capture_root_dev);
+ params->progress.scan.cur_path = full_path;
+ params->progress.scan.symlink_target = deref_name_buf;
+ if (fixed_dest) {
+ /* Link points inside the tree being captured, so it was
+ * fixed. */
+ inode->i_not_rpfixed = 0;
+ dest = fixed_dest;
+ ret = do_capture_progress(params,
+ WIMLIB_SCAN_DENTRY_FIXED_SYMLINK,
+ NULL);
+ } else {
+ /* Link points outside the tree being captured, so it
+ * was not fixed. */
+ ret = do_capture_progress(params,
+ WIMLIB_SCAN_DENTRY_NOT_FIXED_SYMLINK,
+ NULL);
}
- inode->i_not_rpfixed = 0;
+ if (ret)
+ return ret;
}
ret = wim_inode_set_symlink(inode, dest, params->lookup_table);
if (ret)
unix_build_dentry_tree_recursive(struct wim_dentry **tree_ret,
char *full_path, size_t full_path_len,
int dirfd, const char *relpath,
- struct add_image_params *params)
+ struct capture_params *params)
{
struct wim_dentry *tree = NULL;
struct wim_inode *inode = NULL;
struct stat stbuf;
int stat_flags;
- if (should_exclude_path(full_path + params->capture_root_nchars,
- full_path_len - params->capture_root_nchars,
- params->config))
- {
- ret = 0;
+ ret = try_exclude(full_path, full_path_len, params);
+ if (ret < 0) /* Excluded? */
goto out_progress;
- }
+ if (ret > 0) /* Error? */
+ goto out;
if (params->add_flags & (WIMLIB_ADD_FLAG_DEREFERENCE |
WIMLIB_ADD_FLAG_ROOT))
inode = tree->d_inode;
- if (inode->i_nlink > 1) {
- /* Already seen this inode? */
- ret = 0;
+ /* Already seen this inode? */
+ if (inode->i_nlink > 1)
goto out_progress;
- }
#ifdef HAVE_STAT_NANOSECOND_PRECISION
- 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);
+ 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(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);
+ inode->i_creation_time = time_t_to_wim_timestamp(stbuf.st_mtime);
+ inode->i_last_write_time = time_t_to_wim_timestamp(stbuf.st_mtime);
+ inode->i_last_access_time = time_t_to_wim_timestamp(stbuf.st_atime);
#endif
inode->i_resolved = 1;
if (params->add_flags & WIMLIB_ADD_FLAG_UNIX_DATA) {
ret = unix_scan_directory(tree, full_path, full_path_len,
dirfd, relpath, params);
} else if (S_ISLNK(stbuf.st_mode)) {
- ret = unix_scan_symlink(&tree, full_path, dirfd, relpath,
+ ret = unix_scan_symlink(full_path, dirfd, relpath,
inode, params);
- if (!tree)
- goto out;
}
if (ret)
else
ret = do_capture_progress(params, WIMLIB_SCAN_DENTRY_EXCLUDED, NULL);
out:
- if (likely(ret == 0))
- *tree_ret = tree;
- else
+ if (unlikely(ret)) {
free_dentry_tree(tree, params->lookup_table);
+ tree = NULL;
+ ret = report_capture_error(params, ret, full_path);
+ }
+ *tree_ret = tree;
return ret;
}
*
* @root_disk_path: The path to the root of the directory tree on disk.
*
- * @params: See doc for `struct add_image_params'.
+ * @params: See doc for `struct capture_params'.
*
* @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
int
unix_build_dentry_tree(struct wim_dentry **root_ret,
const char *root_disk_path,
- struct add_image_params *params)
+ struct capture_params *params)
{
size_t path_len;
size_t path_bufsz;
git://wimlib.net / wimlib / blobdiff