Add basic infrastructure for storing xattr items

[wimlib] / include / wimlib / apply.h

diff --git a/include/wimlib/apply.h b/include/wimlib/apply.h
index ad21418ef5f92f6516914dff6c2ebeef5271c894..cfddd1ed57ef8b601257de1106a5a09c70a06b50 100644 (file)
--- a/include/wimlib/apply.h
+++ b/include/wimlib/apply.h
@@ -11,9 +11,10 @@
 /* These can be treated as counts (for required_features) or booleans (for
  * supported_features).  */
 struct wim_features {
-       unsigned long archive_files;
+       unsigned long readonly_files;
        unsigned long hidden_files;
        unsigned long system_files;
+       unsigned long archive_files;
        unsigned long compressed_files;
        unsigned long encrypted_files;
        unsigned long encrypted_directories;
@@ -27,8 +28,10 @@ struct wim_features {
        unsigned long security_descriptors;
        unsigned long short_names;
        unsigned long unix_data;
+       unsigned long object_ids;
        unsigned long timestamps;
        unsigned long case_sensitive_filenames;
+       unsigned long linux_xattrs;
 };
 
 struct blob_descriptor;
@@ -70,8 +73,6 @@ struct apply_ctx {
        unsigned long num_blobs_remaining;
        struct list_head blob_list;
        const struct read_blob_callbacks *saved_cbs;
-       struct blob_descriptor *cur_blob;
-       u64 cur_blob_offset;
        struct filedes tmpfile_fd;
        tchar *tmpfile_name;
        unsigned int count_until_file_progress;
@@ -134,6 +135,21 @@ report_apply_error(struct apply_ctx *ctx, int error_code, const tchar *path)
        return report_error(ctx->progfunc, ctx->progctx, error_code, path);
 }
 
+extern bool
+detect_sparse_region(const void *data, size_t size, size_t *len_ret);
+
+static inline bool
+maybe_detect_sparse_region(const void *data, size_t size, size_t *len_ret,
+                          bool enabled)
+{
+       if (!enabled) {
+               /* Force non-sparse without checking */
+               *len_ret = size;
+               return false;
+       }
+       return detect_sparse_region(data, size, len_ret);
+}
+
 #define inode_first_extraction_dentry(inode)                           \
        ((inode)->i_first_extraction_alias)
 
@@ -198,9 +214,9 @@ struct apply_operations {
         *
         * 'd_extraction_name' and 'd_extraction_name_nchars' of each dentry
         * will be set to indicate the actual name with which the dentry should
-        * be extracted.  This may or may not be the same as 'file_name'.
-        * TODO: really, the extraction backends should be responsible for
-        * generating 'd_extraction_name'.
+        * be extracted.  This may or may not be the same as 'd_name'.  TODO:
+        * really, the extraction backends should be responsible for generating
+        * 'd_extraction_name'.
         *
         * Each dentry will refer to a valid inode in 'd_inode'.  Each inode
         * will contain a list of dentries of that inode being extracted; this
@@ -220,9 +236,10 @@ struct apply_operations {
 
        /*
         * Query whether the unnamed data stream of the specified file will be
-        * extracted as "externally backed".  If so, the extraction backend is
-        * assumed to handle this separately, and the common extraction code
-        * will not register a usage of the unnamed data stream's blob.
+        * extracted as "externally backed" from the WIM archive itself.  If so,
+        * then the extraction backend is assumed to handle this separately, and
+        * the common extraction code will not register a usage of the unnamed
+        * data stream's blob.
         *
         * This routine is optional.
         *
@@ -231,7 +248,7 @@ struct apply_operations {
         *      = 0 if the file will be externally backed.
         *      > 0 (wimlib error code) if another error occurred.
         */
-       int (*will_externally_back)(struct wim_dentry *dentry, struct apply_ctx *ctx);
+       int (*will_back_from_wim)(struct wim_dentry *dentry, struct apply_ctx *ctx);
 
        /*
         * Size of the backend-specific extraction context.  It must contain