X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Futil.c;h=6b93e2a93bab0daf16e0c20c990fa871d7b005c7;hp=f1ec74f0730176770f44f88927c05497be5fe71f;hb=f5d26d6005ba759762bec8c7cd45a738e577a8a7;hpb=f9695b9f40035f1a20968293255761a8301eaba0 diff --git a/src/util.c b/src/util.c index f1ec74f0..6b93e2a9 100644 --- a/src/util.c +++ b/src/util.c @@ -21,29 +21,38 @@ * along with wimlib; if not, see http://www.gnu.org/licenses/. */ -#include "config.h" - +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#undef _GNU_SOURCE +#ifdef _GNU_SOURCE +# define _GNU_SOURCE_DEFINED 1 +# undef _GNU_SOURCE +#endif /* Make sure the POSIX-compatible strerror_r() is declared, rather than the GNU * version, which has a different return type. */ #include +#ifdef _GNU_SOURCE_DEFINED +# define _GNU_SOURCE +#endif -#define _GNU_SOURCE -#include +#include "wimlib.h" +#include "wimlib/compiler.h" +#include "wimlib/encoding.h" +#include "wimlib/error.h" +#include "wimlib/types.h" +#include "wimlib/util.h" +#include "wimlib/xml.h" -#include "wimlib_internal.h" -#include "endianness.h" -#include "timestamp.h" +#ifdef __WIN32__ +# include "wimlib/win32.h" /* win32_strerror_r_replacement */ +#endif -#include #include -#include #include - -#ifdef __WIN32__ -#include "win32.h" -#endif +#include +#include +#include static size_t utf16le_strlen(const utf16lechar *s) @@ -132,6 +141,11 @@ wimlib_fprintf(FILE *fp, const tchar *format, ...) va_end(va); return ret; } + +#endif /* __WIN32__ */ + +#ifdef ENABLE_ERROR_MESSAGES +static bool wimlib_print_errors = false; #endif #if defined(ENABLE_ERROR_MESSAGES) || defined(ENABLE_DEBUG) @@ -169,9 +183,6 @@ wimlib_vmsg(const tchar *tag, const tchar *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 tchar *format, ...) { @@ -316,6 +327,8 @@ static const tchar *error_strings[] = { = T("A string provided as input by the user was not a valid UTF-8 string"), [WIMLIB_ERR_INVALID_UTF16_STRING] = 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_LIBXML_UTF16_HANDLER_NOT_AVAILABLE] = T("libxml2 was unable to find a character encoding conversion handler " "for UTF-16LE"), @@ -330,9 +343,14 @@ static const tchar *error_strings[] = { = T("Ran out of memory"), [WIMLIB_ERR_NOTDIR] = T("Expected a directory"), + [WIMLIB_ERR_NOTEMPTY] + = T("Directory was not empty"), [WIMLIB_ERR_NOT_A_WIM_FILE] = T("The file did not begin with the magic characters that " "identify a WIM file"), + [WIMLIB_ERR_NOT_A_REGULAR_FILE] + = T("One of the specified paths to extract did not " + "correspond to a regular file"), [WIMLIB_ERR_NO_FILENAME] = T("The WIM is not identified with a filename"), [WIMLIB_ERR_NTFS_3G] @@ -341,6 +359,8 @@ static const tchar *error_strings[] = { = T("Failed to open a file"), [WIMLIB_ERR_OPENDIR] = T("Failed to open a directory"), + [WIMLIB_ERR_PATH_DOES_NOT_EXIST] + = T("The path does not exist in the WIM image"), [WIMLIB_ERR_READ] = T("Could not read data from a file"), [WIMLIB_ERR_READLINK] @@ -387,9 +407,33 @@ wimlib_get_error_string(enum wimlib_error_code code) #ifdef ENABLE_CUSTOM_MEMORY_ALLOCATOR -void *(*wimlib_malloc_func) (size_t) = malloc; -void (*wimlib_free_func) (void *) = free; -void *(*wimlib_realloc_func)(void *, size_t) = realloc; +static void *(*wimlib_malloc_func) (size_t) = malloc; +static void (*wimlib_free_func) (void *) = free; +static void *(*wimlib_realloc_func)(void *, size_t) = realloc; + +void * +wimlib_malloc(size_t size) +{ + void *ptr = (*wimlib_malloc_func)(size); + if (ptr == NULL && size != 0) + ERROR("memory exhausted"); + return ptr; +} + +void +wimlib_free_memory(void *ptr) +{ + (*wimlib_free_func)(ptr); +} + +void * +wimlib_realloc(void *ptr, size_t size) +{ + ptr = (*wimlib_realloc_func)(ptr, size); + if (ptr == NULL && size != 0) + ERROR("memory exhausted"); + return ptr; +} void * wimlib_calloc(size_t nmemb, size_t size) @@ -397,7 +441,7 @@ wimlib_calloc(size_t nmemb, size_t size) size_t total_size = nmemb * size; void *p = MALLOC(total_size); if (p) - memset(p, 0, total_size); + p = memset(p, 0, total_size); return p; } @@ -410,7 +454,7 @@ wimlib_strdup(const char *str) size = strlen(str); p = MALLOC(size + 1); if (p) - memcpy(p, str, size + 1); + p = memcpy(p, str, size + 1); return p; } @@ -424,16 +468,21 @@ wimlib_wcsdup(const wchar_t *str) size = wcslen(str); p = MALLOC((size + 1) * sizeof(wchar_t)); if (p) - memcpy(p, str, (size + 1) * sizeof(wchar_t)); + p = wmemcpy(p, str, size + 1); return p; } #endif -extern void -xml_set_memory_allocator(void *(*malloc_func)(size_t), - void (*free_func)(void *), - void *(*realloc_func)(void *, size_t)); -#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; +} WIMLIBAPI int wimlib_set_memory_allocator(void *(*malloc_func)(size_t), @@ -459,7 +508,7 @@ wimlib_set_memory_allocator(void *(*malloc_func)(size_t), static bool seeded = false; static void -seed_random() +seed_random(void) { srand(time(NULL) * getpid()); seeded = true; @@ -492,180 +541,9 @@ randomize_byte_array(u8 *p, size_t n) *p++ = rand(); } -const tchar * -path_basename_with_len(const tchar *path, size_t len) -{ - const tchar *p = &path[len] - 1; - - /* Trailing slashes. */ - while (1) { - if (p == path - 1) - return T(""); - if (*p != T('/')) - break; - p--; - } - - while ((p != path - 1) && *p != T('/')) - p--; - - return p + 1; -} - -/* Like the basename() function, but does not modify @path; it just returns a - * pointer to it. */ -const tchar * -path_basename(const tchar *path) -{ - return path_basename_with_len(path, tstrlen(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 tchar * -path_stream_name(const tchar *path) -{ - const tchar *base = path_basename(path); - const tchar *stream_name = tstrchr(base, T(':')); - if (!stream_name) - return NULL; - else - return stream_name + 1; -} - -u64 -get_wim_timestamp() -{ - struct timeval tv; - gettimeofday(&tv, NULL); - return timeval_to_wim_timestamp(tv); -} - -void -wim_timestamp_to_str(u64 timestamp, tchar *buf, size_t len) -{ - struct tm tm; - time_t t = wim_timestamp_to_unix(timestamp); - gmtime_r(&t, &tm); - tstrftime(buf, len, T("%a %b %d %H:%M:%S %Y UTC"), &tm); -} - -void -zap_backslashes(tchar *s) -{ - if (s) { - while (*s != T('\0')) { - if (*s == T('\\')) - *s = T('/'); - s++; - } - } -} - -/* Write @n bytes from @buf to the file descriptor @fd, retrying on internupt - * and on short writes. - * - * Returns short count and set errno on failure. */ -size_t -full_write(int fd, const void *buf, size_t n) -{ - const void *p = buf; - ssize_t ret; - ssize_t total = 0; - - while (total != n) { - ret = write(fd, p, n); - if (ret <= 0) { - if (errno == EINTR) - continue; - if (ret == 0) - errno = EIO; - break; - } - total += ret; - p += ret; - } - return total; -} - -/* Read @n bytes from the file descriptor @fd to the buffer @buf, retrying on - * interrupt and on short reads. - * - * Returns short count and set errno on failure. */ -size_t -full_read(int fd, void *buf, size_t n) -{ - size_t bytes_remaining = n; - while (bytes_remaining) { - ssize_t bytes_read = read(fd, buf, bytes_remaining); - if (bytes_read <= 0) { - if (errno == EINTR) - continue; - if (bytes_read == 0) - errno = EIO; - break; - } - bytes_remaining -= bytes_read; - buf += bytes_read; - } - return n - bytes_remaining; -} - -/* Read @n bytes from the file descriptor @fd at the offset @offset to the - * buffer @buf, retrying on interrupt and on short reads. - * - * Returns short count and set errno on failure. */ -size_t -full_pread(int fd, void *buf, size_t nbyte, off_t offset) -{ - size_t bytes_remaining = nbyte; - ssize_t bytes_read; - - while (bytes_remaining) { - bytes_read = pread(fd, buf, bytes_remaining, offset); - if (bytes_read <= 0) { - if (errno == EINTR) - continue; - if (bytes_read == 0) - errno = EIO; - break; - } - bytes_remaining -= bytes_read; - buf += bytes_read; - offset += bytes_read; - } - return nbyte - bytes_remaining; -} - -/* Like pwrite(), but keep trying until everything has been written or we know - * for sure that there was an error. */ -size_t -full_pwrite(int fd, const void *buf, size_t count, off_t offset) -{ - ssize_t bytes_remaining = count; - ssize_t bytes_written; - - while (bytes_remaining > 0) { - bytes_written = pwrite(fd, buf, bytes_remaining, offset); - if (bytes_written <= 0) { - if (errno == EINTR) - continue; - if (bytes_written == 0) - errno = EIO; - break; - } - bytes_remaining -= bytes_written; - buf += bytes_written; - offset += bytes_written; - } - return count - bytes_remaining; -} - -off_t -filedes_offset(filedes_t fd) +void print_byte_field(const u8 field[], size_t len, FILE *out) { - return lseek(fd, 0, SEEK_CUR); + while (len--) + tfprintf(out, T("%02hhx"), *field++); }