X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Funix_capture.c;h=a61d91f25f61fdc5f2cf6b924f0db2a9e60c37da;hb=3de1ec66f778edda19865482d685bc6f4e17faf7;hp=a72d3ad3fc8f033ab5910aeb4bf80ec495451be2;hpb=27b30056e4520e9b5b9d0846f438311746345f83;p=wimlib

diff --git a/src/unix_capture.c b/src/unix_capture.c
index a72d3ad3..a61d91f2 100644
--- a/src/unix_capture.c
+++ b/src/unix_capture.c
@@ -5,20 +5,18 @@
 /*
  * Copyright (C) 2012, 2013, 2014 Eric Biggers
  *
- * This file is part of wimlib, a library for working with WIM files.
+ * 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
+ * Software Foundation; either version 3 of the License, or (at your option) any
+ * later version.
  *
- * wimlib is free software; you can redistribute it and/or modify it under the
- * terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 3 of the License, or (at your option)
- * any later version.
- *
- * wimlib is distributed in the hope that it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * This file is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
  * details.
  *
- * You should have received a copy of the GNU General Public License
- * along with wimlib; if not, see http://www.gnu.org/licenses/.
+ * 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/.
  */
 
 #ifndef __WIN32__
@@ -34,10 +32,10 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
+#include "wimlib/blob_table.h"
 #include "wimlib/capture.h"
 #include "wimlib/dentry.h"
 #include "wimlib/error.h"
-#include "wimlib/lookup_table.h"
 #include "wimlib/reparse.h"
 #include "wimlib/timestamp.h"
 #include "wimlib/unix_data.h"
@@ -103,30 +101,36 @@ my_fdopendir(int *dirfd_p)
 
 static int
 unix_scan_regular_file(const char *path, u64 size, struct wim_inode *inode,
-		       struct list_head *unhashed_streams)
+		       struct list_head *unhashed_blobs)
 {
-	struct wim_lookup_table_entry *lte;
-	char *file_on_disk;
+	struct blob_descriptor *blob;
+	struct wim_inode_stream *strm;
 
 	inode->i_attributes = FILE_ATTRIBUTE_NORMAL;
 
-	/* Empty files do not have to have a lookup table entry. */
-	if (!size)
-		return 0;
+	if (size) {
+		char *file_on_disk = STRDUP(path);
+		if (!file_on_disk)
+			return WIMLIB_ERR_NOMEM;
+		blob = new_blob_descriptor();
+		if (!blob) {
+			FREE(file_on_disk);
+			return WIMLIB_ERR_NOMEM;
+		}
+		blob->file_on_disk = file_on_disk;
+		blob->file_inode = inode;
+		blob->blob_location = BLOB_IN_FILE_ON_DISK;
+		blob->size = size;
+	} else {
+		blob = NULL;
+	}
 
-	file_on_disk = STRDUP(path);
-	if (!file_on_disk)
-		return WIMLIB_ERR_NOMEM;
-	lte = new_lookup_table_entry();
-	if (!lte) {
-		FREE(file_on_disk);
+	strm = inode_add_stream(inode, STREAM_TYPE_DATA, NO_STREAM_NAME, blob);
+	if (!strm) {
+		free_blob_descriptor(blob);
 		return WIMLIB_ERR_NOMEM;
 	}
-	lte->file_on_disk = file_on_disk;
-	lte->resource_location = RESOURCE_IN_FILE_ON_DISK;
-	lte->size = size;
-	add_unhashed_stream(lte, inode, 0, unhashed_streams);
-	inode->i_lte = lte;
+	prepare_unhashed_blob(blob, inode, strm->stream_id, unhashed_blobs);
 	return 0;
 }
 
@@ -134,13 +138,13 @@ static int
 unix_build_dentry_tree_recursive(struct wim_dentry **tree_ret,
 				 char *path, size_t path_len,
 				 int dirfd, const char *relpath,
-				 struct add_image_params *params);
+				 struct capture_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 add_image_params *params)
+		    struct capture_params *params)
 {
 
 	int dirfd;
@@ -251,9 +255,8 @@ unix_fixup_abslink(char *dest, u64 ino, u64 dev)
 }
 
 static int
