read_utf8_file_contents(): Move check for BOM here

[wimlib] / src / capture_common.c

diff --git a/src/capture_common.c b/src/capture_common.c
index 66f6411fdaa1fadc4189b8d02fcd8d0c16fdc62f..ffdc7a88dfd202f6b285c95d5d4948ab0fe9570a 100644 (file)
--- a/src/capture_common.c
+++ b/src/capture_common.c
@@ -31,15 +31,10 @@
 #include "wimlib/error.h"
 #include "wimlib/lookup_table.h"
 #include "wimlib/paths.h"
+#include "wimlib/wildcard.h"
 
-#ifdef __WIN32__
-#  include "wimlib/win32.h" /* for fnmatch() equivalent */
-#else
-#  include <fnmatch.h>
-#endif
 #include <string.h>
 
-
 static int
 canonicalize_pattern(const tchar *pat, tchar **canonical_pat_ret)
 {
@@ -194,6 +189,7 @@ do_capture_progress(struct add_image_params *params, int status,
                        return;
        case WIMLIB_SCAN_DENTRY_UNSUPPORTED:
        case WIMLIB_SCAN_DENTRY_EXCLUDED:
+       case WIMLIB_SCAN_DENTRY_EXCLUDED_SYMLINK:
                if (!(params->add_flags & WIMLIB_ADD_FLAG_EXCLUDE_VERBOSE))
                        return;
        }