X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fwin32_capture.c;h=6f29828c842a95d70e7aea9a0df66cd7a06a3375;hp=8004f417d3c9e4a951cf4d25b47a82c2f32df45c;hb=1562bea589e9ef4039a04223bc9059f349316e3d;hpb=1fc939b7bd0b37900d974b1cd5b11df128df71f5

diff --git a/src/win32_capture.c b/src/win32_capture.c
index 8004f417..6f29828c 100644
--- a/src/win32_capture.c
+++ b/src/win32_capture.c
@@ -110,6 +110,9 @@ win32_encrypted_export_cb(unsigned char *data, void *_ctx, unsigned long len)
 	int ret;
 	size_t bytes_to_consume = min(len, ctx->bytes_remaining);
 
+	if (bytes_to_consume == 0)
+		return ERROR_SUCCESS;
+
 	ret = (*ctx->read_prefix_cb)(data, bytes_to_consume, ctx->read_prefix_ctx);
 	if (ret) {
 		ctx->wimlib_err_code = ret;
@@ -618,7 +621,7 @@ win32_capture_maybe_rpfix_target(wchar_t *target, u16 *target_nbytes_p,
 static int
 win32_capture_try_rpfix(u8 *rpbuf, u16 *rpbuflen_p,
 			u64 capture_root_ino, u64 capture_root_dev,
-			const wchar_t *path)
+			const wchar_t *path, struct add_image_params *params)
 {
 	struct reparse_data rpdata;
 	int ret;
@@ -655,17 +658,18 @@ win32_capture_try_rpfix(u8 *rpbuf, u16 *rpbuflen_p,
 			ret = -ret;
 	} else {
 		if (rp_status == RP_EXCLUDED) {
+			/* Ignoring absolute symbolic link or junction point
+			 * that points out of the tree to be captured.  */
 			size_t print_name_nchars = rpdata.print_name_nbytes / 2;
 			wchar_t print_name0[print_name_nchars + 1];
 			print_name0[print_name_nchars] = L'\0';
 			wmemcpy(print_name0, rpdata.print_name, print_name_nchars);
-			WARNING("Ignoring %ls pointing out of capture directory:\n"
-				"          \"%ls\" -> \"%ls\"\n"
-				"          (Use --norpfix to capture all symbolic links "
-				"and junction points as-is)",
-				(rpdata.rptag == WIM_IO_REPARSE_TAG_SYMLINK) ?
-					L"absolute symbolic link" : L"junction point",
-				path, print_name0);
+
+			params->progress.scan.cur_path = path;
+			params->progress.scan.symlink_target = print_name0;
+			do_capture_progress(params,
+					    WIMLIB_SCAN_DENTRY_EXCLUDED_SYMLINK,
+					    NULL);
 		}
 		ret = rp_status;
 	}
@@ -734,7 +738,8 @@ win32_get_reparse_data(HANDLE hFile, const wchar_t *path,
 					      &rpbuflen,
 					      params->capture_root_ino,
 					      params->capture_root_dev,
-					      path);
+					      path,
+					      params);
 	} else {
 		ret = RP_NOT_FIXED;
 	}
@@ -1199,7 +1204,7 @@ again:
 			not_rpfixed = 0;
 		} else if (ret == RP_EXCLUDED) {
 			ret = 0;
-			goto out_progress;
+			goto out;
 		} else {
 			not_rpfixed = 1;
 		}
@@ -1355,7 +1360,6 @@ win32_build_dentry_tree(struct wim_dentry **root_ret,
 	struct win32_capture_state state;
 	unsigned vol_flags;
 	DWORD dret;
-	bool need_prefix_free = false;
 
 	if (!win32func_FindFirstStreamW
 #ifdef WITH_NTDLL
@@ -1384,8 +1388,8 @@ win32_build_dentry_tree(struct wim_dentry **root_ret,
 	/* 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
 	 * by Windows NT (which is NOT the same as MAX_PATH). */
-	path = MALLOC(WINDOWS_NT_MAX_PATH * sizeof(wchar_t));
-	if (!path)
+	path = MALLOC((WINDOWS_NT_MAX_PATH + 1) * sizeof(wchar_t));
+	if (path == NULL)
 		return WIMLIB_ERR_NOMEM;
 
 	/* Work around defective behavior in Windows where paths longer than 260
@@ -1393,37 +1397,45 @@ win32_build_dentry_tree(struct wim_dentry **root_ret,
 	 * turned into absolute paths and prefixed with "\\?\".  */
 
 	if (wcsncmp(root_disk_path, L"\\\\?\\", 4)) {
-		dret = GetFullPathName(root_disk_path, WINDOWS_NT_MAX_PATH - 4,
+		dret = GetFullPathName(root_disk_path, WINDOWS_NT_MAX_PATH - 3,
 				       &path[4], NULL);
 
-		if (dret == 0 || dret >= WINDOWS_NT_MAX_PATH - 4) {
+		if (dret == 0 || dret >= WINDOWS_NT_MAX_PATH - 3) {
 			WARNING("Can't get full path name for \"%ls\"", root_disk_path);
 			wmemcpy(path, root_disk_path, path_nchars + 1);
 		} else {
 			wmemcpy(path, L"\\\\?\\", 4);
 			path_nchars = 4 + dret;
-			/* Update pattern prefix */
-			if (params->config != NULL)
-			{
-				params->config->_prefix = TSTRDUP(path);
-				params->config->_prefix_num_tchars = path_nchars;
-				if (params->config->_prefix == NULL)
-				{
-					ret = WIMLIB_ERR_NOMEM;
-					goto out_free_path;
-				}
-				need_prefix_free = true;
-			}
 		}
 	} else {
 		wmemcpy(path, root_disk_path, path_nchars + 1);
 	}
 
+	/* Strip trailing slashes.  */
+	while (path_nchars >= 2 &&
+	       is_any_path_separator(path[path_nchars - 1]) &&
+	       path[path_nchars - 2] != L':')
+	{
+		path[--path_nchars] = L'\0';
+	}
+
+	/* Update pattern prefix.  */
+	if (params->config != NULL)
+	{
+		params->config->_prefix = TSTRDUP(path);
+		params->config->_prefix_num_tchars = path_nchars;
+		if (params->config->_prefix == NULL)
+		{
+			ret = WIMLIB_ERR_NOMEM;
+			goto out_free_path;
+		}
+	}
+
 	memset(&state, 0, sizeof(state));
 	ret = win32_build_dentry_tree_recursive(root_ret, path,
 						path_nchars, params,
 						&state, vol_flags);
-	if (need_prefix_free)
+	if (params->config != NULL)
 		FREE(params->config->_prefix);
 out_free_path:
 	FREE(path);