X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Funix_apply.c;h=3746f504a3695954e9de7c0126872d151075681e;hp=dd2536296790f3e84006c6cc2976914dfc5e1ad4;hb=d4f52f05aacfcc1dff220ed2a3c2d9d20eba31d9;hpb=c48e2f84645abe34faec4994605d7a7b3b451672 diff --git a/src/unix_apply.c b/src/unix_apply.c index dd253629..3746f504 100644 --- a/src/unix_apply.c +++ b/src/unix_apply.c @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2012, 2013, 2014 Eric Biggers + * Copyright (C) 2012-2016 Eric Biggers * * 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 @@ -156,7 +156,9 @@ unix_build_extraction_path(const struct wim_dentry *dentry, d = dentry; do { p -= d->d_extraction_name_nchars; - memcpy(p, d->d_extraction_name, d->d_extraction_name_nchars); + if (d->d_extraction_name_nchars) + memcpy(p, d->d_extraction_name, + d->d_extraction_name_nchars); *--p = '/'; d = d->d_parent; } while (!dentry_is_root(d) && will_extract_dentry(d)); @@ -181,6 +183,17 @@ unix_build_inode_extraction_path(const struct wim_inode *inode, return unix_build_extraction_path(inode_first_extraction_dentry(inode), ctx); } +/* Should the specified file be extracted as a directory on UNIX? We extract + * the file as a directory if FILE_ATTRIBUTE_DIRECTORY is set and the file does + * not have a symlink or junction reparse point. It *may* have a different type + * of reparse point. */ +static inline bool +should_extract_as_directory(const struct wim_inode *inode) +{ + return (inode->i_attributes & FILE_ATTRIBUTE_DIRECTORY) && + !inode_is_symlink(inode); +} + /* Sets the timestamps on a file being extracted. * * Either @fd or @path must be specified (not -1 and not NULL, respectively). @@ -330,9 +343,7 @@ unix_create_hardlinks(const struct wim_inode *inode, const struct wim_dentry *dentry; const char *newpath; - list_for_each_entry(dentry, &inode->i_extraction_aliases, - d_extraction_alias_node) - { + inode_for_each_extraction_alias(dentry, inode) { if (dentry == first_dentry) continue; @@ -358,7 +369,7 @@ unix_create_if_directory(const struct wim_dentry *dentry, const char *path; struct stat stbuf; - if (!dentry_is_directory(dentry)) + if (!should_extract_as_directory(dentry->d_inode)) return 0; path = unix_build_extraction_path(dentry, ctx); @@ -393,7 +404,7 @@ unix_extract_if_empty_file(const struct wim_dentry *dentry, /* Is this a directory, a symbolic link, or any type of nonempty file? */ - if (inode_is_directory(inode) || inode_is_symlink(inode) || + if (should_extract_as_directory(inode) || inode_is_symlink(inode) || inode_get_blob_for_unnamed_data_stream_resolved(inode)) return 0; @@ -425,7 +436,7 @@ unix_extract_if_empty_file(const struct wim_dentry *dentry, path = unix_build_extraction_path(dentry, ctx); retry_create: - fd = open(path, O_TRUNC | O_CREAT | O_WRONLY | O_NOFOLLOW, 0644); + fd = open(path, O_EXCL | O_CREAT | O_WRONLY | O_NOFOLLOW, 0644); if (fd < 0) { if (errno == EEXIST && !unlink(path)) goto retry_create; @@ -482,7 +493,7 @@ unix_count_dentries(const struct list_head *dentry_list, const struct wim_inode *inode = dentry->d_inode; - if (inode_is_directory(inode)) + if (should_extract_as_directory(inode)) dir_count++; else if ((dentry == inode_first_extraction_dentry(inode)) && !inode_is_symlink(inode) && @@ -496,40 +507,27 @@ unix_count_dentries(const struct list_head *dentry_list, static int unix_create_symlink(const struct wim_inode *inode, const char *path, - const u8 *rpdata, u16 rpdatalen, bool rpfix, - const char *apply_dir, size_t apply_dir_nchars) + size_t rpdatalen, struct unix_apply_ctx *ctx) { - char link_target[REPARSE_DATA_MAX_SIZE]; - int ret; + char target[REPARSE_POINT_MAX_SIZE]; struct blob_descriptor blob_override; + int ret; blob_set_is_located_in_attached_buffer(&blob_override, - (void *)rpdata, rpdatalen); + ctx->reparse_data, rpdatalen); - ret = wim_inode_readlink(inode, link_target, - sizeof(link_target) - 1, &blob_override); - if (ret < 0) { + ret = wim_inode_readlink(inode, target, sizeof(target) - 1, + &blob_override, + ctx->target_abspath, + ctx->target_abspath_nchars); + if (unlikely(ret < 0)) { errno = -ret; return WIMLIB_ERR_READLINK; } + target[ret] = '\0'; - link_target[ret] = 0; - - if (rpfix && link_target[0] == '/') { - - /* "Fix" the absolute symbolic link by prepending the absolute - * path to the target directory. */ - - if (sizeof(link_target) - (ret + 1) < apply_dir_nchars) { - errno = ENAMETOOLONG; - return WIMLIB_ERR_REPARSE_POINT_FIXUP_FAILED; - } - memmove(link_target + apply_dir_nchars, link_target, - ret + 1); - memcpy(link_target, apply_dir, apply_dir_nchars); - } retry_symlink: - if (symlink(link_target, path)) { + if (symlink(target, path)) { if (errno == EEXIST && !unlink(path)) goto retry_symlink; return WIMLIB_ERR_LINK; @@ -561,7 +559,7 @@ unix_begin_extract_blob_instance(const struct blob_descriptor *blob, if (blob->size > REPARSE_DATA_MAX_SIZE) { ERROR_WITH_ERRNO("Reparse data of \"%s\" has size " "%"PRIu64" bytes (exceeds %u bytes)", - inode_first_full_path(inode), + inode_any_full_path(inode), blob->size, REPARSE_DATA_MAX_SIZE); return WIMLIB_ERR_INVALID_REPARSE_DATA; } @@ -579,7 +577,7 @@ unix_begin_extract_blob_instance(const struct blob_descriptor *blob, first_dentry = inode_first_extraction_dentry(inode); first_path = unix_build_extraction_path(first_dentry, ctx); retry_create: - fd = open(first_path, O_TRUNC | O_CREAT | O_WRONLY | O_NOFOLLOW, 0644); + fd = open(first_path, O_EXCL | O_CREAT | O_WRONLY | O_NOFOLLOW, 0644); if (fd < 0) { if (errno == EEXIST && !unlink(first_path)) goto retry_create; @@ -655,19 +653,9 @@ unix_end_extract_blob(struct blob_descriptor *blob, int status, void *_ctx) /* We finally have the symlink data, so we can create * the symlink. */ const char *path; - bool rpfix; - - rpfix = (ctx->common.extract_flags & - WIMLIB_EXTRACT_FLAG_RPFIX) && - !inode->i_not_rpfixed; path = unix_build_inode_extraction_path(inode, ctx); - ret = unix_create_symlink(inode, path, - ctx->reparse_data, - blob->size, - rpfix, - ctx->target_abspath, - ctx->target_abspath_nchars); + ret = unix_create_symlink(inode, path, blob->size, ctx); if (ret) { ERROR_WITH_ERRNO("Can't create symbolic link " "\"%s\"", path); @@ -705,7 +693,7 @@ unix_set_dir_metadata(struct list_head *dentry_list, struct unix_apply_ctx *ctx) int ret; list_for_each_entry_reverse(dentry, dentry_list, d_extraction_list_node) { - if (dentry_is_directory(dentry)) { + if (should_extract_as_directory(dentry->d_inode)) { ret = unix_set_metadata(-1, dentry->d_inode, NULL, ctx); if (ret) return ret;