X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fwimlib_internal.h;h=bde8115204d2734a097fe06df368e7998cb14d33;hb=83d1242cf793d718c666d6d50faa397ce5234ed2;hp=9466a1993a3aa75150b0d999b2edf7d88b0026e5;hpb=9eb3ffad2c12ed8e5b3d8864f5db173961af953a;p=wimlib

diff --git a/src/wimlib_internal.h b/src/wimlib_internal.h
index 9466a199..bde81152 100644
--- a/src/wimlib_internal.h
+++ b/src/wimlib_internal.h
@@ -198,7 +198,7 @@ struct wim_header {
 #define WIM_HDR_FLAG_WRITE_IN_PROGRESS  0x00000040
 
 /* Reparse point fixup flag.  See docs for --rpfix and --norpfix in imagex, or
- * WIMLIB_ADD_IMAGE_FLAG_{RPFIX,NORPFIX} in wimlib.h.  Note that
+ * WIMLIB_ADD_FLAG_{RPFIX,NORPFIX} in wimlib.h.  Note that
  * WIM_HDR_FLAG_RP_FIX is a header flag and just sets the default behavior for
  * the WIM; it can still be overridder on a per-image basis.  But there is no
  * flag to set the default behavior for a specific image. */
@@ -437,8 +437,8 @@ struct add_image_params {
 	 * files should be excluded from capture or not. */
 	const struct wimlib_capture_config *config;
 
-	/* Flags that affect the capture operation (WIMLIB_ADD_IMAGE_FLAG_*) */
-	int add_image_flags;
+	/* Flags that affect the capture operation (WIMLIB_ADD_FLAG_*) */
+	int add_flags;
 
 	/* If non-NULL, the user-supplied progress function. */
 	wimlib_progress_func_t progress_func;
@@ -451,11 +451,24 @@ struct add_image_params {
 	u64 capture_root_dev;
 };
 
+
+/* capture_common.c */
+
 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
+copy_and_canonicalize_capture_config(const struct wimlib_capture_config *config,
+				     struct wimlib_capture_config **config_copy_ret);
+
+extern void
+free_capture_config(struct wimlib_capture_config *config);
+
 /* extract_image.c */
 
 /* Internal use only */
@@ -493,7 +506,8 @@ dentry_tree_fix_inodes(struct wim_dentry *root, struct list_head *inode_list);
 /* header.c */
 
 extern int
-read_header(int in_fd, struct wim_header *hdr, int split_ok);
+read_header(const tchar *filename, int in_fd, struct wim_header *hdr,
+	    int split_ok);
 
 extern int
 write_header(const struct wim_header *hdr, int out_fd);
@@ -538,6 +552,9 @@ write_metadata_resource(WIMStruct *w);
 struct apply_args {
 	WIMStruct *w;
 	const tchar *target;
+	unsigned target_nchars;
+	unsigned wim_source_path_nchars;
+	struct wim_dentry *extract_root;
 	tchar *target_realpath;
 	unsigned target_realpath_len;
 	int extract_flags;
@@ -711,6 +728,9 @@ extern int
 copy_resource(struct wim_lookup_table_entry *lte, void *w);
 
 /* security.c */
+extern struct wim_security_data *
+new_wim_security_data();
+
 extern int
 read_security_data(const u8 metadata_resource[],
 		   u64 metadata_resource_len, struct wim_security_data **sd_p);
@@ -723,6 +743,18 @@ write_security_data(const struct wim_security_data *sd, u8 *p);
 extern void
 free_security_data(struct wim_security_data *sd);
 
+/* unix_capture.c */
+#ifndef __WIN32__
+extern int
+unix_build_dentry_tree(struct wim_dentry **root_ret,
+		       const char *root_disk_path,
+		       struct add_image_params *params);
+#endif
+
+/* update_image.c */
+extern int
+rename_wim_path(WIMStruct *wim, const tchar *from, const tchar *to);
+
 /* verify.c */
 
 extern int
@@ -779,11 +811,7 @@ close_wim(WIMStruct *w);
 #define WIMLIB_WRITE_MASK_PUBLIC		0x1fffffff
 
 /* We are capturing a tree to be placed in the root of the WIM image */
-#define WIMLIB_ADD_IMAGE_FLAG_ROOT	0x80000000
-
-/* We are capturing a dentry that will become the root of a tree to be added to
- * the WIM image */
-#define WIMLIB_ADD_IMAGE_FLAG_SOURCE    0x40000000
+#define WIMLIB_ADD_FLAG_ROOT	0x80000000
 
 extern int
 begin_write(WIMStruct *w, const tchar *path, int write_flags);