-unix_scan_symlink(struct wim_dentry **root_p, const char *full_path,
-		  int dirfd, const char *relpath,
-		  struct wim_inode *inode, struct add_image_params *params)
+unix_scan_symlink(const char *full_path, int dirfd, const char *relpath,
+		  struct wim_inode *inode, struct capture_params *params)
 {
 	char deref_name_buf[4096];
 	ssize_t deref_name_len;
@@ -281,24 +284,35 @@ unix_scan_symlink(struct wim_dentry **root_p, const char *full_path,
 	if ((params->add_flags & WIMLIB_ADD_FLAG_RPFIX) &&
 	     dest[0] == '/')
 	{
-		dest = unix_fixup_abslink(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.  */
-			free_dentry(*root_p);
-			*root_p = NULL;
-			params->progress.scan.cur_path = full_path;
-			params->progress.scan.symlink_target = deref_name_buf;
-			return do_capture_progress(params,
-						   WIMLIB_SCAN_DENTRY_EXCLUDED_SYMLINK,
-						   NULL);
+		char *fixed_dest;
+
+		/* RPFIX (reparse point fixup) mode:  Change target of absolute
+		 * symbolic link to be "absolute" relative to the tree being
+		 * captured.  */
+		fixed_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 (fixed_dest) {
+			/* Link points inside the tree being captured, so it was
+			 * fixed.  */
+			inode->i_not_rpfixed = 0;
+			dest = fixed_dest;
+			ret = do_capture_progress(params,
+						  WIMLIB_SCAN_DENTRY_FIXED_SYMLINK,
+						  NULL);
+		} else {
+			/* Link points outside the tree being captured, so it
+			 * was not fixed.  */
+			ret = do_capture_progress(params,
+						  WIMLIB_SCAN_DENTRY_NOT_FIXED_SYMLINK,
+						  NULL);
 		}
-		inode->i_not_rpfixed = 0;
+		if (ret)
+			return ret;
 	}
-	ret = wim_inode_set_symlink(inode, dest, params->lookup_table);
+	ret = wim_inode_set_symlink(inode, dest, params->blob_table);
 	if (ret)
 		return ret;
 
@@ -317,7 +331,7 @@ 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 add_image_params *params)
+				 struct capture_params *params)
 {
 	struct wim_dentry *tree = NULL;
 	struct wim_inode *inode = NULL;
@@ -325,13 +339,11 @@ unix_build_dentry_tree_recursive(struct wim_dentry **tree_ret,
 	struct stat stbuf;
 	int stat_flags;
 
-	if (should_exclude_path(full_path + params->capture_root_nchars,
-				full_path_len - params->capture_root_nchars,
-				params->config))
-	{
-		ret = 0;
+	ret = try_exclude(full_path, full_path_len, params);
+	if (ret < 0) /* Excluded? */
 		goto out_progress;
-	}
+	if (ret > 0) /* Error? */
+		goto out;
 
 	if (params->add_flags & (WIMLIB_ADD_FLAG_DEREFERENCE |
 				 WIMLIB_ADD_FLAG_ROOT))
@@ -347,19 +359,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;
-		ret = do_capture_progress(params, WIMLIB_SCAN_DENTRY_UNSUPPORTED, NULL);
-		goto out;
 	}
 
 	ret = inode_table_new_dentry(params->inode_table, relpath,
@@ -370,26 +388,27 @@ 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);
-	inode->i_last_write_time = timespec_to_wim_timestamp(stbuf.st_mtim);
-	inode->i_last_access_time = timespec_to_wim_timestamp(stbuf.st_atim);
+	inode->i_creation_time = timespec_to_wim_timestamp(&stbuf.st_mtim);
+	inode->i_last_write_time = timespec_to_wim_timestamp(&stbuf.st_mtim);
+	inode->i_last_access_time = timespec_to_wim_timestamp(&stbuf.st_atim);
 #else
-	inode->i_creation_time = unix_timestamp_to_wim(stbuf.st_mtime);
-	inode->i_last_write_time = unix_timestamp_to_wim(stbuf.st_mtime);
-	inode->i_last_access_time = unix_timestamp_to_wim(stbuf.st_atime);
+	inode->i_creation_time = time_t_to_wim_timestamp(stbuf.st_mtime);
+	inode->i_last_write_time = time_t_to_wim_timestamp(stbuf.st_mtime);
+	inode->i_last_access_time = time_t_to_wim_timestamp(stbuf.st_atime);
 #endif
-	inode->i_resolved = 1;
 	if (params->add_flags & WIMLIB_ADD_FLAG_UNIX_DATA) {
-		if (!inode_set_unix_data(inode, stbuf.st_uid, stbuf.st_gid,
-					 stbuf.st_mode, UNIX_DATA_ALL))
-		{
+		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;
 		}
@@ -403,15 +422,13 @@ unix_build_dentry_tree_recursive(struct wim_dentry **tree_ret,
 
 	if (S_ISREG(stbuf.st_mode)) {
 		ret = unix_scan_regular_file(full_path, stbuf.st_size,
-					     inode, params->unhashed_streams);
+					     inode, params->unhashed_blobs);
 	} else if (S_ISDIR(stbuf.st_mode)) {
 		ret = unix_scan_directory(tree, full_path, full_path_len,
 					  dirfd, relpath, params);
-	} else {
-		ret = unix_scan_symlink(&tree, full_path, dirfd, relpath,
+	} else if (S_ISLNK(stbuf.st_mode)) {
+		ret = unix_scan_symlink(full_path, dirfd, relpath,
 					inode, params);
-		if (!tree)
-			goto out;
 	}
 
 	if (ret)
@@ -424,10 +441,12 @@ out_progress:
 	else
 		ret = do_capture_progress(params, WIMLIB_SCAN_DENTRY_EXCLUDED, NULL);
 out:
-	if (likely(ret == 0))
-		*tree_ret = tree;
-	else
-		free_dentry_tree(tree, params->lookup_table);
+	if (unlikely(ret)) {
+		free_dentry_tree(tree, params->blob_table);
+		tree = NULL;
+		ret = report_capture_error(params, ret, full_path);
+	}
+	*tree_ret = tree;
 	return ret;
 }
 
@@ -442,7 +461,7 @@ out:
  *
  * @root_disk_path:  The path to the root of the directory tree on disk.
  *
- * @params:     See doc for `struct add_image_params'.
+ * @params:     See doc for `struct capture_params'.
  *
  * @return:	0 on success, nonzero on failure.  It is a failure if any of
  *		the files cannot be `stat'ed, or if any of the needed
@@ -454,7 +473,7 @@ out:
 int
 unix_build_dentry_tree(struct wim_dentry **root_ret,
 		       const char *root_disk_path,
-		       struct add_image_params *params)
+		       struct capture_params *params)
 {
 	size_t path_len;
 	size_t path_bufsz;