X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Funix_capture.c;h=906920a86144dc9549b58975e694691d6c8563ee;hp=9a28d55a9a2fc6f552e3cafd91f626a3e9db7bd8;hb=389f993fdf085a9bf120f8a17464e321d6e42898;hpb=ac6edfd02c612da68a1b9a1b32ae64c95a87fbb1 diff --git a/src/unix_capture.c b/src/unix_capture.c index 9a28d55a..906920a8 100644 --- a/src/unix_capture.c +++ b/src/unix_capture.c @@ -3,7 +3,7 @@ */ /* - * Copyright (C) 2013 Eric Biggers + * Copyright (C) 2012, 2013 Eric Biggers * * This file is part of wimlib, a library for working with WIM files. * @@ -23,15 +23,23 @@ #ifndef __WIN32__ -#include "wimlib_internal.h" -#include "dentry.h" -#include "lookup_table.h" -#include "timestamp.h" +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif #include #include -#include +#include #include +#include + +#include "wimlib/capture.h" +#include "wimlib/dentry.h" +#include "wimlib/error.h" +#include "wimlib/lookup_table.h" +#include "wimlib/paths.h" +#include "wimlib/reparse.h" +#include "wimlib/timestamp.h" static int unix_capture_regular_file(const char *path, @@ -137,12 +145,9 @@ unix_capture_symlink(struct wim_dentry **root_p, inode->i_attributes = FILE_ATTRIBUTE_REPARSE_POINT; inode->i_reparse_tag = WIM_IO_REPARSE_TAG_SYMLINK; - /* The idea here is to call readlink() to get the UNIX target of - * the symbolic link, then turn the target into a reparse point - * data buffer that contains a relative or absolute symbolic - * link (NOT a junction point or *full* path symbolic link with - * drive letter). - */ + /* The idea here is to call readlink() to get the UNIX target of the + * symbolic link, then turn the target into a reparse point data buffer + * that contains a relative or absolute symbolic link. */ deref_name_len = readlink(path, deref_name_buf, sizeof(deref_name_buf) - 1); if (deref_name_len >= 0) { @@ -242,7 +247,7 @@ unix_build_dentry_tree_recursive(struct wim_dentry **root_ret, goto out; } - ret = inode_table_new_dentry(params->inode_table, + ret = inode_table_new_dentry(¶ms->inode_table, path_basename_with_len(path, path_len), stbuf.st_ino, stbuf.st_dev, false, &root); if (ret)