}
static int
-unix_scan_symlink(struct wim_dentry **root_p, const char *full_path,
- int dirfd, const char *relpath,
+unix_scan_symlink(const char *full_path, int dirfd, const char *relpath,
struct wim_inode *inode, struct add_image_params *params)
{
char deref_name_buf[4096];
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)
if (should_exclude_path(full_path + params->capture_root_nchars,
full_path_len - params->capture_root_nchars,
params->config))
- {
- ret = 0;
goto out_progress;
- }
if (params->add_flags & (WIMLIB_ADD_FLAG_DEREFERENCE |
WIMLIB_ADD_FLAG_ROOT))
goto out;
}
- if (unlikely(!S_ISREG(stbuf.st_mode) &&
- !S_ISDIR(stbuf.st_mode) &&
- !S_ISLNK(stbuf.st_mode)))
- {
- if (params->add_flags & WIMLIB_ADD_FLAG_NO_UNSUPPORTED_EXCLUDE)
+ if (!(params->add_flags & WIMLIB_ADD_FLAG_UNIX_DATA)) {
+ if (unlikely(!S_ISREG(stbuf.st_mode) &&
+ !S_ISDIR(stbuf.st_mode) &&
+ !S_ISLNK(stbuf.st_mode)))
{
- ERROR("\"%s\": File type is unsupported", full_path);
- ret = WIMLIB_ERR_UNSUPPORTED_FILE;
+ if (params->add_flags &
+ WIMLIB_ADD_FLAG_NO_UNSUPPORTED_EXCLUDE)
+ {
+ ERROR("\"%s\": File type is unsupported",
+ full_path);
+ ret = WIMLIB_ERR_UNSUPPORTED_FILE;
+ goto out;
+ }
+ params->progress.scan.cur_path = full_path;
+ ret = do_capture_progress(params,
+ WIMLIB_SCAN_DENTRY_UNSUPPORTED,
+ NULL);
goto out;
}
- params->progress.scan.cur_path = full_path;
- ret = do_capture_progress(params, WIMLIB_SCAN_DENTRY_UNSUPPORTED, NULL);
- goto out;
}
ret = inode_table_new_dentry(params->inode_table, relpath,
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);
#endif
inode->i_resolved = 1;
if (params->add_flags & WIMLIB_ADD_FLAG_UNIX_DATA) {
- if (!inode_set_unix_data(inode, stbuf.st_uid, stbuf.st_gid,
- stbuf.st_mode, UNIX_DATA_ALL))
- {
+ struct wimlib_unix_data unix_data;
+
+ unix_data.uid = stbuf.st_uid;
+ unix_data.gid = stbuf.st_gid;
+ unix_data.mode = stbuf.st_mode;
+ unix_data.rdev = stbuf.st_rdev;
+ if (!inode_set_unix_data(inode, &unix_data, UNIX_DATA_ALL)) {
ret = WIMLIB_ERR_NOMEM;
goto out;
}
} else if (S_ISDIR(stbuf.st_mode)) {
ret = unix_scan_directory(tree, full_path, full_path_len,
dirfd, relpath, params);
- } else {
- ret = unix_scan_symlink(&tree, full_path, dirfd, relpath,
+ } else if (S_ISLNK(stbuf.st_mode)) {
+ ret = unix_scan_symlink(full_path, dirfd, relpath,
inode, params);
- if (!tree)
- goto out;
}
if (ret)