Add WIMLIB_ERR_FVE_LOCKED_VOLUME

[wimlib] / src / util.c

diff --git a/src/util.c b/src/util.c
index 86fcb05983f3308bf22241bda121e7f75e40857a..e074b951e7d4864da2d898f4c3fa83fc9f92e4cf 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -67,6 +67,7 @@ utf16le_strlen(const utf16lechar *s)
 #ifdef ENABLE_ERROR_MESSAGES
 bool wimlib_print_errors = false;
 FILE *wimlib_error_file = NULL; /* Set in wimlib_global_init() */
+static bool wimlib_owns_error_file = false;
 #endif
 
 #if defined(ENABLE_ERROR_MESSAGES) || defined(ENABLE_DEBUG)
@@ -192,8 +193,11 @@ WIMLIBAPI int
 wimlib_set_error_file(FILE *fp)
 {
 #ifdef ENABLE_ERROR_MESSAGES
+       if (wimlib_owns_error_file)
+               fclose(wimlib_error_file);
        wimlib_error_file = fp;
-       wimlib_print_errors = true;
+       wimlib_print_errors = (fp != NULL);
+       wimlib_owns_error_file = false;
        return 0;
 #else
        return WIMLIB_ERR_UNSUPPORTED;
@@ -201,17 +205,20 @@ wimlib_set_error_file(FILE *fp)
 }
 
 WIMLIBAPI int
-wimlib_set_error_file_by_name(const char *path)
+wimlib_set_error_file_by_name(const tchar *path)
 {
 #ifdef ENABLE_ERROR_MESSAGES
        FILE *fp;
 
+#ifdef __WIN32__
+       fp = win32_open_logfile(path);
+#else
        fp = fopen(path, "a");
+#endif
        if (!fp)
                return WIMLIB_ERR_OPEN;
-
-       wimlib_error_file = fp;
-       wimlib_print_errors = true;
+       wimlib_set_error_file(fp);
+       wimlib_owns_error_file = true;
        return 0;
 #else
        return WIMLIB_ERR_UNSUPPORTED;
@@ -240,13 +247,13 @@ static const tchar *error_strings[] = {
        [WIMLIB_ERR_INSUFFICIENT_PRIVILEGES]
                = T("The user does not have sufficient privileges"),
        [WIMLIB_ERR_INTEGRITY]
-               = T("The WIM failed an integrity check"),
+               = T("The WIM file is corrupted (failed integrity check)"),
        [WIMLIB_ERR_INVALID_CAPTURE_CONFIG]
                = T("The capture configuration string was invalid"),
        [WIMLIB_ERR_INVALID_CHUNK_SIZE]
-               = T("The WIM chunk size was invalid"),
+               = T("The compression chunk size was unrecognized"),
        [WIMLIB_ERR_INVALID_COMPRESSION_TYPE]
-               = T("The WIM compression type was invalid"),
+               = T("The compression type was unrecognized"),
        [WIMLIB_ERR_INVALID_HEADER]
                = T("The WIM header was invalid"),
        [WIMLIB_ERR_INVALID_IMAGE]
@@ -374,22 +381,26 @@ 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  */
 WIMLIBAPI const tchar *
-wimlib_get_error_string(enum wimlib_error_code code)
+wimlib_get_error_string(enum wimlib_error_code _code)
 {
-       if ((int)code < 0 || code >= ARRAY_LEN(error_strings))
-               return NULL;
-       else
-               return error_strings[code];
+       unsigned int code = (unsigned int)_code;
+
+       if (code >= ARRAY_LEN(error_strings) || error_strings[code] == NULL)
+               return T("Unknown error");
+
+       return error_strings[code];
 }
 
 
 
-static void *(*wimlib_malloc_func) (size_t)         = malloc;
-static void  (*wimlib_free_func)   (void *)         = free;
+static void *(*wimlib_malloc_func) (size_t)        = malloc;
+static void  (*wimlib_free_func)   (void *)        = free;
 static void *(*wimlib_realloc_func)(void *, size_t) = realloc;
 
 void *