X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Futil.c;h=c0244ba2f2a5a90d83a7fbcab51f19f84ae5536b;hp=5b5f092b9912f965a8cb453208afcdefa26cc859;hb=de12c346dc64404821d52d545e2e1b3d44230f2a;hpb=10a87017a0a82d34ed3981e1f5e586b5b8613e3f

diff --git a/src/util.c b/src/util.c
index 5b5f092b..c0244ba2 100644
--- a/src/util.c
+++ b/src/util.c
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2012, 2013 Biggers
+ * Copyright (C) 2012, 2013 Eric Biggers
  *
  * This file is part of wimlib, a library for working with WIM files.
  *
@@ -21,6 +21,10 @@
  * along with wimlib; if not, see http://www.gnu.org/licenses/.
  */
 
+#include "config.h"
+
+#define MINGW_HAS_SECURE_API
+
 #undef _GNU_SOURCE
 /* Make sure the POSIX-compatible strerror_r() is declared, rather than the GNU
  * version, which has a different return type. */
@@ -35,26 +39,118 @@
 #include <ctype.h>
 #include <errno.h>
 #include <stdlib.h>
+#include <stdarg.h>
 
 #include <unistd.h> /* for getpid() */
 
-/* True if wimlib is to print an informational message when an error occurs.
- * This can be turned off by calling wimlib_set_print_errors(false). */
-#ifdef ENABLE_ERROR_MESSAGES
-#include <stdarg.h>
-static bool wimlib_print_errors = false;
+/* Windoze compatibility */
+#ifdef __WIN32__
+#  define strerror_r(errnum, buf, bufsize) strerror_s(buf, bufsize, errnum)
+#endif
+
+size_t
+utf16le_strlen(const utf16lechar *s)
+{
+	const utf16lechar *p = s;
+	while (*p)
+		p++;
+	return (p - s) * sizeof(utf16lechar);
+}
 
