X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Futil.c;h=8be76594e5125374ae92b564fd9c5640dbdf5834;hb=34e06fc9cab546816311404aa2e3cf680d137267;hp=9250b70131cc81d071d8dec7049670b28b15c96d;hpb=761a138b6419c30f6213af46186f678600750404;p=wimlib

diff --git a/src/util.c b/src/util.c
index 9250b701..8be76594 100644
--- a/src/util.c
+++ b/src/util.c
@@ -54,7 +54,7 @@
 #include <time.h>
 #include <unistd.h>
 
-static size_t
+size_t
 utf16le_strlen(const utf16lechar *s)
 {
 	const utf16lechar *p = s;
@@ -153,30 +153,33 @@ static void
 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
 
@@ -282,6 +285,8 @@ static const tchar *error_strings[] = {
 	[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"),
@@ -297,11 +302,9 @@ static const tchar *error_strings[] = {
 	[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]
@@ -335,12 +338,16 @@ static const tchar *error_strings[] = {
 		= 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]
@@ -394,8 +401,6 @@ static const tchar *error_strings[] = {
 		= 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]
@@ -418,6 +423,10 @@ static const tchar *error_strings[] = {
 		= 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  */
@@ -432,7 +441,6 @@ wimlib_get_error_string(enum wimlib_error_code 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;
@@ -503,8 +511,6 @@ wimlib_wcsdup(const wchar_t *str)
 }
 #endif
 
-#endif /* ENABLE_CUSTOM_MEMORY_ALLOCATOR */
-
 void *
 memdup(const void *mem, size_t size)
 {
@@ -520,7 +526,6 @@ 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;
@@ -528,12 +533,6 @@ wimlib_set_memory_allocator(void *(*malloc_func)(size_t),
 	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;