Update timestamp code; use utimensat()

[wimlib] / src / wimlib_internal.h

diff --git a/src/wimlib_internal.h b/src/wimlib_internal.h
index 8a99f30daa1eb5edf6a9b218371d0186d9fbd660..554d3cc423d717d63796349bd8b2bb66d9455409 100644 (file)
--- a/src/wimlib_internal.h
+++ b/src/wimlib_internal.h
@@ -372,10 +372,6 @@ extern bool exclude_path(const char *path,
 extern int add_new_dentry_tree(WIMStruct *dest_wim, struct wim_dentry *root,
                               struct wim_security_data *sd);
 
 extern int add_new_dentry_tree(WIMStruct *dest_wim, struct wim_dentry *root,
                               struct wim_security_data *sd);
 

-#if defined(__CYGWIN__) || defined(__WIN32__)
-extern FILE *win32_open_fp(const char *path_utf16);
-#endif
-

 /* extract_image.c */
 
 /* Internal use only */
 /* extract_image.c */
 
 /* Internal use only */


@@ -429,13 +425,12 @@ struct apply_args {
        WIMStruct *w;
        const char *target;
        int extract_flags;
        WIMStruct *w;
        const char *target;
        int extract_flags;

-       unsigned num_lutimes_warnings;
+       unsigned num_utime_warnings;

        struct list_head *stream_list;
        union wimlib_progress_info progress;
 #ifdef WITH_NTFS_3G
        struct _ntfs_volume *vol;
 #endif
        struct list_head *stream_list;
        union wimlib_progress_info progress;
 #ifdef WITH_NTFS_3G
        struct _ntfs_volume *vol;
 #endif

-       struct list_head empty_files;

        wimlib_progress_func_t progress_func;
        int (*apply_dentry)(struct wim_dentry *, void *);
 };
        wimlib_progress_func_t progress_func;
        int (*apply_dentry)(struct wim_dentry *, void *);
 };


@@ -485,13 +480,6 @@ extern int extract_wim_resource(const struct wim_lookup_table_entry *lte,
                                u64 size, extract_chunk_func_t extract_chunk,
                                void *extract_chunk_arg);
 
                                u64 size, extract_chunk_func_t extract_chunk,
                                void *extract_chunk_arg);
 

-#if defined(__CYGWIN__) || defined(__WIN32__)
-extern int win32_read_file(const char *filename, void *handle, u64 offset,
-                          size_t size, u8 *buf);
-extern void *win32_open_handle(const char *path_utf16);
-extern void win32_close_handle(void *handle);
-#endif
-

 /*
  * Extracts the first @size bytes of the WIM resource specified by @lte to the
  * open file descriptor @fd.
 /*
  * Extracts the first @size bytes of the WIM resource specified by @lte to the
  * open file descriptor @fd.


@@ -540,7 +528,6 @@ extern int for_image(WIMStruct *w, int image, int (*visitor)(WIMStruct *));
 extern void destroy_image_metadata(struct wim_image_metadata *imd,
                                   struct wim_lookup_table *lt);
 
 extern void destroy_image_metadata(struct wim_image_metadata *imd,
                                   struct wim_lookup_table *lt);
 

-

 /* write.c */
 
 /* Internal use only */
 /* write.c */
 
 /* Internal use only */


@@ -549,6 +536,10 @@ extern void destroy_image_metadata(struct wim_image_metadata *imd,
 #define WIMLIB_WRITE_FLAG_CHECKPOINT_AFTER_XML  0x20000000
 #define WIMLIB_WRITE_MASK_PUBLIC               0x1fffffff
 
 #define WIMLIB_WRITE_FLAG_CHECKPOINT_AFTER_XML  0x20000000
 #define WIMLIB_WRITE_MASK_PUBLIC               0x1fffffff
 

+#define WIMLIB_ADD_IMAGE_FLAG_ROOT     0x80000000
+#define WIMLIB_ADD_IMAGE_FLAG_SOURCE    0x40000000
+
+

 extern int begin_write(WIMStruct *w, const char *path, int write_flags);
 extern void close_wim_writable(WIMStruct *w);
 
 extern int begin_write(WIMStruct *w, const char *path, int write_flags);
 extern void close_wim_writable(WIMStruct *w);