X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Fwimlib_internal.h;h=08a176cf277d7855428292ef93cce17a1001fd5d;hb=1c951ec1b14d60c43fbb0f5e80b0d0e82ce4cf91;hp=1ddec8e3c84f38fcfdc36c562131fa95eecf50b0;hpb=eaf5b4c85a3b7b853317b887867c18a4865a83e2;p=wimlib

diff --git a/src/wimlib_internal.h b/src/wimlib_internal.h
index 1ddec8e3..08a176cf 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. */
@@ -313,7 +313,9 @@ struct WIMStruct {
 	 * image_metadata array. */
 	int current_image;
 
+	/* Have any images been deleted? */
 	u8 deletion_occurred : 1;
+
 	u8 all_images_verified : 1;
 	u8 wim_locked : 1;
 };
@@ -437,8 +439,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 +453,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 */
@@ -520,10 +535,12 @@ check_wim_integrity(WIMStruct *w, wimlib_progress_func_t progress_func);
 
 /* join.c */
 
-extern int
-new_joined_lookup_table(WIMStruct *w, WIMStruct **additional_swms,
-			unsigned num_additional_swms,
-			struct wim_lookup_table **table_ret);
+extern void
+merge_lookup_tables(WIMStruct *w,
+		    WIMStruct **additional_swms, unsigned num_additional_swms);
+
+extern void
+unmerge_lookup_table(WIMStruct *wim);
 
 /* metadata_resource.c */
 
@@ -715,6 +732,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);
@@ -727,6 +747,30 @@ write_security_data(const struct wim_security_data *sd, u8 *p);
 extern void
 free_security_data(struct wim_security_data *sd);
 
+/* unix_apply.c */
+#ifndef __WIN32__
+extern int
+unix_do_apply_dentry(const char *output_path, size_t output_path_len,
+		     struct wim_dentry *dentry, struct apply_args *args);
+extern int
+unix_do_apply_dentry_timestamps(const char *output_path,
+				size_t output_path_len,
+				struct wim_dentry *dentry,
+				struct apply_args *args);
+#endif
+
+/* 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
@@ -783,11 +827,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);