X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Futil.c;h=31b51ff41314e0f3d4d96e8435f73dc0418ae974;hp=bcaefacddebff7cd7d4c6c180b265db7ccfdbe18;hb=2a33c303e30fd740f740e21632fd06b9e414b0c7;hpb=4449a8d6647cb1b5c251de9b77a0f4230811f09e diff --git a/src/util.c b/src/util.c index bcaefacd..31b51ff4 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,80 +21,95 @@ * 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. */ +#define _POSIX_C_SOURCE 200112 +#include +#define _GNU_SOURCE + #include "wimlib_internal.h" #include "endianness.h" -#include "sha1.h" #include "timestamp.h" -#include - -#include -#include #include -#include -#include -#include #include +#include + +#include /* for getpid() */ -#ifdef WITH_NTFS_3G -#include -#include +/* Windoze compatibility */ +#ifdef __WIN32__ +# define strerror_r(errnum, buf, bufsize) strerror_s(buf, bufsize, errnum) #endif /* 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 -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; + 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 @@ -102,7 +117,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) @@ -117,8 +132,6 @@ static const char *error_strings[] = { = "Success", [WIMLIB_ERR_ALREADY_LOCKED] = "The WIM is already locked for writing", - [WIMLIB_ERR_CHAR_CONVERSION] - = "Failed to perform a conversion between UTF-8 and UTF-16LE", [WIMLIB_ERR_COMPRESSED_LOOKUP_TABLE] = "Lookup table is compressed", [WIMLIB_ERR_DECOMPRESSION] @@ -134,6 +147,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", @@ -159,6 +175,8 @@ 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] @@ -167,9 +185,18 @@ static const char *error_strings[] = { = "The SHA1 message digest of a WIM resource did not match the expected value", [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", + [WIMLIB_ERR_INVALID_UTF8_STRING] + = "A string provided as input by the user was not a valid UTF-8 string", + [WIMLIB_ERR_INVALID_UTF16_STRING] + = "A string in a WIM dentry is not a valid UTF-16LE string", + [WIMLIB_ERR_LIBXML_UTF16_HANDLER_NOT_AVAILABLE] + = "libxml2 was unable to find a character encoding conversion handler " + "for UTF-16LE", [WIMLIB_ERR_LINK] = "Failed to create a hard or symbolic link when extracting " "a file from the WIM", @@ -210,6 +237,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] @@ -281,122 +310,6 @@ WIMLIBAPI int wimlib_set_memory_allocator(void *(*malloc_func)(size_t), #endif } - - -static iconv_t cd_utf16_to_utf8 = (iconv_t)(-1); - -/* Converts a string in the UTF-16 encoding to a newly allocated string in the - * UTF-8 encoding. */ -char *utf16_to_utf8(const char *utf16_str, size_t utf16_len, - size_t *utf8_len_ret) -{ -#ifdef WITH_NTFS_3G - if (utf16_len & 1) { - errno = -EILSEQ; - return NULL; - } - char *outs = NULL; - int outs_len = ntfs_ucstombs((const ntfschar*)utf16_str, - utf16_len >> 1, &outs, 0); - if (outs_len >= 0) { - *utf8_len_ret = outs_len; - } else { - ERROR_WITH_ERRNO("Error converting UTF-16LE string to UTF-8"); - outs = NULL; - } - return outs; -#else - if (cd_utf16_to_utf8 == (iconv_t)(-1)) { - cd_utf16_to_utf8 = iconv_open("UTF-8", "UTF-16LE"); - if (cd_utf16_to_utf8 == (iconv_t)-1) { - ERROR_WITH_ERRNO("Failed to get conversion descriptor " - "for converting UTF-16LE to UTF-8"); - return NULL; - } - } - size_t utf16_bytes_left = utf16_len; - size_t utf8_bytes_left = utf16_len; - - char *utf8_str = MALLOC(utf8_bytes_left); - if (!utf8_str) - return NULL; - - char *orig_utf8_str = utf8_str; - - size_t num_chars_converted = iconv(cd_utf16_to_utf8, (char**)&utf16_str, - &utf16_bytes_left, &utf8_str, &utf8_bytes_left); - - if (num_chars_converted == (size_t)(-1)) { - ERROR_WITH_ERRNO("Failed to convert UTF-16LE string to UTF-8 " - "string"); - FREE(orig_utf8_str); - return NULL; - } - - size_t utf8_len = utf16_len - utf8_bytes_left; - - *utf8_len_ret = utf8_len; - orig_utf8_str[utf8_len] = '\0'; - return orig_utf8_str; -#endif -} - -static iconv_t cd_utf8_to_utf16 = (iconv_t)(-1); - -/* Converts a string in the UTF-8 encoding to a newly allocated string in the - * UTF-16 encoding. */ -char *utf8_to_utf16(const char *utf8_str, size_t utf8_len, - size_t *utf16_len_ret) -{ -#ifdef WITH_NTFS_3G - char *outs = NULL; - int outs_nchars = ntfs_mbstoucs(utf8_str, (ntfschar**)&outs); - if (outs_nchars >= 0) { - *utf16_len_ret = (size_t)outs_nchars * 2; - } else { - ERROR_WITH_ERRNO("Error converting UTF-8 string to UTF-16LE"); - outs = NULL; - } - return outs; -#else - if (cd_utf8_to_utf16 == (iconv_t)(-1)) { - cd_utf8_to_utf16 = iconv_open("UTF-16LE", "UTF-8"); - if (cd_utf8_to_utf16 == (iconv_t)-1) { - ERROR_WITH_ERRNO("Failed to get conversion descriptor " - "for converting UTF-8 to UTF-16LE"); - return NULL; - } - } - - size_t utf8_bytes_left = utf8_len; - size_t utf16_capacity = utf8_len * 4; - size_t utf16_bytes_left = utf16_capacity; - - char *utf16_str = MALLOC(utf16_capacity + 2); - if (!utf16_str) - return NULL; - - char *orig_utf16_str = utf16_str; - - size_t num_chars_converted = iconv(cd_utf8_to_utf16, (char**)&utf8_str, - &utf8_bytes_left, &utf16_str, &utf16_bytes_left); - - if (num_chars_converted == (size_t)(-1)) { - ERROR_WITH_ERRNO("Failed to convert UTF-8 string to UTF-16LE " - "string"); - FREE(orig_utf16_str); - return NULL; - } - - size_t utf16_len = utf16_capacity - utf16_bytes_left; - - *utf16_len_ret = utf16_len; - orig_utf16_str[utf16_len] = '\0'; - orig_utf16_str[utf16_len + 1] = '\0'; - return orig_utf16_str; -#endif -} - static bool seeded = false; static void seed_random()