X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fwin32_capture.c;h=e818eebc59c0253129d0d0a9d21f5312dc278be0;hp=4bccfa1412f6c4902f8551f4cc0e5f806db754fa;hb=acabf4f97fdf439d6f95ff7af1fa952e91fa483b;hpb=db5f5eee38b76db7f19367d0f4225b36f001325a

diff --git a/src/win32_capture.c b/src/win32_capture.c
index 4bccfa14..e818eebc 100644
--- a/src/win32_capture.c
+++ b/src/win32_capture.c
@@ -224,7 +224,7 @@ read_win32_encrypted_file_prefix(const struct wim_lookup_table_entry *lte,
 			ret = WIMLIB_ERR_READ;
 	} else if (export_ctx.bytes_remaining != 0) {
 		ERROR("Only could read %"PRIu64" of %"PRIu64" bytes from "
-		      "encryted file \"%ls\"",
+		      "encrypted file \"%ls\"",
 		      size - export_ctx.bytes_remaining, size,
 		      printable_path(lte->file_on_disk));
 		ret = WIMLIB_ERR_READ;
@@ -594,8 +594,7 @@ out_close_root_dir:
 
 static int
 winnt_rpfix_progress(struct add_image_params *params, const wchar_t *path,
-		     const struct reparse_data *rpdata,
-		     enum wimlib_progress_msg msg)
+		     const struct reparse_data *rpdata, int scan_status)
 {
 	size_t print_name_nchars = rpdata->print_name_nbytes / sizeof(wchar_t);
 	wchar_t print_name0[print_name_nchars + 1];
@@ -605,7 +604,7 @@ winnt_rpfix_progress(struct add_image_params *params, const wchar_t *path,
 
 	params->progress.scan.cur_path = printable_path(path);
 	params->progress.scan.symlink_target = print_name0;
-	return do_capture_progress(params, msg, NULL);
+	return do_capture_progress(params, scan_status, NULL);
 }
 
 static int
@@ -670,7 +669,7 @@ winnt_try_rpfix(u8 *rpbuf, u16 *rpbuflen_p,
 	}
 
 	/* We have an absolute target pointing within the directory being
-	 * captured, @rel_target is the suffix of the link target that is the
+	 * captured. @rel_target is the suffix of the link target that is the
 	 * part relative to the directory being captured.
 	 *
 	 * We will cut off the prefix before this part (which is the path to the
@@ -888,6 +887,9 @@ winnt_scan_stream(const wchar_t *path, size_t path_nchars,
 							sizeof(wchar_t));
 		if (!ads_entry)
 			return WIMLIB_ERR_NOMEM;
+	} else if (inode->i_attributes & FILE_ATTRIBUTE_REPARSE_POINT) {
+		/* Ignore unnamed data stream of reparse point  */
+		return 0;
 	} else {
 		ads_entry = NULL;
 	}
@@ -1094,10 +1096,11 @@ winnt_build_dentry_tree_recursive(struct wim_dentry **root_ret,
 	u16 rpbuflen;
 	u16 not_rpfixed;
 
-	if (should_exclude_path(full_path + params->capture_root_nchars,
-				full_path_nchars - params->capture_root_nchars,
-				params->config))
+	ret = try_exclude(full_path, full_path_nchars, params);
+	if (ret < 0) /* Excluded? */
 		goto out_progress;
+	if (ret > 0) /* Error? */
+		goto out;
 
 	/* Open the file.  */
 	status = winnt_openat(cur_dir,
@@ -1119,7 +1122,10 @@ winnt_build_dentry_tree_recursive(struct wim_dentry **root_ret,
 			ERROR_WITH_ERRNO("\"%ls\": Can't open file "
 					 "(status=0x%08"PRIx32")",
 					 printable_path(full_path), (u32)status);
-			ret = WIMLIB_ERR_OPEN;
+			if (status == STATUS_FVE_LOCKED_VOLUME)
+				ret = WIMLIB_ERR_FVE_LOCKED_VOLUME;
+			else
+				ret = WIMLIB_ERR_OPEN;
 		}
 		/* XXX: Provide option to exclude files that fail with
 		 * STATUS_SHARING_VIOLATION?  */
@@ -1230,13 +1236,17 @@ winnt_build_dentry_tree_recursive(struct wim_dentry **root_ret,
 	 * However, we need to explicitly check for directories and files with
 	 * only 1 link and refuse to hard link them.  This is because Windows
 	 * has a bug where it can return duplicate File IDs for files and
-	 * directories on the FAT filesystem. */
+	 * directories on the FAT filesystem.
+	 *
+	 * Since we don't follow mount points on Windows, we don't need to query
+	 * the volume ID per-file.  Just once, for the root, is enough.  But we
+	 * can't simply pass 0, because then there could be inode collisions
+	 * among multiple calls to win32_build_dentry_tree() that are scanning
+	 * files on different volumes.  */
 	ret = inode_table_new_dentry(params->inode_table,
 				     filename,
 				     file_info.InternalInformation.IndexNumber.QuadPart,
-				     0, /* We don't follow mount points, so we
-					   currently don't need to get the
-					   volume ID / device number.  */
+				     params->capture_root_dev,
 				     (file_info.StandardInformation.NumberOfLinks <= 1 ||
 				        (file_info.BasicInformation.FileAttributes &
 					 FILE_ATTRIBUTE_DIRECTORY)),
@@ -1281,7 +1291,7 @@ winnt_build_dentry_tree_recursive(struct wim_dentry **root_ret,
 		if (!NT_SUCCESS(status)) {
 			set_errno_from_nt_status(status);
 			ERROR_WITH_ERRNO("\"%ls\": Can't read security "
-					 "descriptor (status=0x%08"PRIu32")",
+					 "descriptor (status=0x%08"PRIx32")",
 					 printable_path(full_path),
 					 (u32)status);
 			ret = WIMLIB_ERR_STAT;
@@ -1396,6 +1406,7 @@ win32_build_dentry_tree(struct wim_dentry **root_ret,
 	int ret;
 	UNICODE_STRING ntpath;
 	struct winnt_scan_stats stats;
+	size_t ntpath_nchars;
 
 	/* WARNING: There is no check for overflow later when this buffer is
 	 * being used!  But it's as long as the maximum path length understood
@@ -1414,19 +1425,24 @@ win32_build_dentry_tree(struct wim_dentry **root_ret,
 	{
 		ERROR("\"%ls\": unrecognized path format", root_disk_path);
 		ret = WIMLIB_ERR_INVALID_PARAM;
-		goto out_free_path;
-	}
-
-	params->capture_root_nchars = ntpath.Length / sizeof(wchar_t);
-	wmemcpy(path, ntpath.Buffer, params->capture_root_nchars);
-	path[params->capture_root_nchars] = L'\0';
+	} else {
+		ntpath_nchars = ntpath.Length / sizeof(wchar_t);
+		wmemcpy(path, ntpath.Buffer, ntpath_nchars);
+		path[ntpath_nchars] = L'\0';
 
+		params->capture_root_nchars = ntpath_nchars;
+		if (path[ntpath_nchars - 1] == L'\\')
+			params->capture_root_nchars--;
+		ret = 0;
+	}
 	HeapFree(GetProcessHeap(), 0, ntpath.Buffer);
+	if (ret)
+		goto out_free_path;
 
 	memset(&stats, 0, sizeof(stats));
 
 	ret = winnt_build_dentry_tree_recursive(root_ret, NULL,
-						path, params->capture_root_nchars,
+						path, ntpath_nchars,
 						L"", 0, params, &stats, 0);
 out_free_path:
 	FREE(path);