Report directory tree scan errors

[wimlib] / include / wimlib / capture.h

diff --git a/include/wimlib/capture.h b/include/wimlib/capture.h
index 7ff82db233d4c2f4b0dba989c1a8955cbb71504f..b2938d510b6a59d622d8f6f8f0f7dba6cc44c3ef 100644 (file)
--- a/include/wimlib/capture.h
+++ b/include/wimlib/capture.h
@@ -4,13 +4,21 @@
 #include "wimlib.h"
 #include "wimlib/inode_table.h"
 #include "wimlib/list.h"
+#include "wimlib/progress.h"
 #include "wimlib/security.h"
+#include "wimlib/textfile.h"
 #include "wimlib/util.h"
 
 struct wim_lookup_table;
 struct wim_dentry;
 struct wim_inode;
 
+struct capture_config {
+       struct string_set exclusion_pats;
+       struct string_set exclusion_exception_pats;
+       void *buf;
+};
+
 /* Common parameters to implementations of building an in-memory dentry tree
  * from an on-disk directory structure. */
 struct add_image_params {
@@ -22,15 +30,14 @@ struct add_image_params {
        struct list_head *unhashed_streams;
 
        /* Hash table of inodes that have been captured for this tree so far. */
-       struct wim_inode_table inode_table;
+       struct wim_inode_table *inode_table;
 
        /* The set of security descriptors that have been captured for this
         * image so far. */
-       struct wim_sd_set sd_set;
+       struct wim_sd_set *sd_set;
 
-       /* Pointer to the capture configuration, which indicates whether any
-        * files should be excluded from capture or not. */
-       struct wimlib_capture_config *config;
+       /* Pointer to the capture configuration.  */
+       struct capture_config *config;
 
        /* Flags that affect the capture operation (WIMLIB_ADD_FLAG_*) */
        int add_flags;
@@ -39,38 +46,49 @@ struct add_image_params {
         * libntfs-3g capture.  */
        void *extra_arg;
 
-       u64 capture_root_ino;
-       u64 capture_root_dev;
-
        /* If non-NULL, the user-supplied progress function. */
-       wimlib_progress_func_t progress_func;
+       wimlib_progress_func_t progfunc;
+       void *progctx;
 
        /* Progress data.  */
        union wimlib_progress_info progress;
-};
 
+       /* The capture implementation must set this to the number of characters
+        * that try_exclude() will strip from the path before testing exclusion
+        * patterns from the capture configuration file.  */
+       size_t capture_root_nchars;
+
+       /* Can be used by the capture implementation.  */
+       u64 capture_root_ino;
+       u64 capture_root_dev;
+};
 
 /* capture_common.c */
 
-extern void
+extern int
 do_capture_progress(struct add_image_params *params, int status,
                    const struct wim_inode *inode);
 
-extern bool
-exclude_path(const tchar *path, size_t path_len,
-            const struct wimlib_capture_config *config,
-            bool exclude_prefix);
-
-extern struct wimlib_capture_config *
-copy_capture_config(const struct wimlib_capture_config *config);
+extern int
+mangle_pat(tchar *pat, const tchar *path, unsigned long line_no);
 
 extern int
-copy_and_canonicalize_capture_config(const struct wimlib_capture_config *config,
-                                    struct wimlib_capture_config **config_copy_ret);
+read_capture_config(const tchar *config_file, const void *buf,
+                   size_t bufsize, struct capture_config *config);
 
 extern void
-free_capture_config(struct wimlib_capture_config *config);
+destroy_capture_config(struct capture_config *config);
 
+extern bool
+match_pattern_list(const tchar *path, size_t path_nchars,
+                  const struct string_set *list);
+
+extern int
+try_exclude(const tchar *full_path, size_t full_path_nchars,
+           const struct add_image_params *params);
+
+typedef int (*capture_tree_t)(struct wim_dentry **, const tchar *,
+                             struct add_image_params *);
 
 #ifdef WITH_NTFS_3G
 /* ntfs-3g_capture.c */
@@ -86,14 +104,23 @@ extern int
 win32_build_dentry_tree(struct wim_dentry **root_ret,
                        const tchar *root_disk_path,
                        struct add_image_params *params);
+#define platform_default_capture_tree win32_build_dentry_tree
 #else
 /* unix_capture.c */
 extern int
 unix_build_dentry_tree(struct wim_dentry **root_ret,
                       const tchar *root_disk_path,
                       struct add_image_params *params);
+#define platform_default_capture_tree unix_build_dentry_tree
 #endif
 
 #define WIMLIB_ADD_FLAG_ROOT   0x80000000
 
+static inline int
+report_capture_error(struct add_image_params *params, int error_code,
+                    const tchar *path)
+{
+       return report_error(params->progfunc, params->progctx, error_code, path);
+}
+
 #endif /* _WIMLIB_CAPTURE_H */