X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fcapture_common.c;h=caf9529c3b70b5b85f7313ab867241010f289984;hb=acabf4f97fdf439d6f95ff7af1fa952e91fa483b;hp=be7c8983d0f443a3d48f954f72ded06f2a8b3d1b;hpb=daf72364fc96380cdc0d8ceeeda640d82930f1b9;p=wimlib

diff --git a/src/capture_common.c b/src/capture_common.c
index be7c8983..caf9529c 100644
--- a/src/capture_common.c
+++ b/src/capture_common.c
@@ -44,8 +44,7 @@
  *	Flags, optional progress function, and progress data for the capture
  *	operation.
  * @status
- *	Status of the scanned file (ok, unsupported, excluded, or excluded
- *	symlink).
+ *	Status of the scanned file.
  * @inode
  *	If @status is WIMLIB_SCAN_DENTRY_OK, this is a pointer to the WIM inode
  *	that has been created for the scanned file.  The first time the file is
@@ -60,12 +59,14 @@ do_capture_progress(struct add_image_params *params, int status,
 	case WIMLIB_SCAN_DENTRY_OK:
 		if (!(params->add_flags & WIMLIB_ADD_FLAG_VERBOSE))
 			return 0;
+		break;
 	case WIMLIB_SCAN_DENTRY_UNSUPPORTED:
 	case WIMLIB_SCAN_DENTRY_EXCLUDED:
-	case WIMLIB_SCAN_DENTRY_EXCLUDED_SYMLINK:
 	case WIMLIB_SCAN_DENTRY_FIXED_SYMLINK:
+	case WIMLIB_SCAN_DENTRY_NOT_FIXED_SYMLINK:
 		if (!(params->add_flags & WIMLIB_ADD_FLAG_EXCLUDE_VERBOSE))
 			return 0;
+		break;
 	}
 	params->progress.scan.status = status;
 	if (status == WIMLIB_SCAN_DENTRY_OK && inode->i_nlink == 1) {
@@ -177,8 +178,15 @@ read_capture_config(const tchar *config_file, const void *buf,
 
 	/* [PrepopulateList] is used for apply, not capture.  But since we do
 	 * understand it, recognize it, thereby avoiding the unrecognized
-	 * section warning, but discard the resulting strings.  */
+	 * section warning, but discard the resulting strings.
+	 *
+	 * We currently ignore [CompressionExclusionList] and
+	 * [CompressionFolderList].  This is a known issue that doesn't seem to
+	 * have any real consequences, so don't issue warnings about not
+	 * recognizing those sections.  */
 	STRING_SET(prepopulate_pats);
+	STRING_SET(compression_exclusion_pats);
+	STRING_SET(compression_folder_pats);
 
 	struct text_file_section sections[] = {
 		{T("ExclusionList"),
@@ -187,6 +195,10 @@ read_capture_config(const tchar *config_file, const void *buf,
 			&config->exclusion_exception_pats},
 		{T("PrepopulateList"),
 			&prepopulate_pats},
+		{T("CompressionExclusionList"),
+			&compression_exclusion_pats},
+		{T("CompressionFolderList"),
+			&compression_folder_pats},
 	};
 	void *mem;
 
@@ -197,6 +209,8 @@ read_capture_config(const tchar *config_file, const void *buf,
 		return ret;
 
 	FREE(prepopulate_pats.strings);
+	FREE(compression_exclusion_pats.strings);
+	FREE(compression_folder_pats.strings);
 
 	config->buf = mem;
 	return 0;
@@ -241,7 +255,7 @@ match_pattern_list(const tchar *path, size_t path_nchars,
  * As a special case, the empty string will be interpreted as a single path
  * separator (which means the root of capture itself).
  */
-bool
+static bool
 should_exclude_path(const tchar *path, size_t path_nchars,
 		    const struct capture_config *config)
 {
@@ -261,3 +275,71 @@ should_exclude_path(const tchar *path, size_t path_nchars,
 	      !match_pattern_list(path, path_nchars, &config->exclusion_exception_pats);
 
 }
+
+/*
+ * Determine if a file should be excluded from capture.
+ *
+ * This function tests exclusions from both of the two possible sources of
+ * exclusions:
+ *
+ *	(1) The capture configuration file
+ *	(2) The user-provided progress function
+ *
+ * The capture implementation must have set params->capture_root_nchars to an
+ * appropriate value.  Example for UNIX:  if the capture root directory is
+ * "foobar/subdir", then all paths will be provided starting with
+ * "foobar/subdir", so params->capture_root_nchars must be set to
+ * strlen("foobar/subdir") so that try_exclude() can use the appropriate suffix
+ * when it calls should_exclude_path().
+ *
+ *
+ * Returns:
+ *	< 0 if excluded
+ *	= 0 if not excluded and no error
+ *	> 0 (wimlib error code) if error
+ */
+int
+try_exclude(const tchar *full_path, size_t full_path_nchars,
+	    const struct add_image_params *params)
+{
+	int ret;
+
+	if (should_exclude_path(full_path + params->capture_root_nchars,
+				full_path_nchars - params->capture_root_nchars,
+				params->config))
+		return -1;
+
+	if (unlikely(params->add_flags & WIMLIB_ADD_FLAG_TEST_FILE_EXCLUSION)) {
+		union wimlib_progress_info info;
+
+		info.test_file_exclusion.path = full_path;
+		info.test_file_exclusion.will_exclude = false;
+
+	#ifdef __WIN32__
+		/* Hack for Windows...  */
+
+		wchar_t *p_question_mark = NULL;
+
+		if (!wcsncmp(full_path, L"\\??\\", 4)) {
+			/* Trivial transformation:  NT namespace => Win32 namespace  */
+			p_question_mark = (wchar_t *)&full_path[1];
+			*p_question_mark = L'\\';
+		}
+	#endif
+
+		ret = call_progress(params->progfunc, WIMLIB_PROGRESS_MSG_TEST_FILE_EXCLUSION,
+				    &info, params->progctx);
+
+	#ifdef __WIN32__
+		if (p_question_mark)
+			*p_question_mark = L'?';
+	#endif
+
+		if (ret)
+			return ret;
+		if (info.test_file_exclusion.will_exclude)
+			return -1;
+	}
+
+	return 0;
+}