wimlib_vmsg(const tchar *tag, const tchar *format,
va_list va, bool perror)
{
-#ifndef DEBUG
- if (wimlib_print_errors) {
+#if !defined(ENABLE_DEBUG)
+ if (wimlib_print_errors)
#endif
+ {
int errno_save = errno;
fflush(stdout);
tfputs(tag, stderr);
wimlib_vfprintf(stderr, format, va);
if (perror && errno_save != 0) {
- tchar buf[50];
+ tchar buf[64];
int res;
- res = tstrerror_r(errno_save, buf, sizeof(buf));
+ res = tstrerror_r(errno_save, buf, ARRAY_LEN(buf));
if (res) {
tsprintf(buf,
T("unknown error (errno=%d)"),
errno_save);
}
+ #ifdef WIN32
+ if (errno_save == EBUSY)
+ tstrcpy(buf, T("Resource busy"));
+ #endif
tfprintf(stderr, T(": %"TS), buf);
}
tputc(T('\n'), stderr);
fflush(stderr);
errno = errno_save;
-#ifndef DEBUG
}
-#endif
}
#endif
[WIMLIB_ERR_FUSERMOUNT]
= T("Could not execute the `fusermount' program, or it exited "
"with a failure status"),
+ [WIMLIB_ERR_GLOB_HAD_NO_MATCHES]
+ = T("The provided file glob did not match any files"),
[WIMLIB_ERR_ICONV_NOT_AVAILABLE]
= T("The iconv() function does not seem to work. "
"Maybe check to make sure the directory /usr/lib/gconv exists"),
"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]
= T("The capture configuration string was invalid"),
[WIMLIB_ERR_INVALID_CHUNK_SIZE]
- = T("The WIM is compressed but does not have a chunk "
- "size of 32768"),
+ = T("The WIM chunk size was invalid"),
[WIMLIB_ERR_INVALID_COMPRESSION_TYPE]
- = T("The WIM is compressed, but is not marked as having LZX or "
- "XPRESS compression"),
+ = T("The WIM compression type was invalid"),
[WIMLIB_ERR_INVALID_HEADER]
= T("The WIM header was invalid"),
[WIMLIB_ERR_INVALID_IMAGE]
= T("A string in a WIM dentry is not a valid UTF-16LE string"),
[WIMLIB_ERR_IS_DIRECTORY]
= T("One of the specified paths to delete was a directory"),
+ [WIMLIB_ERR_IS_SPLIT_WIM]
+ = T("The WIM is part of a split WIM, which is not supported for this operation"),
[WIMLIB_ERR_LIBXML_UTF16_HANDLER_NOT_AVAILABLE]
= T("libxml2 was unable to find a character encoding conversion handler "
"for UTF-16LE"),
[WIMLIB_ERR_LINK]
= T("Failed to create a hard or symbolic link when extracting "
"a file from the WIM"),
+ [WIMLIB_ERR_METADATA_NOT_FOUND]
+ = T("A required metadata resource could not be located"),
[WIMLIB_ERR_MKDIR]
= T("Failed to create a directory"),
[WIMLIB_ERR_MQUEUE]
= T("Failed to set short name on extracted file"),
[WIMLIB_ERR_SET_TIMESTAMPS]
= T("Failed to set timestamps on extracted file"),
- [WIMLIB_ERR_SPECIAL_FILE]
- = T("Encountered a special file that cannot be archived"),
[WIMLIB_ERR_SPLIT_INVALID]
= T("The WIM is part of an invalid split WIM"),
- [WIMLIB_ERR_SPLIT_UNSUPPORTED]
- = T("The WIM is part of a split WIM, which is not supported for this operation"),
[WIMLIB_ERR_STAT]
= T("Could not read the metadata for a file or directory"),
[WIMLIB_ERR_TIMEOUT]
= 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]
= T("Failed to write data to a file"),
[WIMLIB_ERR_XML]
= T("The XML data of the WIM is invalid"),
+ [WIMLIB_ERR_WIM_IS_ENCRYPTED]
+ = T("The WIM file (or parts of it) is encrypted"),
+ [WIMLIB_ERR_WIMBOOT]
+ = T("Failed to set WIMBoot pointer data"),
};
/* API function documented in wimlib.h */
-#ifdef ENABLE_CUSTOM_MEMORY_ALLOCATOR
static void *(*wimlib_malloc_func) (size_t) = malloc;
static void (*wimlib_free_func) (void *) = free;
static void *(*wimlib_realloc_func)(void *, size_t) = realloc;
}
#endif
-#endif /* ENABLE_CUSTOM_MEMORY_ALLOCATOR */
-
void *
memdup(const void *mem, size_t size)
{
void (*free_func)(void *),
void *(*realloc_func)(void *, size_t))
{
-#ifdef ENABLE_CUSTOM_MEMORY_ALLOCATOR
wimlib_malloc_func = malloc_func ? malloc_func : malloc;
wimlib_free_func = free_func ? free_func : free;
wimlib_realloc_func = realloc_func ? realloc_func : realloc;
xml_set_memory_allocator(wimlib_malloc_func, wimlib_free_func,
wimlib_realloc_func);
return 0;
-#else
- ERROR("Cannot set custom memory allocator functions:");
- ERROR("wimlib was compiled with the --without-custom-memory-allocator "
- "flag");
- return WIMLIB_ERR_UNSUPPORTED;
-#endif
}
static bool seeded = false;
git://wimlib.net / wimlib / blobdiff