X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Funix_capture.c;h=906920a86144dc9549b58975e694691d6c8563ee;hp=f3e9f0e564866f3b7b760a39f5f64627ec5d34dc;hb=f5d26d6005ba759762bec8c7cd45a738e577a8a7;hpb=bb40342796df9c677f6903b596abf4e9e5769845

diff --git a/src/unix_capture.c b/src/unix_capture.c
index f3e9f0e5..906920a8 100644
--- a/src/unix_capture.c
+++ b/src/unix_capture.c
@@ -1,5 +1,9 @@
 /*
- * Copyright (C) 2013 Eric Biggers
+ * unix_capture.c:  Capture a directory tree on UNIX.
+ */
+
+/*
+ * Copyright (C) 2012, 2013 Eric Biggers
  *
  * This file is part of wimlib, a library for working with WIM files.
  *
@@ -19,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 <dirent.h>
 #include <errno.h>
-#include <unistd.h>
+#include <limits.h>
 #include <sys/stat.h>
+#include <unistd.h>
+
+#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,
@@ -82,7 +94,7 @@ unix_capture_directory(struct wim_dentry *dir_dentry,
 	if (!dir) {
 		ERROR_WITH_ERRNO("Failed to open the directory `%s'",
 				 path);
-		return WIMLIB_ERR_OPEN;
+		return WIMLIB_ERR_OPENDIR;
 	}
 
 	/* Recurse on directory contents */
@@ -133,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) {
@@ -147,7 +156,7 @@ unix_capture_symlink(struct wim_dentry **root_p,
 		dest[deref_name_len] = '\0';
 		DEBUG("Read symlink `%s'", dest);
 
-		if ((params->add_image_flags & WIMLIB_ADD_IMAGE_FLAG_RPFIX) &&
+		if ((params->add_flags & WIMLIB_ADD_FLAG_RPFIX) &&
 		     dest[0] == '/')
 		{
 			dest = capture_fixup_absolute_symlink(dest,
@@ -196,7 +205,7 @@ unix_build_dentry_tree_recursive(struct wim_dentry **root_ret,
 	struct wim_inode *inode;
 
 	if (exclude_path(path, path_len, params->config, true)) {
-		if ((params->add_image_flags & WIMLIB_ADD_IMAGE_FLAG_EXCLUDE_VERBOSE)
+		if ((params->add_flags & WIMLIB_ADD_FLAG_EXCLUDE_VERBOSE)
 		    && params->progress_func)
 		{
 			union wimlib_progress_info info;
@@ -207,7 +216,7 @@ unix_build_dentry_tree_recursive(struct wim_dentry **root_ret,
 		goto out;
 	}
 
-	if ((params->add_image_flags & WIMLIB_ADD_IMAGE_FLAG_VERBOSE)
+	if ((params->add_flags & WIMLIB_ADD_FLAG_VERBOSE)
 	    && params->progress_func)
 	{
 		union wimlib_progress_info info;
@@ -218,15 +227,16 @@ unix_build_dentry_tree_recursive(struct wim_dentry **root_ret,
 
 	struct stat stbuf;
 	int (*stat_fn)(const char *restrict, struct stat *restrict);
-	if ((params->add_image_flags & WIMLIB_ADD_IMAGE_FLAG_DEREFERENCE) ||
-	    (params->add_image_flags & WIMLIB_ADD_IMAGE_FLAG_ROOT))
+	if ((params->add_flags & WIMLIB_ADD_FLAG_DEREFERENCE) ||
+	    (params->add_flags & WIMLIB_ADD_FLAG_ROOT))
 		stat_fn = stat;
 	else
 		stat_fn = lstat;
 
 	ret = (*stat_fn)(path, &stbuf);
-	if (ret != 0) {
+	if (ret) {
 		ERROR_WITH_ERRNO("Failed to stat `%s'", path);
+		ret = WIMLIB_ERR_STAT;
 		goto out;
 	}
 	if (!S_ISREG(stbuf.st_mode) && !S_ISDIR(stbuf.st_mode)
@@ -237,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(&params->inode_table,
 				     path_basename_with_len(path, path_len),
 				     stbuf.st_ino, stbuf.st_dev, false, &root);
 	if (ret)
@@ -258,7 +268,7 @@ unix_build_dentry_tree_recursive(struct wim_dentry **root_ret,
 	inode->i_last_access_time = unix_timestamp_to_wim(stbuf.st_atime);
 #endif
 	inode->i_resolved = 1;
-	if (params->add_image_flags & WIMLIB_ADD_IMAGE_FLAG_UNIX_DATA) {
+	if (params->add_flags & WIMLIB_ADD_FLAG_UNIX_DATA) {
 		ret = inode_set_unix_data(inode, stbuf.st_uid,
 					  stbuf.st_gid,
 					  stbuf.st_mode,
@@ -267,7 +277,7 @@ unix_build_dentry_tree_recursive(struct wim_dentry **root_ret,
 		if (ret)
 			goto out;
 	}
-	params->add_image_flags &= ~WIMLIB_ADD_IMAGE_FLAG_ROOT;
+	params->add_flags &= ~WIMLIB_ADD_FLAG_ROOT;
 	if (S_ISREG(stbuf.st_mode))
 		ret = unix_capture_regular_file(path, stbuf.st_size,
 						inode, params->lookup_table);
@@ -320,7 +330,7 @@ unix_build_dentry_tree(struct wim_dentry **root_ret,
 			return WIMLIB_ERR_STAT;
 		}
 
-		if ((params->add_image_flags & WIMLIB_ADD_IMAGE_FLAG_ROOT) &&
+		if ((params->add_flags & WIMLIB_ADD_FLAG_ROOT) &&
 		    !S_ISDIR(root_stbuf.st_mode))
 		{
 			ERROR("Root of capture \"%s\" is not a directory",