X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fcapture_common.c;h=967d58eb53efc7987dbf84278a2f6c3b9b24929f;hp=0a6ba44d2b98ea7f3c3a1be58e5b9ee889c97dc7;hb=67b6e421c8018a894f38eee258dbc03510137254;hpb=ebe0206c700963ee0ace86cc55fca6570b03cac3

diff --git a/src/capture_common.c b/src/capture_common.c
index 0a6ba44d..967d58eb 100644
--- a/src/capture_common.c
+++ b/src/capture_common.c
@@ -43,18 +43,18 @@ canonicalize_pattern(const tchar *pat, tchar **canonical_pat_ret)
 {
 	tchar *canonical_pat;
 
-	if (pat[0] != T('/') && pat[0] != T('\\') &&
+	if (!is_any_path_separator(pat[0]) &&
 	    pat[0] != T('\0') && pat[1] == T(':'))
 	{
 		/* Pattern begins with drive letter */
-		if (pat[2] != T('/') && pat[2] != T('\\')) {
+		if (!is_any_path_separator(pat[2])) {
 			/* Something like c:file, which is actually a path
 			 * relative to the current working directory on the c:
 			 * drive.  We require paths with drive letters to be
 			 * absolute. */
 			ERROR("Invalid path \"%"TS"\"; paths including drive letters "
 			      "must be absolute!", pat);
-			ERROR("Maybe try \"%"TC":/%"TS"\"?",
+			ERROR("Maybe try \"%"TC":\\%"TS"\"?",
 			      pat[0], pat + 2);
 			return WIMLIB_ERR_INVALID_CAPTURE_CONFIG;
 		}
@@ -67,7 +67,12 @@ canonicalize_pattern(const tchar *pat, tchar **canonical_pat_ret)
 	canonical_pat = canonicalize_fs_path(pat);
 	if (!canonical_pat)
 		return WIMLIB_ERR_NOMEM;
-	zap_backslashes(canonical_pat);
+
+	/* Translate all possible path separators into the operating system's
+	 * preferred path separator. */
+	for (tchar *p = canonical_pat; *p; p++)
+		if (is_any_path_separator(*p))
+			*p = OS_PREFERRED_PATH_SEPARATOR;
 	*canonical_pat_ret = canonical_pat;
 	return 0;
 }
@@ -146,11 +151,11 @@ match_pattern(const tchar *path,
 		const tchar *pat = list->pats[i];
 		const tchar *string;
 
-		if (*pat == T('/')) {
+		if (*pat == OS_PREFERRED_PATH_SEPARATOR) {
 			/* Absolute path from root of capture */
 			string = path;
 		} else {
-			if (tstrchr(pat, T('/')))
+			if (tstrchr(pat, OS_PREFERRED_PATH_SEPARATOR))
 				/* Relative path from root of capture */
 				string = path + 1;
 			else
@@ -177,6 +182,25 @@ match_pattern(const tchar *path,
 	return false;
 }
 
+void
+do_capture_progress(struct add_image_params *params, int status)
+{
+	switch (status) {
+	case WIMLIB_SCAN_DENTRY_OK:
+		if (!(params->add_flags & WIMLIB_ADD_FLAG_VERBOSE))
+			return;
+	case WIMLIB_SCAN_DENTRY_UNSUPPORTED:
+	case WIMLIB_SCAN_DENTRY_EXCLUDED:
+		if (!(params->add_flags & WIMLIB_ADD_FLAG_EXCLUDE_VERBOSE))
+			return;
+	}
+	params->progress.scan.status = status;
+	if (params->progress_func) {
+		params->progress_func(WIMLIB_PROGRESS_MSG_SCAN_DENTRY,
+				      &params->progress);
+	}
+}
+
 /* Return true if the image capture configuration file indicates we should
  * exclude the filename @path from capture.
  *
@@ -196,7 +220,7 @@ exclude_path(const tchar *path, size_t path_len,
 	if (exclude_prefix) {
 		wimlib_assert(path_len >= config->_prefix_num_tchars);
 		if (!tmemcmp(config->_prefix, path, config->_prefix_num_tchars) &&
-		    path[config->_prefix_num_tchars] == T('/'))
+		    path[config->_prefix_num_tchars] == OS_PREFERRED_PATH_SEPARATOR)
 		{
 			path += config->_prefix_num_tchars;
 		}