#include "list.h"
#include "wimlib.h"
-#ifdef WITH_FUSE
+#if defined(WITH_FUSE) || defined(ENABLE_MULTITHREADED_COMPRESSION)
#include <pthread.h>
#endif
* different WIM image. */
u8 modified : 1;
- /* 1 iff this image has been mounted read-write */
- u8 has_been_mounted_rw : 1;
+#ifdef WITH_NTFS_3G
+ struct _ntfs_volume *ntfs_vol;
+#endif
};
/* The opaque structure exposed to the wimlib API. */
/* A pointer to the file indicated by @filename, opened for reading. */
FILE *fp;
-#ifdef WITH_FUSE
+#if defined(WITH_FUSE) || defined(ENABLE_MULTITHREADED_COMPRESSION)
/* Extra file pointers to be used by concurrent readers */
FILE **fp_tab;
size_t num_allocated_fps;
/* Temporary field */
void *private;
-#ifdef WITH_NTFS_3G
- struct _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
* image_metadata array. */
return (entry->flags & WIM_RESHDR_FLAG_COMPRESSED);
}
+/* Iterate over each inode in a WIM image that has not yet been hashed */
#define image_for_each_inode(inode, imd) \
list_for_each_entry(inode, &imd->inode_list, i_list)
+/* Iterate over each stream in a WIM image that has not yet been hashed */
#define image_for_each_unhashed_stream(lte, imd) \
list_for_each_entry(lte, &imd->unhashed_streams, unhashed_list)
+/* Iterate over each stream in a WIM image that has not yet been hashed (safe
+ * against stream removal) */
#define image_for_each_unhashed_stream_safe(lte, tmp, imd) \
list_for_each_entry_safe(lte, tmp, &imd->unhashed_streams, unhashed_list)
#if 1
# define copy_resource_entry(dst, src) memcpy(dst, src, sizeof(struct resource_entry))
+# define zero_resource_entry(entry) memset(entry, 0, sizeof(struct resource_entry))
#else
static inline void
copy_resource_entry(struct resource_entry *dst,
const struct resource_entry *src)
{
- memcpy(dst, src, sizeof(struct resource_entry));
BUILD_BUG_ON(sizeof(struct resource_entry) != 24);
((u64*)dst)[0] = ((u64*)src)[0];
((u64*)dst)[1] = ((u64*)src)[1];
((u64*)dst)[2] = ((u64*)src)[2];
}
+
+static inline void
+zero_resource_entry(struct resource_entry *entry)
+{
+ BUILD_BUG_ON(sizeof(struct resource_entry) != 24);
+ ((u64*)entry)[0] = 0;
+ ((u64*)entry)[1] = 0;
+ ((u64*)entry)[2] = 0;
+}
#endif
/* add_image.c */
wimlib_progress_func_t progress_func,
void *extra_arg);
+#ifdef WITH_NTFS_3G
+extern int
+do_ntfs_umount(struct _ntfs_volume *vol);
+#endif
+
/* resource.c */
#define WIMLIB_RESOURCE_FLAG_RAW 0x1
#define WIMLIB_RESOURCE_FLAG_THREADSAFE_READ 0x2
#define WIMLIB_RESOURCE_FLAG_RECOMPRESS 0x4
-//#define WIMLIB_RESOURCE_FLAG_OVERWRITE_INPLACE 0x8
extern int
read_resource_prefix(const struct wim_lookup_table_entry *lte,
#define WIMLIB_WRITE_FLAG_NO_LOOKUP_TABLE 0x80000000
#define WIMLIB_WRITE_FLAG_REUSE_INTEGRITY_TABLE 0x40000000
#define WIMLIB_WRITE_FLAG_CHECKPOINT_AFTER_XML 0x20000000
-//#define WIMLIB_WRITE_FLAG_OVERWRITE_INPLACE 0x10000000
-#define WIMLIB_WRITE_MASK_PUBLIC 0x0fffffff
+#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