X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Futil.c;h=27f01c415ff240594d22ed6d7fe5be18fb566f3d;hp=f7ed251c784868028bf12ef2be01cd36221738d8;hb=f37f269be1b81cdd00018db0486e377240093e75;hpb=f3ab01445d6184f7c5ffd0251667de7ef7437f9a

diff --git a/src/util.c b/src/util.c
index f7ed251c..27f01c41 100644
--- a/src/util.c
+++ b/src/util.c
@@ -145,7 +145,7 @@ wimlib_fprintf(FILE *fp, const tchar *format, ...)
 #endif /* __WIN32__ */
 
 #ifdef ENABLE_ERROR_MESSAGES
-static bool wimlib_print_errors = false;
+bool wimlib_print_errors = false;
 #endif
 
 #if defined(ENABLE_ERROR_MESSAGES) || defined(ENABLE_DEBUG)
@@ -153,9 +153,10 @@ 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);
@@ -169,14 +170,16 @@ wimlib_vmsg(const tchar *tag, const tchar *format,
 					 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
 
@@ -232,6 +235,15 @@ void wimlib_debug(const tchar *file, int line, const char *func,
 	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);
@@ -240,6 +252,7 @@ void wimlib_debug(const tchar *file, int line, const char *func,
 }
 #endif
 
+/* API function documented in wimlib.h  */
 WIMLIBAPI int
 wimlib_set_print_errors(bool show_error_messages)
 {
@@ -259,8 +272,6 @@ static const tchar *error_strings[] = {
 		= 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]
@@ -274,30 +285,29 @@ 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"),
 	[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"),
+	[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]
@@ -312,14 +322,14 @@ static const tchar *error_strings[] = {
 		= 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"),
@@ -329,12 +339,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]
@@ -353,6 +367,9 @@ static const tchar *error_strings[] = {
 		    "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]
@@ -369,36 +386,51 @@ static const tchar *error_strings[] = {
 		= T("Could not rename a file"),
 	[WIMLIB_ERR_REPARSE_POINT_FIXUP_FAILED]
 		= T("Unable to complete reparse point fixup"),
+	[WIMLIB_ERR_RESOURCE_NOT_FOUND]
+		= 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("The WIM is read-only (file permissions, header flag, or split WIM)"),
 	[WIMLIB_ERR_WRITE]
 		= T("Failed to write data to a file"),
 	[WIMLIB_ERR_XML]
 		= T("The XML data of the WIM is invalid"),
 };
 
+/* 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];
@@ -406,7 +438,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;
@@ -414,7 +445,12 @@ static void *(*wimlib_realloc_func)(void *, size_t) = realloc;
 void *
 wimlib_malloc(size_t size)
 {
-	return (*wimlib_malloc_func)(size);
+	if (size == 0)
+		size = 1;
+	void *ptr = (*wimlib_malloc_func)(size);
+	if (ptr == NULL)
+		ERROR("memory exhausted");
+	return ptr;
 }
 
 void
@@ -426,14 +462,19 @@ wimlib_free_memory(void *ptr)
 void *
 wimlib_realloc(void *ptr, size_t size)
 {
-	return (*wimlib_realloc_func)(ptr, size);
+	if (size == 0)
+		size = 1;
+	ptr = (*wimlib_realloc_func)(ptr, size);
+	if (ptr == NULL)
+		ERROR("memory exhausted");
+	return ptr;
 }
 
 void *
 wimlib_calloc(size_t nmemb, size_t size)
 {
 	size_t total_size = nmemb * size;
-	void *p = (*wimlib_malloc_func)(total_size);
+	void *p = MALLOC(total_size);
 	if (p)
 		p = memset(p, 0, total_size);
 	return p;
@@ -446,9 +487,9 @@ wimlib_strdup(const char *str)
 	char *p;
 
 	size = strlen(str);
-	p = (*wimlib_malloc_func)(size + 1);
+	p = MALLOC(size + 1);
 	if (p)
-		memcpy(p, str, size + 1);
+		p = memcpy(p, str, size + 1);
 	return p;
 }
 
@@ -460,21 +501,28 @@ wimlib_wcsdup(const wchar_t *str)
 	wchar_t *p;
 
 	size = wcslen(str);
-	p = (*wimlib_malloc_func)((size + 1) * sizeof(wchar_t));
+	p = MALLOC((size + 1) * sizeof(wchar_t));
 	if (p)
 		p = wmemcpy(p, str, size + 1);
 	return p;
 }
 #endif
 
-#endif /* ENABLE_CUSTOM_MEMORY_ALLOCATOR */
+void *
+memdup(const void *mem, size_t size)
+{
+	void *ptr = MALLOC(size);
+	if (ptr)
+		ptr = memcpy(ptr, mem, 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;
@@ -482,12 +530,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;
@@ -532,3 +574,10 @@ void print_byte_field(const u8 field[], size_t len, FILE *out)
 	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