X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fwimlib_internal.h;h=8b696b52246cc0b109901cdead4f83472cebeb2f;hp=580960fadfd12dde40da3ddabfa29af40864782b;hb=720db87557918105b17b51b03f264ddb9b89d2b9;hpb=14baa6ae892debbaa18dba8119931580efd0e517

diff --git a/src/wimlib_internal.h b/src/wimlib_internal.h
index 580960fa..8b696b52 100644
--- a/src/wimlib_internal.h
+++ b/src/wimlib_internal.h
@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (C) 2012 Eric Biggers
+ * Copyright (C) 2012, 2013 Eric Biggers
  *
  * This file is part of wimlib, a library for working with WIM files.
  *
@@ -55,6 +55,7 @@
 struct stat;
 struct wim_dentry;
 struct wim_inode;
+struct sd_set;
 
 #define WIM_MAGIC_LEN  8
 #define WIM_GID_LEN    16
@@ -281,7 +282,7 @@ struct WIMStruct {
 	FILE *out_fp;
 
 	/* The name of the WIM file (if any) that has been opened. */
-	mbchar *filename;
+	tchar *filename;
 
 	/* The lookup table for the WIM file. */
 	struct wim_lookup_table *lookup_table;
@@ -354,7 +355,7 @@ resource_is_compressed(const struct resource_entry *entry)
 /* add_image.c */
 
 struct pattern_list {
-	const mbchar **pats;
+	const tchar **pats;
 	size_t num_pats;
 	size_t num_allocated_pats;
 };
@@ -364,66 +365,18 @@ struct capture_config {
 	struct pattern_list exclusion_exception;
 	struct pattern_list compression_exclusion_list;
 	struct pattern_list alignment_list;
-	mbchar *config_str;
-	mbchar *prefix;
-	size_t prefix_len;
+	tchar *config_str;
+	tchar *prefix;
+	size_t prefix_num_tchars;
 };
 extern bool
-exclude_path(const mbchar *path, const struct capture_config *config,
+exclude_path(const tchar *path, const struct capture_config *config,
 	     bool exclude_prefix);
 
 extern int
 add_new_dentry_tree(WIMStruct *dest_wim, struct wim_dentry *root,
 		    struct wim_security_data *sd);
 
-/* encoding.c */
-
-#if defined(WITH_NTFS_3G) || defined(__WIN32__)
-
-static inline int
-iconv_global_init()
-{
-	return 0;
-}
-
-static inline void
-iconv_global_cleanup() { }
-#else
-extern int
-iconv_global_init();
-
-extern void
-iconv_global_cleanup();
-#endif
-
-extern bool wimlib_mbs_is_utf8;
-
-extern bool
-utf8_str_contains_nonascii_chars(const utf8char *utf8_str);
-
-extern int
-mbs_to_utf16le_nbytes(const mbchar *mbs, size_t mbs_nbytes,
-		      size_t *utf16le_nbytes_ret);
-
-extern int
-utf16le_to_mbs_nbytes(const utf16lechar *utf16le_str,
-		      size_t utf16le_nbytes, size_t *mbs_nbytes_ret);
-
-extern int
-mbs_to_utf16le_buf(const mbchar *mbs, size_t mbs_nbytes,
-		   utf16lechar *utf16le_str);
-
-extern int
-utf16le_to_mbs_buf(const utf16lechar *utf16le_str, size_t utf16le_nbytes,
-		   mbchar *mbs);
-
-extern int
-mbs_to_utf16le(const mbchar *mbs, size_t mbs_nbytes,
-	       utf16lechar **utf16le_str_ret, size_t *utf16le_nbytes_ret);
-
-extern int
-utf16le_to_mbs(const utf16lechar *utf16le_str, size_t utf16le_nbytes,
-	       mbchar **mbs_ret, size_t *mbs_nbytes_ret);
 
 /* extract_image.c */
 
@@ -486,7 +439,7 @@ write_metadata_resource(WIMStruct *w);
 
 struct apply_args {
 	WIMStruct *w;
-	const mbchar *target;
+	const tchar *target;
 	int extract_flags;
 	unsigned num_utime_warnings;
 	struct list_head *stream_list;
@@ -504,12 +457,15 @@ apply_dentry_ntfs(struct wim_dentry *dentry, void *arg);
 extern int
 apply_dentry_timestamps_ntfs(struct wim_dentry *dentry, void *arg);
 
+extern void
+libntfs3g_global_init();
+
 /* ntfs-capture.c */
 extern int
 build_dentry_tree_ntfs(struct wim_dentry **root_p,
-		       const mbchar *device,
+		       const tchar *device,
 		       struct wim_lookup_table *lookup_table,
-		       struct wim_security_data *sd,
+		       struct sd_set *sd_set,
 		       const struct capture_config *config,
 		       int add_image_flags,
 		       wimlib_progress_func_t progress_func,
@@ -590,14 +546,17 @@ extern void
 free_security_data(struct wim_security_data *sd);
 
 /* symlink.c */
+
+#ifndef __WIN32__
 ssize_t
 inode_readlink(const struct wim_inode *inode, char *buf, size_t buf_len,
 	       const WIMStruct *w, int read_resource_flags);
 
 extern int
-inode_set_symlink(struct wim_inode *inode, const mbchar *target,
+inode_set_symlink(struct wim_inode *inode, const char *target,
 		  struct wim_lookup_table *lookup_table,
 		  struct wim_lookup_table_entry **lte_ret);
+#endif
 
 /* verify.c */
 
@@ -636,7 +595,7 @@ destroy_image_metadata(struct wim_image_metadata *imd,
 
 
 extern int
-begin_write(WIMStruct *w, const mbchar *path, int write_flags);
+begin_write(WIMStruct *w, const tchar *path, int write_flags);
 
 extern void
 close_wim_writable(WIMStruct *w);