X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;f=src%2Futil.c;h=9db817ac5549d666a646280a154893a0fd7eec86;hb=25319f526c1922b0bfa33e1f954bb628937070b0;hp=c4f6e5ec01bf7a961a52bc2fbcada00999c77d70;hpb=ded522fd0a15d740354329c5066ebd3473563e57;p=wimlib

diff --git a/src/util.c b/src/util.c
index c4f6e5ec..9db817ac 100644
--- a/src/util.c
+++ b/src/util.c
@@ -3,7 +3,7 @@
  */
 
 /*
- * Copyright (C) 2012 Eric Biggers
+ * Copyright (C) 2012, 2013 Eric Biggers
  *
  * This file is part of wimlib, a library for working with WIM files.
  *
@@ -21,6 +21,13 @@
  * along with wimlib; if not, see http://www.gnu.org/licenses/.
  */
 
+#undef _GNU_SOURCE
+/* Make sure the POSIX-compatible strerror_r() is declared, rather than the GNU
+ * version, which has a different return type. */
+#define _POSIX_C_SOURCE 200112
+#include <string.h>
+#define _GNU_SOURCE
+
 #include "wimlib_internal.h"
 #include "endianness.h"
 #include "timestamp.h"
@@ -28,63 +35,71 @@
 #include <ctype.h>
 #include <errno.h>
 #include <stdlib.h>
-#include <string.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>
-bool __wimlib_print_errors = false;
+static bool wimlib_print_errors = false;
 
-void wimlib_error(const char *format, ...)
+static void wimlib_vmsg(const char *tag, const char *format,
+			va_list va, bool perror)
 {
- 	if (__wimlib_print_errors) {
-		va_list va;
-		int errno_save;
-
-		va_start(va, format);
-		errno_save = errno;
-		fputs("[ERROR] ", stderr);
+	if (wimlib_print_errors) {
+		int errno_save = errno;
+		fflush(stdout);
+		fputs(tag, stderr);
 		vfprintf(stderr, format, va);
+		if (perror && errno_save != 0) {
+			char buf[50];
+			int res = strerror_r(errno_save, buf, sizeof(buf));
+			if (res) {
+				snprintf(buf, sizeof(buf),
+					 "unknown error (errno=%d)", errno_save);
+			}
+			fprintf(stderr, ": %s", buf);
+		}
 		putc('\n', stderr);
 		errno = errno_save;
-		va_end(va);
 	}
 }
 
+void wimlib_error(const char *format, ...)
+{
+	va_list va;
+
+	va_start(va, format);
+	wimlib_vmsg("[ERROR] ", format, va, false);
+	va_end(va);
+}
+
 void wimlib_error_with_errno(const char *format, ...)
 {
- 	if (__wimlib_print_errors) {
-		va_list va;
-		int errno_save;
+	va_list va;
 
-		va_start(va, format);
-		errno_save = errno;
-		fflush(stdout);
-		fputs("[ERROR] ", stderr);
-		vfprintf(stderr, format, va);
-		fprintf(stderr, ": %s\n", strerror(errno_save));
-		errno = errno_save;
-		va_end(va);
-	}
+	va_start(va, format);
+	wimlib_vmsg("[ERROR] ", format, va, true);
+	va_end(va);
 }
 
 void wimlib_warning(const char *format, ...)
 {
- 	if (__wimlib_print_errors) {
-		va_list va;
-		int errno_save;
+	va_list va;
 
-		va_start(va, format);
-		errno_save = errno;
-		fflush(stdout);
-		fputs("[WARNING] ", stderr);
-		vfprintf(stderr, format, va);
-		putc('\n', stderr);
-		errno = errno_save;
-		va_end(va);
-	}
+	va_start(va, format);
+	wimlib_vmsg("[WARNING] ", format, va, false);
+	va_end(va);
+}
+
+void wimlib_warning_with_errno(const char *format, ...)
+{
+	va_list va;
+
+	va_start(va, format);
+	wimlib_vmsg("[WARNING] ", format, va, true);
+	va_end(va);
 }
 
 #endif
@@ -92,7 +107,7 @@ void wimlib_warning(const char *format, ...)
 WIMLIBAPI int wimlib_set_print_errors(bool show_error_messages)
 {
 #ifdef ENABLE_ERROR_MESSAGES
-	__wimlib_print_errors = show_error_messages;
+	wimlib_print_errors = show_error_messages;
 	return 0;
 #else
 	if (show_error_messages)
@@ -122,6 +137,9 @@ static const char *error_strings[] = {
 	[WIMLIB_ERR_FUSERMOUNT]
 		= "Could not execute the `fusermount' program, or it exited "
 			"with a failure status",
+	[WIMLIB_ERR_ICONV_NOT_AVAILABLE]
+		= "The iconv() function does not seem to work. "
+		  "Maybe check to make sure the directory /usr/lib/gconv exists",
 	[WIMLIB_ERR_IMAGE_COUNT]
 		= "Inconsistent image count among the metadata "
 			"resources, the WIM header, and/or the XML data",
@@ -147,17 +165,18 @@ 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_OVERLAY]
+		= "Conflicting files in overlay when creating a WIM image",
 	[WIMLIB_ERR_INVALID_PARAM]
 		= "An invalid parameter was given",
 	[WIMLIB_ERR_INVALID_PART_NUMBER]
 		= "The part number or total parts of the WIM is invalid",
 	[WIMLIB_ERR_INVALID_RESOURCE_HASH]
 		= "The SHA1 message digest of a WIM resource did not match the expected value",
-	[WIMLIB_ERR_ICONV_NOT_AVAILABLE]
-		= "The iconv() function does not seem to work. "
-		  "Maybe check to make sure the directory /usr/lib/gconv exists",
 	[WIMLIB_ERR_INVALID_RESOURCE_SIZE]
 		= "A resource entry in the WIM has an invalid size",
+	[WIMLIB_ERR_INVALID_SECURITY_DATA]
+		= "The table of security descriptors in the WIM is invalid",
 	[WIMLIB_ERR_INVALID_UNMOUNT_MESSAGE]
 		= "The version of wimlib that has mounted a WIM image is incompatible with the "
 		  "version being used to unmount it",
@@ -208,6 +227,8 @@ static const char *error_strings[] = {
 		= "The WIM is part of a split WIM, which is not supported for this operation",
 	[WIMLIB_ERR_STAT]
 		= "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_UNKNOWN_VERSION]
 		= "The WIM file is marked with an unknown version number",
 	[WIMLIB_ERR_UNSUPPORTED]