-static void wimlib_vmsg(const char *tag, const char *format,
-			va_list va, bool perror)
+/* Handle %W for UTF16-LE printing and %U for UTF-8 printing.
+ *
+ * TODO: this is not yet done properly--- it's assumed that if the format string
+ * contains %W and/or %U, then it contains no other format specifiers.
+ */
+static int
+wimlib_vfprintf(FILE *fp, const char *format, va_list va)
+{
+	const char *p;
+
+	for (p = format; *p; p++)
+		if (*p == '%' && (*(p + 1) == 'W' || *(p + 1) == 'U'))
+			goto special;
+	return vfprintf(fp, format, va);
+special:
+	;
+	int n = 0;
+	for (p = format; *p; p++) {
+		if (*p == '%' && (*(p + 1) == 'W' || *(p + 1) == 'U')) {
+			int ret;
+			mbchar *mbs;
+			size_t mbs_nbytes;
+
+			if (*(p + 1) == 'W') {
+				utf16lechar *ucs = va_arg(va, utf16lechar*);
+				size_t ucs_nbytes = utf16le_strlen(ucs);
+				ret = utf16le_to_mbs(ucs, ucs_nbytes,
+						     &mbs, &mbs_nbytes);
+			} else {
+				utf8char *ucs = va_arg(va, utf8char*);
+				size_t ucs_nbytes = strlen(ucs);
+				ret = utf8_to_mbs(ucs, ucs_nbytes,
+						  &mbs, &mbs_nbytes);
+			}
+			if (ret) {
+				ret = fprintf(fp, "??????");
+			} else {
+				ret = fprintf(fp, "%s", mbs);
+				FREE(mbs);
+			}
+			if (ret < 0)
+				return -1;
+			else
+				n += ret;
+			p++;
+		} else {
+			if (putc(*p, fp) == EOF)
+				return -1;
+			n++;
+		}
+	}
+	return n;
+}
+
+int
+wimlib_printf(const char *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 char *format, ...)
+{
+	int ret;
+	va_list va;
+
+	va_start(va, format);
+	ret = wimlib_vfprintf(fp, format, va);
+	va_end(va);
+	return ret;
+}
+
+#if defined(ENABLE_ERROR_MESSAGES) || defined(ENABLE_DEBUG)
+static void
+wimlib_vmsg(const char *tag, const char *format,
+	    va_list va, bool perror)
+{
+#ifndef DEBUG
 	if (wimlib_print_errors) {
+#endif
 		int errno_save = errno;
 		fflush(stdout);
 		fputs(tag, stderr);
-		vfprintf(stderr, format, va);
+		wimlib_vfprintf(stderr, format, va);
 		if (perror && errno_save != 0) {
 			char buf[50];
-			int res = strerror_r(errno_save, buf, sizeof(buf));
+			int res;
+			res = strerror_r(errno_save, buf, sizeof(buf));
 			if (res) {
 				snprintf(buf, sizeof(buf),
 					 "unknown error (errno=%d)", errno_save);
@@ -63,10 +159,20 @@ static void wimlib_vmsg(const char *tag, const char *format,
 		}
 		putc('\n', stderr);
 		errno = errno_save;
+#ifndef DEBUG
 	}
+#endif
 }
+#endif
 
-void wimlib_error(const char *format, ...)
+/* True if wimlib is to print an informational message when an error occurs.
+ * This can be turned off by calling wimlib_set_print_errors(false). */
+#ifdef ENABLE_ERROR_MESSAGES
+static bool wimlib_print_errors = false;
+
+
+void
+wimlib_error(const char *format, ...)
 {
 	va_list va;
 
@@ -75,7 +181,8 @@ void wimlib_error(const char *format, ...)
 	va_end(va);
 }
 
-void wimlib_error_with_errno(const char *format, ...)
+void
+wimlib_error_with_errno(const char *format, ...)
 {
 	va_list va;
 
@@ -84,7 +191,8 @@ void wimlib_error_with_errno(const char *format, ...)
 	va_end(va);
 }
 
-void wimlib_warning(const char *format, ...)
+void
+wimlib_warning(const char *format, ...)
 {
 	va_list va;
 
@@ -93,7 +201,8 @@ void wimlib_warning(const char *format, ...)
 	va_end(va);
 }
 
-void wimlib_warning_with_errno(const char *format, ...)
+void
+wimlib_warning_with_errno(const char *format, ...)
 {
 	va_list va;
 
@@ -104,7 +213,23 @@ void wimlib_warning_with_errno(const char *format, ...)
 
 #endif
 
-WIMLIBAPI int wimlib_set_print_errors(bool show_error_messages)
+#ifdef ENABLE_DEBUG
+void wimlib_debug(const char *file, int line, const char *func,
+		  const char *format, ...)
+{
+
+	va_list va;
+	char buf[strlen(file) + strlen(func) + 30];
+
+	sprintf(buf, "[%s %d] %s(): ", file, line, func);
+	va_start(va, format);
+	wimlib_vmsg(buf, format, va, false);
+	va_end(va);
+}
+#endif
+
+WIMLIBAPI int
+wimlib_set_print_errors(bool show_error_messages)
 {
 #ifdef ENABLE_ERROR_MESSAGES
 	wimlib_print_errors = show_error_messages;
@@ -117,7 +242,7 @@ WIMLIBAPI int wimlib_set_print_errors(bool show_error_messages)
 #endif
 }
 
-static const char *error_strings[] = {
+static const mbchar *error_strings[] = {
 	[WIMLIB_ERR_SUCCESS]
 		= "Success",
 	[WIMLIB_ERR_ALREADY_LOCKED]
@@ -165,6 +290,10 @@ static const char *error_strings[] = {
 		= "The WIM's integrity table is invalid",
 	[WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY]
 		= "An entry in the WIM's lookup table is invalid",
+	[WIMLIB_ERR_INVALID_MULTIBYTE_STRING]
+		= "A string was not valid in the current locale's character encoding",
+	[WIMLIB_ERR_INVALID_OVERLAY]
+		= "Conflicting files in overlay when creating a WIM image",
 	[WIMLIB_ERR_INVALID_PARAM]
 		= "An invalid parameter was given",
 	[WIMLIB_ERR_INVALID_PART_NUMBER]
@@ -227,6 +356,8 @@ static const char *error_strings[] = {
 		= "Could not read the metadata for a file or directory",
 	[WIMLIB_ERR_TIMEOUT]
 		= "Timed out while waiting for a message to arrive from another process",
+	[WIMLIB_ERR_UNICODE_STRING_NOT_REPRESENTABLE]
+		= "A Unicode string could not be represented in the current locale's encoding",
 	[WIMLIB_ERR_UNKNOWN_VERSION]
 		= "The WIM file is marked with an unknown version number",
 	[WIMLIB_ERR_UNSUPPORTED]
@@ -237,9 +368,10 @@ static const char *error_strings[] = {
 		= "The XML data of the WIM is invalid",
 };
 
-WIMLIBAPI const char *wimlib_get_error_string(enum wimlib_error_code code)
+WIMLIBAPI const mbchar *
+wimlib_get_error_string(enum wimlib_error_code code)
 {
-	if (code < WIMLIB_ERR_SUCCESS || code > WIMLIB_ERR_XML)
+	if (code < 0 || code >= ARRAY_LEN(error_strings))
 		return NULL;
 	else
 		return error_strings[code];
@@ -252,7 +384,8 @@ void *(*wimlib_malloc_func) (size_t)	     = malloc;
 void  (*wimlib_free_func)   (void *)	     = free;
 void *(*wimlib_realloc_func)(void *, size_t) = realloc;
 
-void *wimlib_calloc(size_t nmemb, size_t size)
+void *
+wimlib_calloc(size_t nmemb, size_t size)
 {
 	size_t total_size = nmemb * size;
 	void *p = MALLOC(total_size);
@@ -261,7 +394,8 @@ void *wimlib_calloc(size_t nmemb, size_t size)
 	return p;
 }
 
-char *wimlib_strdup(const char *str)
+char *
+wimlib_strdup(const char *str)
 {
 	size_t size;
 	char *p;
@@ -273,14 +407,16 @@ char *wimlib_strdup(const char *str)
 	return p;
 }
 
-extern void xml_set_memory_allocator(void *(*malloc_func)(size_t),
-				   void (*free_func)(void *),
-				   void *(*realloc_func)(void *, size_t));
+extern void
+xml_set_memory_allocator(void *(*malloc_func)(size_t),
+			 void (*free_func)(void *),
+			 void *(*realloc_func)(void *, size_t));
 #endif
 
-WIMLIBAPI int wimlib_set_memory_allocator(void *(*malloc_func)(size_t),
-					   void (*free_func)(void *),
-					   void *(*realloc_func)(void *, size_t))
+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;
@@ -300,14 +436,16 @@ WIMLIBAPI int wimlib_set_memory_allocator(void *(*malloc_func)(size_t),
 
 static bool seeded = false;
 
-static void seed_random()
+static void
+seed_random()
 {
 	srand(time(NULL) * getpid());
 	seeded = true;
 }
 
 /* Fills @n bytes pointed to by @p with random alphanumeric characters. */
-void randomize_char_array_with_alnum(char p[], size_t n)
+void
+randomize_char_array_with_alnum(char p[], size_t n)
 {
 	if (!seeded)
 		seed_random();
@@ -323,7 +461,8 @@ void randomize_char_array_with_alnum(char p[], size_t n)
 }
 
 /* Fills @n bytes pointer to by @p with random numbers. */
-void randomize_byte_array(u8 *p, size_t n)
+void
+randomize_byte_array(u8 *p, size_t n)
 {
 	if (!seeded)
 		seed_random();
@@ -333,7 +472,8 @@ void randomize_byte_array(u8 *p, size_t n)
 
 /* Takes in a path of length @len in @buf, and transforms it into a string for
  * the path of its parent directory. */
-void to_parent_name(char buf[], size_t len)
+void
+to_parent_name(char buf[], size_t len)
 {
 	ssize_t i = (ssize_t)len - 1;
 	while (i >= 0 && buf[i] == '/')
@@ -347,7 +487,8 @@ void to_parent_name(char buf[], size_t len)
 
 /* Like the basename() function, but does not modify @path; it just returns a
  * pointer to it. */
-const char *path_basename(const char *path)
+const char *
+path_basename(const char *path)
 {
 	const char *p = path;
 	while (*p)
@@ -373,7 +514,8 @@ const char *path_basename(const char *path)
  * Returns a pointer to the part of @path following the first colon in the last
  * path component, or NULL if the last path component does not contain a colon.
  */
-const char *path_stream_name(const char *path)
+const char *
+path_stream_name(const char *path)
 {
 	const char *base = path_basename(path);
 	const char *stream_name = strchr(base, ':');
@@ -394,7 +536,8 @@ const char *path_stream_name(const char *path)
  * 				sequence of '/', or a pointer to the terminating
  * 				null byte in the case of a path without any '/'.
  */
-const char *path_next_part(const char *path, size_t *first_part_len_ret)
+const char *
+path_next_part(const char *path, size_t *first_part_len_ret)
 {
 	size_t i;
 	const char *next_part;
@@ -411,7 +554,8 @@ const char *path_next_part(const char *path, size_t *first_part_len_ret)
 }
 
 /* Returns the number of components of @path.  */
-int get_num_path_components(const char *path)
+int
+get_num_path_components(const char *path)
 {
 	int num_components = 0;
 	while (*path) {
@@ -430,7 +574,8 @@ int get_num_path_components(const char *path)
  * Prints a string.  Printable characters are printed as-is, while unprintable
  * characters are printed as their octal escape codes.
  */
-void print_string(const void *string, size_t len)
+void
+print_string(const void *string, size_t len)
 {
 	const u8 *p = string;
 
@@ -443,14 +588,16 @@ void print_string(const void *string, size_t len)
 	}
 }
 
-u64 get_wim_timestamp()
+u64
+get_wim_timestamp()
 {
 	struct timeval tv;
 	gettimeofday(&tv, NULL);
-	return timeval_to_wim_timestamp(&tv);
+	return timeval_to_wim_timestamp(tv);
 }
 
-void wim_timestamp_to_str(u64 timestamp, char *buf, size_t len)
+void
+wim_timestamp_to_str(u64 timestamp, char *buf, size_t len)
 {
 	struct tm tm;
 	time_t t = wim_timestamp_to_unix(timestamp);