*/
/*
- * Copyright (C) 2012-2016 Eric Biggers
+ * Copyright (C) 2012-2018 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
* details.
*
* 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/.
+ * along with this file; if not, see https://www.gnu.org/licenses/.
*/
-#ifndef __WIN32__
+#ifndef _WIN32
#ifdef HAVE_CONFIG_H
# include "config.h"
#include <dirent.h>
#include <errno.h>
#include <fcntl.h>
-#include <limits.h> /* for PATH_MAX */
#include <sys/stat.h>
#include <sys/types.h>
#ifdef HAVE_SYS_XATTR_H
# define AT_SYMLINK_NOFOLLOW 0x100
#endif
-#ifdef HAVE_XATTR_SUPPORT
+#ifdef HAVE_LINUX_XATTR_SUPPORT
/*
* Retrieves the values of the xattrs named by the null-terminated @names of the
* file at @path and serializes the xattr names and values into @entries. If
const char * const names_end = names + names_size;
void * const entries_end = entries + entries_size;
const char *name = names;
- struct wimlib_xattr_entry *entry = entries;
+ struct wim_xattr_entry *entry = entries;
- wimlib_assert((uintptr_t)entries % 4 == 0 &&
- entries_size % 4 == 0 && names_size != 0);
do {
size_t name_len = strnlen(name, names_end - name);
void *value;
ssize_t value_len;
- if (name_len == 0 || name_len >= names_end - name ||
- (u16)name_len != name_len) {
+ if (name_len == 0 || name_len >= names_end - name) {
ERROR("\"%s\": malformed extended attribute names list",
path);
errno = EINVAL;
return -1;
}
+ if (name_len > WIM_XATTR_NAME_MAX) {
+ WARNING("\"%s\": name of extended attribute \"%s\" is too long to store",
+ path, name);
+ goto next_name;
+ }
+
/*
- * Note: we take care to always call lgetxattr() with a nonzero
- * size, since zero size means to return the value length only.
+ * Take care to always call lgetxattr() with a nonzero size,
+ * since zero size means to return the value length only.
*/
- if (entries_end - (void *)entry <= sizeof(*entry) + name_len) {
+ if (entries_end - (void *)entry <=
+ sizeof(*entry) + name_len + 1) {
errno = ERANGE;
return -1;
}
- entry->name_len = cpu_to_le16(name_len);
- entry->reserved = 0;
- value = mempcpy(entry->name, name, name_len);
+ entry->name_len = name_len;
+ entry->flags = 0;
+ value = mempcpy(entry->name, name, name_len + 1);
value_len = lgetxattr(path, name, value, entries_end - value);
if (value_len < 0) {
}
return -1;
}
- if ((u32)value_len != value_len) {
- ERROR("\"%s\": value of extended attribute \"%s\" is too large",
- path, name);
- errno = EINVAL;
- return -1;
+ if (value_len > WIM_XATTR_SIZE_MAX) {
+ WARNING("\"%s\": value of extended attribute \"%s\" is too large to store",
+ path, name);
+ goto next_name;
}
- entry->value_len = cpu_to_le32(value_len);
-
- /*
- * Zero-pad the entry to the next 4-byte boundary.
- * Note: because we've guaranteed that @entries_size is a
- * multiple of 4, this cannot overflow the @entries buffer.
- */
- value += value_len;
- while ((uintptr_t)value & 3) {
- *(u8 *)value = 0;
- value++;
- }
-
- entry = value;
+ entry->value_len = cpu_to_le16(value_len);
+ entry = value + value_len;
+ next_name:
name += name_len + 1;
} while (name < names_end);
create_xattr_item(const char *path, struct wim_inode *inode,
const char *names, size_t names_size)
{
- char _entries[1024] _aligned_attribute(4);
+ char _entries[1024];
char *entries = _entries;
size_t entries_avail = ARRAY_LEN(_entries);
ssize_t entries_size;
goto out;
}
ret = WIMLIB_ERR_NOMEM;
- if (!inode_set_linux_xattrs(inode, entries, entries_size))
+ if (!inode_set_xattrs(inode, entries, entries_size))
goto out;
ret = 0;
FREE(names);
return ret;
}
-#endif /* HAVE_XATTR_SUPPORT */
+#endif /* HAVE_LINUX_XATTR_SUPPORT */
static int
unix_scan_regular_file(const char *path, u64 blocks, u64 size,
static int
unix_build_dentry_tree_recursive(struct wim_dentry **tree_ret,
- char *path, size_t path_len,
int dirfd, const char *relpath,
struct scan_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 scan_params *params)
{
DIR *dir;
int ret;
- dirfd = my_openat(full_path, parent_dirfd, dir_relpath, O_RDONLY);
+ dirfd = my_openat(params->cur_path, parent_dirfd, dir_relpath, O_RDONLY);
if (dirfd < 0) {
- ERROR_WITH_ERRNO("\"%s\": Can't open directory", full_path);
+ ERROR_WITH_ERRNO("\"%s\": Can't open directory",
+ params->cur_path);
return WIMLIB_ERR_OPENDIR;
}
dir_dentry->d_inode->i_attributes = FILE_ATTRIBUTE_DIRECTORY;
dir = my_fdopendir(&dirfd);
if (!dir) {
- ERROR_WITH_ERRNO("\"%s\": Can't open directory", full_path);
+ ERROR_WITH_ERRNO("\"%s\": Can't open directory",
+ params->cur_path);
close(dirfd);
return WIMLIB_ERR_OPENDIR;
}
struct dirent *entry;
struct wim_dentry *child;
size_t name_len;
+ size_t orig_path_len;
errno = 0;
entry = readdir(dir);
if (errno) {
ret = WIMLIB_ERR_READ;
ERROR_WITH_ERRNO("\"%s\": Error reading directory",
- full_path);
+ params->cur_path);
}
break;
}
if (should_ignore_filename(entry->d_name, name_len))
continue;
- full_path[full_path_len] = '/';
- memcpy(&full_path[full_path_len + 1], entry->d_name, name_len + 1);
- ret = unix_build_dentry_tree_recursive(&child,
- full_path,
- full_path_len + 1 + name_len,
- dirfd,
- &full_path[full_path_len + 1],
- params);
- full_path[full_path_len] = '\0';
+ ret = WIMLIB_ERR_NOMEM;
+ if (!pathbuf_append_name(params, entry->d_name, name_len,
+ &orig_path_len))
+ break;
+ ret = unix_build_dentry_tree_recursive(&child, dirfd,
+ entry->d_name, params);
+ pathbuf_truncate(params, orig_path_len);
if (ret)
break;
attach_scanned_tree(dir_dentry, child, params->blob_table);
}
static noinline_for_stack int
-unix_scan_symlink(const char *full_path, int dirfd, const char *relpath,
+unix_scan_symlink(int dirfd, const char *relpath,
struct wim_inode *inode, struct scan_params *params)
{
char orig_target[REPARSE_POINT_MAX_SIZE];
int ret;
/* Read the UNIX symbolic link target. */
- ret = my_readlinkat(full_path, dirfd, relpath, target,
+ ret = my_readlinkat(params->cur_path, dirfd, relpath, target,
sizeof(orig_target));
if (unlikely(ret < 0)) {
ERROR_WITH_ERRNO("\"%s\": Can't read target of symbolic link",
- full_path);
+ params->cur_path);
return WIMLIB_ERR_READLINK;
}
if (unlikely(ret >= sizeof(orig_target))) {
- ERROR("\"%s\": target of symbolic link is too long", full_path);
+ ERROR("\"%s\": target of symbolic link is too long",
+ params->cur_path);
return WIMLIB_ERR_READLINK;
}
target[ret] = '\0';
if (target[0] == '/' && (params->add_flags & WIMLIB_ADD_FLAG_RPFIX)) {
int status = WIMLIB_SCAN_DENTRY_NOT_FIXED_SYMLINK;
- params->progress.scan.cur_path = full_path;
params->progress.scan.symlink_target = target;
target = unix_relativize_link_target(target,
if (unlikely(ret)) {
if (ret == WIMLIB_ERR_INVALID_UTF8_STRING) {
ERROR("\"%s\": target of symbolic link is not valid "
- "UTF-8. This is not supported.", full_path);
+ "UTF-8. This is not supported.",
+ params->cur_path);
}
return ret;
}
* (non-)directory is stored as a reparse point on a (non-)directory
* file. Replicate this behavior by examining the target file. */
struct stat stbuf;
- if (my_fstatat(full_path, dirfd, relpath, &stbuf, 0) == 0 &&
+ if (my_fstatat(params->cur_path, dirfd, relpath, &stbuf, 0) == 0 &&
S_ISDIR(stbuf.st_mode))
inode->i_attributes |= FILE_ATTRIBUTE_DIRECTORY;
return 0;
static int
unix_build_dentry_tree_recursive(struct wim_dentry **tree_ret,
- char *full_path, size_t full_path_len,
int dirfd, const char *relpath,
struct scan_params *params)
{
struct stat stbuf;
int stat_flags;
- ret = try_exclude(full_path, params);
+ ret = try_exclude(params);
if (unlikely(ret < 0)) /* Excluded? */
goto out_progress;
if (unlikely(ret > 0)) /* Error? */
else
stat_flags = AT_SYMLINK_NOFOLLOW;
- ret = my_fstatat(full_path, dirfd, relpath, &stbuf, stat_flags);
+ ret = my_fstatat(params->cur_path, dirfd, relpath, &stbuf, stat_flags);
if (ret) {
- ERROR_WITH_ERRNO("\"%s\": Can't read metadata", full_path);
+ ERROR_WITH_ERRNO("\"%s\": Can't read metadata",
+ params->cur_path);
ret = WIMLIB_ERR_STAT;
goto out;
}
WIMLIB_ADD_FLAG_NO_UNSUPPORTED_EXCLUDE)
{
ERROR("\"%s\": File type is unsupported",
- full_path);
+ params->cur_path);
ret = WIMLIB_ERR_UNSUPPORTED_FILE;
goto out;
}
- params->progress.scan.cur_path = full_path;
ret = do_scan_progress(params,
WIMLIB_SCAN_DENTRY_UNSUPPORTED,
NULL);
if (unlikely(ret)) {
if (ret == WIMLIB_ERR_INVALID_UTF8_STRING) {
ERROR("\"%s\": filename is not valid UTF-8. "
- "This is not supported.", full_path);
+ "This is not supported.", params->cur_path);
}
goto out;
}
ret = WIMLIB_ERR_NOMEM;
goto out;
}
-#ifdef HAVE_XATTR_SUPPORT
- ret = scan_linux_xattrs(full_path, inode);
+#ifdef HAVE_LINUX_XATTR_SUPPORT
+ ret = scan_linux_xattrs(params->cur_path, inode);
if (ret)
goto out;
#endif
}
if (S_ISREG(stbuf.st_mode)) {
- ret = unix_scan_regular_file(full_path, stbuf.st_blocks,
+ ret = unix_scan_regular_file(params->cur_path, stbuf.st_blocks,
stbuf.st_size, inode,
params->unhashed_blobs);
} else if (S_ISDIR(stbuf.st_mode)) {
- ret = unix_scan_directory(tree, full_path, full_path_len,
- dirfd, relpath, params);
+ ret = unix_scan_directory(tree, dirfd, relpath, params);
} else if (S_ISLNK(stbuf.st_mode)) {
- ret = unix_scan_symlink(full_path, dirfd, relpath,
- inode, params);
+ ret = unix_scan_symlink(dirfd, relpath, inode, params);
}
if (ret)
goto out;
out_progress:
- params->progress.scan.cur_path = full_path;
if (likely(tree))
ret = do_scan_progress(params, WIMLIB_SCAN_DENTRY_OK, inode);
else
if (unlikely(ret)) {
free_dentry_tree(tree, params->blob_table);
tree = NULL;
- ret = report_scan_error(params, ret, full_path);
+ ret = report_scan_error(params, ret);
}
*tree_ret = tree;
return ret;
unix_build_dentry_tree(struct wim_dentry **root_ret,
const char *root_disk_path, struct scan_params *params)
{
- size_t path_len;
- size_t path_bufsz;
- char *path_buf;
int ret;
- path_len = strlen(root_disk_path);
- path_bufsz = min(32790, PATH_MAX + 1);
-
- if (path_len >= path_bufsz)
- return WIMLIB_ERR_INVALID_PARAM;
-
- path_buf = MALLOC(path_bufsz);
- if (!path_buf)
- return WIMLIB_ERR_NOMEM;
- memcpy(path_buf, root_disk_path, path_len + 1);
-
- params->capture_root_nchars = path_len;
+ ret = pathbuf_init(params, root_disk_path);
+ if (ret)
+ return ret;
- ret = unix_build_dentry_tree_recursive(root_ret, path_buf, path_len,
- AT_FDCWD, path_buf, params);
- FREE(path_buf);
- return ret;
+ return unix_build_dentry_tree_recursive(root_ret, AT_FDCWD,
+ root_disk_path, params);
}
-#endif /* !__WIN32__ */
+#endif /* !_WIN32 */
git://wimlib.net / wimlib / blobdiff