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

diff --git a/src/util.c b/src/util.c
index 27f01c41..1addc857 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;
@@ -63,87 +63,6 @@ utf16le_strlen(const utf16lechar *s)
 	return (p - s) * sizeof(utf16lechar);
 }
 
-#ifdef __WIN32__
-#  define wimlib_vfprintf vfwprintf
-#else
-/* Handle %W for UTF16-LE printing.
- *
- * TODO: this is not yet done properly--- it's assumed that if the format string
- * contains %W, then it contains no other format specifiers.
- */
-static int
-wimlib_vfprintf(FILE *fp, const tchar *format, va_list va)
-{
-	const tchar *p;
-	int n;
-
-	for (p = format; *p; p++)
-		if (*p == T('%') && *(p + 1) == T('W'))
-			goto special;
-	return tvfprintf(fp, format, va);
-special:
-	n = 0;
-	for (p = format; *p; p++) {
-		if (*p == T('%') && (*(p + 1) == T('W'))) {
-			int ret;
-			tchar *tstr;
-			size_t tstr_nbytes;
-			utf16lechar *ucs = va_arg(va, utf16lechar*);
-
-			if (ucs) {
-				size_t ucs_nbytes = utf16le_strlen(ucs);
-
-				ret = utf16le_to_tstr(ucs, ucs_nbytes,
-						      &tstr, &tstr_nbytes);
-				if (ret) {
-					ret = tfprintf(fp, T("??????"));
-				} else {
-					ret = tfprintf(fp, T("%"TS), tstr);
-					FREE(tstr);
-				}
-				if (ret < 0)
-					return -1;
-				else
-					n += ret;
-			} else {
-				n += tfprintf(fp, T("(null)"));
-			}
-			p++;
-		} else {
-			if (tputc(*p, fp) == EOF)
-				return -1;
-			n++;
-		}
-	}
-	return n;
-}
-
-int
-wimlib_printf(const tchar *format, ...)
-{
-	int ret;
-	va_list va;
-
-	va_start(va, format);
-	ret = wimlib_vfprintf(stdout, format, va);
-	va_end(va);
-	return ret;
-}
-
-int
-wimlib_fprintf(FILE *fp, const tchar *format, ...)
-{
-	int ret;
-	va_list va;
-
-	va_start(va, format);
-	ret = wimlib_vfprintf(fp, format, va);
-	va_end(va);
-	return ret;
-}
-
-#endif /* __WIN32__ */
-
 #ifdef ENABLE_ERROR_MESSAGES
 bool wimlib_print_errors = false;
 #endif
@@ -160,11 +79,11 @@ wimlib_vmsg(const tchar *tag, const tchar *format,
 		int errno_save = errno;
 		fflush(stdout);
 		tfputs(tag, stderr);
-		wimlib_vfprintf(stderr, format, va);
+		tvfprintf(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)"),
@@ -304,8 +223,7 @@ static const tchar *error_strings[] = {
 	[WIMLIB_ERR_INVALID_CHUNK_SIZE]
 		= 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]
@@ -424,6 +342,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  */
@@ -445,11 +367,17 @@ 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)
+	void *ptr;
+
+retry:
+	ptr = (*wimlib_malloc_func)(size);
+	if (unlikely(!ptr)) {
+		if (!size) {
+			size++;
+			goto retry;
+		}
 		ERROR("memory exhausted");
+	}
 	return ptr;
 }