X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwimlib_internal.h;h=fa40f6af80b9b6ba18fcae9b6c5a53e617f8c5ac;hb=35dd893208119869db6a90b1d1663f9aea88a3f7;hp=4f390629f8881e76f195eab873129d24d77e4f2f;hpb=ca28b6f865975bd84933a97fd902b81c6b284851;p=wimlib

diff --git a/src/wimlib_internal.h b/src/wimlib_internal.h
index 4f390629..fa40f6af 100644
--- a/src/wimlib_internal.h
+++ b/src/wimlib_internal.h
@@ -11,16 +11,16 @@
  * This file is part of wimlib, a library for working with WIM files.
  *
  * wimlib is free software; you can redistribute it and/or modify it under the
- * terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation; either version 2.1 of the License, or (at your option)
+ * terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 3 of the License, or (at your option)
  * any later version.
  *
  * wimlib is distributed in the hope that it will be useful, but WITHOUT ANY
  * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * A PARTICULAR PURPOSE. See the GNU General Public License for more
  * details.
  *
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
  * along with wimlib; if not, see http://www.gnu.org/licenses/.
  */
 
@@ -181,6 +181,7 @@ struct wim_header {
  * a LZ77-based algorithm. */
 #define WIM_HDR_FLAG_COMPRESS_LZX       0x00040000
 
+typedef struct _ntfs_volume ntfs_volume;
 
 /* Structure for security data.  Each image in the WIM file has its own security
  * data. */
@@ -190,8 +191,11 @@ struct wim_security_data {
 	 * that wimlib writes, currently), it will be 8 bytes. */
 	u32 total_length;
 
-	/* The number of security descriptors in the array @descriptors, below. */
-	u32 num_entries;
+	/* The number of security descriptors in the array @descriptors, below.  
+	 * It is really an unsigned int, but it must fit into an int because the
+	 * security ID's are signed.  (Not like you would ever have more than a
+	 * few hundred security descriptors anyway). */
+	int32_t num_entries;
 
 	/* Array of sizes of the descriptors in the array @descriptors. */
 	u64 *sizes;
@@ -266,6 +270,9 @@ typedef struct WIMStruct {
 		int write_flags;
 		bool write_metadata;
 	};
+#ifdef WITH_NTFS_3G
+	ntfs_volume *ntfs_vol;
+#endif
 
 	/* The currently selected image, indexed starting at 1.  If not 0,
 	 * subtract 1 from this to get the index of the current image in the
@@ -310,14 +317,30 @@ wim_get_current_image_metadata(WIMStruct *w)
 	return &w->image_metadata[w->current_image - 1];
 }
 
+struct pattern_list {
+	const char **pats;
+	size_t num_pats;
+	size_t num_allocated_pats;
+};
+
+struct capture_config {
+	struct pattern_list exclusion_list;
+	struct pattern_list exclusion_exception;
+	struct pattern_list compression_exclusion_list;
+	struct pattern_list alignment_list;
+	char *config_str;
+	char *prefix;
+	size_t prefix_len;
+};
+
 /* hardlink.c */
 
-struct link_group_table *new_link_group_table(u64 capacity);
+struct link_group_table *new_link_group_table(size_t capacity);
 int link_group_table_insert(struct dentry *dentry,
 			    void *__table);
 void free_link_group_table(struct link_group_table *table);
-u64 assign_link_groups(struct link_group_table *table);
-int link_groups_free_duplicate_data(struct link_group_table *table);
+u64 assign_link_group_ids(struct link_group_table *table);
+int fix_link_groups(struct link_group_table *table);
 
 
 /* header.c */
@@ -331,14 +354,31 @@ extern int write_integrity_table(FILE *out, u64 end_header_offset,
 				 int show_progress);
 extern int check_wim_integrity(WIMStruct *w, int show_progress, int *status);
 
+/* join.c */
+
+extern int new_joined_lookup_table(WIMStruct *w,
+				   WIMStruct **additional_swms,
+			    	   unsigned num_additional_swms,
+				   struct lookup_table **table_ret);
+
+extern int verify_swm_set(WIMStruct *w,
+			  WIMStruct **additional_swms,
+			  unsigned num_additional_swms);
 /* modify.c */
 extern void destroy_image_metadata(struct image_metadata *imd,
 				   struct lookup_table *lt);
+extern bool exclude_path(const char *path,
+			 const struct capture_config *config,
+			 bool exclude_prefix);
 extern int do_add_image(WIMStruct *w, const char *dir, const char *name,
-			const char *description, const char *flags_element,
+			const char *config_str, size_t config_len,
 			int flags,
-			int (*capture_tree)(struct dentry *, const char *,
-			 	     struct lookup_table *, int));
+			int (*capture_tree)(struct dentry **, const char *,
+			 	     struct lookup_table *, 
+				     struct wim_security_data *, 
+				     const struct capture_config *,
+				     int, void *),
+			void *extra_arg);
 
 /* resource.c */
 extern const u8 *get_resource_entry(const u8 *p, struct resource_entry *entry);
@@ -358,7 +398,7 @@ extern int extract_wim_resource_to_fd(const struct lookup_table_entry *lte,
 extern int extract_full_wim_resource_to_fd(const struct lookup_table_entry *lte,
 					   int fd);
 
-extern int read_metadata_resource(FILE *fp, int wim_ctype, 
+extern int read_metadata_resource(WIMStruct *w,
 				  struct image_metadata *image_metadata);