Add WIMLIB_ERR_FVE_LOCKED_VOLUME

diff --git a/include/wimlib.h b/include/wimlib.h
index 76d63b26d19301a3b5a2f8231828de121f9eebc8..d8d0e755488810ba75f63177685e3eb1d1375b20 100644 (file)
--- a/include/wimlib.h
+++ b/include/wimlib.h
@@ -2434,6 +2434,7 @@ enum wimlib_error_code {
        WIMLIB_ERR_MOUNTED_IMAGE_IS_BUSY              = 79,
        WIMLIB_ERR_NOT_A_MOUNTPOINT                   = 80,
        WIMLIB_ERR_NOT_PERMITTED_TO_UNMOUNT           = 81,
+       WIMLIB_ERR_FVE_LOCKED_VOLUME                  = 82,
 };
 
 
@@ -4339,6 +4340,9 @@ wimlib_unmount_image_with_progress(const wimlib_tchar *dir,
  * be rolled back, and no visible changes shall have been made to @p wim.
  * Possible error codes include:
  *
+ * @retval ::WIMLIB_ERR_FVE_LOCKED_VOLUME
+ *     Windows-only: One of the "add" commands attempted to add files from an
+ *     encrypted BitLocker volume that hasn't yet been unlocked.
  * @retval ::WIMLIB_ERR_INVALID_CAPTURE_CONFIG
  *     The capture configuration structure specified for an add command was
  *     invalid.

diff --git a/src/util.c b/src/util.c
index 33c611c811558337bcd6d1b2914ba72a1be97cca..e074b951e7d4864da2d898f4c3fa83fc9f92e4cf 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -381,6 +381,8 @@ static const tchar *error_strings[] = {
                = T("There is not a WIM image mounted on the directory"),
        [WIMLIB_ERR_NOT_PERMITTED_TO_UNMOUNT]
                = T("The current user does not have permission to unmount the WIM image"),
+       [WIMLIB_ERR_FVE_LOCKED_VOLUME]
+               = T("The volume must be unlocked before it can be used"),
 };
 
 /* API function documented in wimlib.h  */

diff --git a/src/win32_capture.c b/src/win32_capture.c
index 71a593695d9630f038590c4793a8aba433092cac..8cf32efdef5b6fd167eed759c5455f906299132b 100644 (file)
--- a/src/win32_capture.c
+++ b/src/win32_capture.c
@@ -1123,7 +1123,10 @@ winnt_build_dentry_tree_recursive(struct wim_dentry **root_ret,
                        ERROR_WITH_ERRNO("\"%ls\": Can't open file "
                                         "(status=0x%08"PRIx32")",
                                         printable_path(full_path), (u32)status);
-                       ret = WIMLIB_ERR_OPEN;
+                       if (status == STATUS_FVE_LOCKED_VOLUME)
+                               ret = WIMLIB_ERR_FVE_LOCKED_VOLUME;
+                       else
+                               ret = WIMLIB_ERR_OPEN;
                }
                /* XXX: Provide option to exclude files that fail with
                 * STATUS_SHARING_VIOLATION?  */