X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwimlib_internal.h;h=3d7fb488f519fdc55cc4f91ba224337886d80447;hb=c6a1140e085f633273fcf47a6462bd9382ce118a;hp=580960fadfd12dde40da3ddabfa29af40864782b;hpb=14baa6ae892debbaa18dba8119931580efd0e517;p=wimlib diff --git a/src/wimlib_internal.h b/src/wimlib_internal.h index 580960fa..3d7fb488 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; @@ -299,11 +300,9 @@ struct WIMStruct { /* The header of the WIM file. */ struct wim_header hdr; - /* Temporary fields */ - union { - bool write_metadata; - void *private; - }; + /* Temporary field */ + void *private; + #ifdef WITH_NTFS_3G struct _ntfs_volume *ntfs_vol; #endif @@ -315,7 +314,6 @@ struct WIMStruct { u8 deletion_occurred : 1; u8 all_images_verified : 1; - u8 full_verification_in_progress : 1; u8 wim_locked : 1; }; @@ -353,89 +351,65 @@ resource_is_compressed(const struct resource_entry *entry) /* add_image.c */ -struct pattern_list { - const mbchar **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; - mbchar *config_str; - mbchar *prefix; - size_t prefix_len; -}; extern bool -exclude_path(const mbchar *path, const struct capture_config *config, +exclude_path(const tchar *path, size_t path_len, + const struct wimlib_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); +/* extract_image.c */ -extern int -utf16le_to_mbs_nbytes(const utf16lechar *utf16le_str, - size_t utf16le_nbytes, size_t *mbs_nbytes_ret); +/* Internal use only */ +#define WIMLIB_EXTRACT_FLAG_MULTI_IMAGE 0x80000000 +#define WIMLIB_EXTRACT_FLAG_NO_STREAMS 0x40000000 +#define WIMLIB_EXTRACT_MASK_PUBLIC 0x3fffffff -extern int -mbs_to_utf16le_buf(const mbchar *mbs, size_t mbs_nbytes, - utf16lechar *utf16le_str); +/* hardlink.c */ -extern int -utf16le_to_mbs_buf(const utf16lechar *utf16le_str, size_t utf16le_nbytes, - mbchar *mbs); +/* Hash table to find inodes, given an inode number (in the case of reading + * a WIM images), or both an inode number and a device number (in the case of + * capturing a WIM image). */ +struct wim_inode_table { + /* Fields for the hash table */ + struct hlist_head *array; + u64 num_entries; + u64 capacity; + + /* + * Linked list of "extra" inodes. These may be: + * + * - inodes with link count 1, which are all allowed to have 0 for their + * inode number, meaning we cannot insert them into the hash table. + * + * - Groups we create ourselves by splitting a nominal inode due to + * inconsistencies in the dentries. These inodes will share an inode + * number with some other inode until assign_inode_numbers() is + * called. + */ + struct hlist_head extra_inodes; +}; extern int -mbs_to_utf16le(const mbchar *mbs, size_t mbs_nbytes, - utf16lechar **utf16le_str_ret, size_t *utf16le_nbytes_ret); +init_inode_table(struct wim_inode_table *table, size_t capacity); extern int -utf16le_to_mbs(const utf16lechar *utf16le_str, size_t utf16le_nbytes, - mbchar **mbs_ret, size_t *mbs_nbytes_ret); +inode_table_new_dentry(struct wim_inode_table *table, const tchar *name, + u64 ino, u64 devno, struct wim_dentry **dentry_ret); -/* extract_image.c */ - -/* Internal use only */ -#define WIMLIB_EXTRACT_FLAG_MULTI_IMAGE 0x80000000 -#define WIMLIB_EXTRACT_FLAG_NO_STREAMS 0x40000000 -#define WIMLIB_EXTRACT_MASK_PUBLIC 0x3fffffff +extern void +inode_table_prepare_inode_list(struct wim_inode_table *table, + struct hlist_head *head); -/* hardlink.c */ +static inline void +destroy_inode_table(struct wim_inode_table *table) +{ + FREE(table->array); +} -extern u64 -assign_inode_numbers(struct hlist_head *inode_list); extern int dentry_tree_fix_inodes(struct wim_dentry *root, struct hlist_head *inode_list); @@ -486,16 +460,29 @@ 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; union wimlib_progress_info progress; -#ifdef WITH_NTFS_3G - struct _ntfs_volume *vol; -#endif wimlib_progress_func_t progress_func; int (*apply_dentry)(struct wim_dentry *, void *); + union { + #ifdef WITH_NTFS_3G + struct { + /* NTFS apply only */ + struct _ntfs_volume *vol; + }; + #endif + struct { + /* Normal apply only (UNIX) */ + unsigned long num_utime_warnings; + }; + + struct { + /* Normal apply only (Win32) */ + unsigned long num_set_sacl_priv_notheld; + unsigned long num_set_sd_access_denied; + }; + }; }; extern int @@ -504,13 +491,17 @@ 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, - const struct capture_config *config, + struct wim_inode_table *inode_table, + struct sd_set *sd_set, + const struct wimlib_capture_config *config, int add_image_flags, wimlib_progress_func_t progress_func, void *extra_arg); @@ -590,14 +581,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 */ @@ -631,12 +625,16 @@ destroy_image_metadata(struct wim_image_metadata *imd, #define WIMLIB_WRITE_FLAG_CHECKPOINT_AFTER_XML 0x20000000 #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 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);