X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Funix_capture.c;h=8b1e793413c7faf3f56b96b77c50ffbfca56d8cd;hp=a76fbc37f7689b7c329f55a821783152e31bd451;hb=af141a23c4d1540b8a64759bb68c7cd7ff054e72;hpb=93efeb4c030108b0cc84d53c141c6418ee2267cb diff --git a/src/unix_capture.c b/src/unix_capture.c index a76fbc37..8b1e7934 100644 --- a/src/unix_capture.c +++ b/src/unix_capture.c @@ -40,6 +40,7 @@ #include "wimlib/lookup_table.h" #include "wimlib/reparse.h" #include "wimlib/timestamp.h" +#include "wimlib/unix_data.h" #ifdef HAVE_FDOPENDIR # define my_fdopendir(dirfd_p) fdopendir(*(dirfd_p)) @@ -201,6 +202,54 @@ unix_scan_directory(struct wim_dentry *dir_dentry, return ret; } +/* Given an absolute symbolic link target @dest (UNIX-style, beginning + * with '/'), determine whether it points into the directory specified by + * @ino and @dev. If so, return the target modified to be "absolute" + * relative to this directory. Otherwise, return NULL. */ +static char * +unix_fixup_abslink(char *dest, u64 ino, u64 dev) +{ + char *p = dest; + + do { + char save; + struct stat stbuf; + int ret; + + /* Skip non-slashes. */ + while (*p && *p != '/') + p++; + + /* Skip slashes. */ + while (*p && *p == '/') + p++; + + /* Get inode and device for this prefix. */ + save = *p; + *p = '\0'; + ret = stat(dest, &stbuf); + *p = save; + + if (ret) { + /* stat() failed. Assume the link points outside the + * directory tree being captured. */ + break; + } + + if (stbuf.st_ino == ino && stbuf.st_dev == dev) { + /* Link points inside directory tree being captured. + * Return abbreviated path. */ + *--p = '/'; + while (p > dest && *(p - 1) == '/') + p--; + return p; + } + } while (*p); + + /* Link does not point inside directory tree being captured. */ + return NULL; +} + static int unix_scan_symlink(struct wim_dentry **root_p, const char *full_path, int dirfd, const char *relpath, @@ -232,23 +281,31 @@ unix_scan_symlink(struct wim_dentry **root_p, const char *full_path, if ((params->add_flags & WIMLIB_ADD_FLAG_RPFIX) && dest[0] == '/') { - dest = capture_fixup_absolute_symlink(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. */ + /* RPFIX (reparse point fixup) mode: Change target of absolute + * symbolic link to be "absolute" relative to the tree being + * captured. */ + 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 (dest) { + /* Successfully fixed the link target. */ + inode->i_not_rpfixed = 0; + ret = do_capture_progress(params, + WIMLIB_SCAN_DENTRY_FIXED_SYMLINK, + NULL); + if (ret) + return ret; + } else { + /* Link points outside of the tree being captured. + * Exclude it. */ free_dentry(*root_p); *root_p = NULL; - params->progress.scan.cur_path = full_path; - params->progress.scan.symlink_target = deref_name_buf; - do_capture_progress(params, - WIMLIB_SCAN_DENTRY_EXCLUDED_SYMLINK, - NULL); - return 0; + return do_capture_progress(params, + WIMLIB_SCAN_DENTRY_EXCLUDED_SYMLINK, + NULL); } - inode->i_not_rpfixed = 0; } ret = wim_inode_set_symlink(inode, dest, params->lookup_table); if (ret) @@ -280,10 +337,7 @@ unix_build_dentry_tree_recursive(struct wim_dentry **tree_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)) @@ -299,20 +353,25 @@ unix_build_dentry_tree_recursive(struct wim_dentry **tree_ret, 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; - do_capture_progress(params, WIMLIB_SCAN_DENTRY_UNSUPPORTED, NULL); - ret = 0; - goto out; } ret = inode_table_new_dentry(params->inode_table, relpath, @@ -323,11 +382,9 @@ unix_build_dentry_tree_recursive(struct wim_dentry **tree_ret, 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); @@ -340,13 +397,16 @@ unix_build_dentry_tree_recursive(struct wim_dentry **tree_ret, #endif inode->i_resolved = 1; if (params->add_flags & WIMLIB_ADD_FLAG_UNIX_DATA) { - ret = inode_set_unix_data(inode, stbuf.st_uid, - stbuf.st_gid, - stbuf.st_mode, - params->lookup_table, - UNIX_DATA_ALL | UNIX_DATA_CREATE); - if (ret) + 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; + } } if (params->add_flags & WIMLIB_ADD_FLAG_ROOT) { @@ -361,7 +421,7 @@ unix_build_dentry_tree_recursive(struct wim_dentry **tree_ret, } else if (S_ISDIR(stbuf.st_mode)) { ret = unix_scan_directory(tree, full_path, full_path_len, dirfd, relpath, params); - } else { + } else if (S_ISLNK(stbuf.st_mode)) { ret = unix_scan_symlink(&tree, full_path, dirfd, relpath, inode, params); if (!tree) @@ -374,9 +434,9 @@ unix_build_dentry_tree_recursive(struct wim_dentry **tree_ret, out_progress: params->progress.scan.cur_path = full_path; if (likely(tree)) - do_capture_progress(params, WIMLIB_SCAN_DENTRY_OK, inode); + ret = do_capture_progress(params, WIMLIB_SCAN_DENTRY_OK, inode); else - do_capture_progress(params, WIMLIB_SCAN_DENTRY_EXCLUDED, NULL); + ret = do_capture_progress(params, WIMLIB_SCAN_DENTRY_EXCLUDED, NULL); out: if (likely(ret == 0)) *tree_ret = tree;