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
va_list va;
tchar buf[tstrlen(file) + strlen(func) + 30];
+ static bool debug_enabled = false;
+ if (!debug_enabled) {
+ char *value = getenv("WIMLIB_DEBUG");
+ if (!value || strcmp(value, "0"))
+ debug_enabled = true;
+ else
+ return;
+ }
+
tsprintf(buf, T("[%"TS" %d] %s(): "), file, line, func);
va_start(va, format);
}
#endif
+/* API function documented in wimlib.h */
WIMLIBAPI int
wimlib_set_print_errors(bool show_error_messages)
{
= T("Success"),
[WIMLIB_ERR_ALREADY_LOCKED]
= T("The WIM is already locked for writing"),
- [WIMLIB_ERR_COMPRESSED_LOOKUP_TABLE]
- = T("Lookup table is compressed"),
[WIMLIB_ERR_DECOMPRESSION]
= T("Failed to decompress compressed data"),
[WIMLIB_ERR_DELETE_STAGING_DIR]
[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"),
[WIMLIB_ERR_IMAGE_COUNT]
= T("Inconsistent image count among the metadata "
"resources, the WIM header, and/or the XML data"),
- [WIMLIB_ERR_INSUFFICIENT_PRIVILEGES_TO_EXTRACT]
- = T("User does not have sufficient privileges to correctly extract the 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"),
- [WIMLIB_ERR_INVALID_DENTRY]
- = T("A directory entry in the WIM was invalid"),
- [WIMLIB_ERR_INVALID_HEADER_SIZE]
- = T("The WIM header was not 208 bytes"),
+ = T("The WIM compression type was invalid"),
+ [WIMLIB_ERR_INVALID_HEADER]
+ = T("The WIM header was invalid"),
[WIMLIB_ERR_INVALID_IMAGE]
= T("Tried to select an image that does not exist in the WIM"),
[WIMLIB_ERR_INVALID_INTEGRITY_TABLE]
= T("An invalid parameter was given"),
[WIMLIB_ERR_INVALID_PART_NUMBER]
= T("The part number or total parts of the WIM is invalid"),
+ [WIMLIB_ERR_INVALID_PIPABLE_WIM]
+ = T("The pipable WIM is invalid"),
[WIMLIB_ERR_INVALID_REPARSE_DATA]
= T("The reparse data of a reparse point was invalid"),
[WIMLIB_ERR_INVALID_RESOURCE_HASH]
= T("The SHA1 message digest of a WIM resource did not match the expected value"),
- [WIMLIB_ERR_INVALID_RESOURCE_SIZE]
- = T("A resource entry in the WIM has an invalid size"),
- [WIMLIB_ERR_INVALID_SECURITY_DATA]
- = T("The table of security descriptors in the WIM is invalid"),
+ [WIMLIB_ERR_INVALID_METADATA_RESOURCE]
+ = T("The metadata resource is invalid"),
[WIMLIB_ERR_INVALID_UNMOUNT_MESSAGE]
= T("The version of wimlib that has mounted a WIM image is incompatible with the "
"version being used to unmount it"),
= 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]
"correspond to a regular file"),
[WIMLIB_ERR_NO_FILENAME]
= T("The WIM is not identified with a filename"),
+ [WIMLIB_ERR_NOT_PIPABLE]
+ = T("The WIM was not captured such that it can be "
+ "applied from a pipe"),
[WIMLIB_ERR_NTFS_3G]
= T("NTFS-3g encountered an error (check errno)"),
[WIMLIB_ERR_OPEN]
= T("A file resource needed to complete the operation was missing from the WIM"),
[WIMLIB_ERR_RESOURCE_ORDER]
= T("The components of the WIM were arranged in an unexpected order"),
- [WIMLIB_ERR_SPECIAL_FILE]
- = T("Encountered a special file that cannot be archived"),
+ [WIMLIB_ERR_SET_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 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 timestamps on extracted file"),
[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("Timed out while waiting for a message to arrive from another process"),
+ [WIMLIB_ERR_UNEXPECTED_END_OF_FILE]
+ = T("Unexpectedly reached the end of the file"),
[WIMLIB_ERR_UNICODE_STRING_NOT_REPRESENTABLE]
= T("A Unicode string could not be represented in the current locale's encoding"),
[WIMLIB_ERR_UNKNOWN_VERSION]
= 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 */
WIMLIBAPI const tchar *
wimlib_get_error_string(enum wimlib_error_code code)
{
- if (code < 0 || code >= ARRAY_LEN(error_strings))
+ if ((int)code < 0 || code >= ARRAY_LEN(error_strings))
return NULL;
else
return error_strings[code];
-#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;
void *
wimlib_malloc(size_t size)
{
+ if (size == 0)
+ size = 1;
void *ptr = (*wimlib_malloc_func)(size);
- if (ptr == NULL && size != 0)
+ if (ptr == NULL)
ERROR("memory exhausted");
return ptr;
}
void *
wimlib_realloc(void *ptr, size_t size)
{
+ if (size == 0)
+ size = 1;
ptr = (*wimlib_realloc_func)(ptr, size);
- if (ptr == NULL && size != 0)
+ if (ptr == NULL)
ERROR("memory exhausted");
return ptr;
}
}
#endif
-#endif /* ENABLE_CUSTOM_MEMORY_ALLOCATOR */
-
void *
memdup(const void *mem, size_t size)
{
return ptr;
}
+/* API function documented in wimlib.h */
WIMLIBAPI int
wimlib_set_memory_allocator(void *(*malloc_func)(size_t),
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;
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
git://wimlib.net / wimlib / blobdiff