Win32 apply: Delay setting FILE_ATTRIBUTE_READONLY

[wimlib] / src / util.c

diff --git a/src/util.c b/src/util.c
index 7a101f377ee62b594e5d802882c3dd36e0951561..9250b70131cc81d071d8dec7049670b28b15c96d 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -290,6 +290,8 @@ static const tchar *error_strings[] = {
                        "resources, the WIM header, and/or the XML data"),
        [WIMLIB_ERR_IMAGE_NAME_COLLISION]
                = T("Tried to add an image with a name that is already in use"),
+       [WIMLIB_ERR_INSUFFICIENT_PRIVILEGES]
+               = T("The user does not have sufficient privileges"),
        [WIMLIB_ERR_INTEGRITY]
                = T("The WIM failed an integrity check"),
        [WIMLIB_ERR_INVALID_CAPTURE_CONFIG]
@@ -381,13 +383,15 @@ static const tchar *error_strings[] = {
        [WIMLIB_ERR_RESOURCE_ORDER]
                = T("The components of the WIM were arranged in an unexpected order"),
        [WIMLIB_ERR_SET_ATTRIBUTES]
-               = T("Failed to set file attributes"),
+               = T("Failed to set attributes on extracted file"),
+       [WIMLIB_ERR_SET_REPARSE_DATA]
+               = T("Failed to set reparse data on extracted file"),
        [WIMLIB_ERR_SET_SECURITY]
-               = T("Failed to set file owner, group, or other permissions"),
+               = T("Failed to set file owner, group, or other permissions on extracted file"),
+       [WIMLIB_ERR_SET_SHORT_NAME]
+               = T("Failed to set short name on extracted file"),
        [WIMLIB_ERR_SET_TIMESTAMPS]
-               = T("Failed to set file timestamps"),
-       [WIMLIB_ERR_SPECIAL_FILE]
-               = T("Encountered a special file that cannot be archived"),
+               = T("Failed to set timestamps on extracted file"),
        [WIMLIB_ERR_SPLIT_INVALID]
                = T("The WIM is part of an invalid split WIM"),
        [WIMLIB_ERR_SPLIT_UNSUPPORTED]
@@ -404,6 +408,8 @@ static const tchar *error_strings[] = {
                = T("The WIM file is marked with an unknown version number"),
        [WIMLIB_ERR_UNSUPPORTED]
                = T("The requested operation is unsupported"),
+       [WIMLIB_ERR_UNSUPPORTED_FILE]
+               = T("A file in the directory tree to archive was not of a supported type"),
        [WIMLIB_ERR_VOLUME_LACKS_FEATURES]
                = T("The volume did not support a feature necessary to complete the operation"),
        [WIMLIB_ERR_WIM_IS_READONLY]
@@ -572,3 +578,10 @@ void print_byte_field(const u8 field[], size_t len, FILE *out)
        while (len--)
                tfprintf(out, T("%02hhx"), *field++);
 }
+
+#ifndef HAVE_MEMPCPY
+void *mempcpy(void *dst, const void *src, size_t n)
+{
+       return memcpy(dst, src, n) + n;
+}
+#endif