X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Futil.c;h=a0ed84d95014760cff7f0b95618c1fcb78c1d943;hp=a5899bcd349db00366206ce934ab20cb82260527;hb=2e44f90c21db693058037f83f92ad136c818ce9d;hpb=ac6edfd02c612da68a1b9a1b32ae64c95a87fbb1 diff --git a/src/util.c b/src/util.c index a5899bcd..a0ed84d9 100644 --- a/src/util.c +++ b/src/util.c @@ -21,36 +21,39 @@ * 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 "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 "endianness.h" -#include "timestamp.h" -#include "wimlib_internal.h" +#ifdef __WIN32__ +# include "wimlib/win32.h" /* win32_strerror_r_replacement */ +#endif -#include #include #include #include +#include #include - -#ifdef __WIN32__ -# include "win32.h" -# define pread win32_pread -# define pwrite win32_pwrite -# define writev win32_writev -#else -# include /* for writev() and `struct iovec' */ -#endif - static size_t utf16le_strlen(const utf16lechar *s) { @@ -138,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) @@ -175,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, ...) { @@ -402,17 +407,41 @@ 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) { size_t total_size = nmemb * size; - void *p = MALLOC(total_size); + void *p = (*wimlib_malloc_func)(total_size); if (p) - memset(p, 0, total_size); + p = memset(p, 0, total_size); return p; } @@ -423,7 +452,7 @@ wimlib_strdup(const char *str) char *p; size = strlen(str); - p = MALLOC(size + 1); + p = (*wimlib_malloc_func)(size + 1); if (p) memcpy(p, str, size + 1); return p; @@ -437,18 +466,23 @@ wimlib_wcsdup(const wchar_t *str) wchar_t *p; size = wcslen(str); - p = MALLOC((size + 1) * sizeof(wchar_t)); + p = (*wimlib_malloc_func)((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), @@ -474,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; @@ -507,244 +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++; - } - } -} - -tchar * -canonicalize_fs_path(const tchar *fs_path) -{ - tchar *canonical_path; - - if (!fs_path) - fs_path = T(""); - canonical_path = TSTRDUP(fs_path); - zap_backslashes(canonical_path); - return canonical_path; -} - -/* Strip leading and trailing slashes from a string. Also translates - * backslashes into forward slashes. */ -tchar * -canonicalize_wim_path(const tchar *wim_path) -{ - tchar *p; - tchar *canonical_path; - - if (wim_path == NULL) { - wim_path = T(""); - } else { - while (*wim_path == T('/') || *wim_path == T('\\')) - wim_path++; - } - canonical_path = TSTRDUP(wim_path); - if (canonical_path) { - zap_backslashes(canonical_path); - for (p = tstrchr(canonical_path, T('\0')) - 1; - p >= canonical_path && *p == T('/'); - p--) - { - *p = T('\0'); - } - } - return canonical_path; -} - -/* Like read(), but keep trying until everything has been written or we know for - * sure that there was an error (or end-of-file). */ -size_t -full_read(int fd, void *buf, size_t count) -{ - ssize_t bytes_read; - size_t bytes_remaining; - - for (bytes_remaining = count; - bytes_remaining != 0; - bytes_remaining -= bytes_read, buf += bytes_read) - { - bytes_read = read(fd, buf, bytes_remaining); - if (bytes_read <= 0) { - if (bytes_read == 0) - errno = EIO; - else if (errno == EINTR) - continue; - break; - } - } - return count - bytes_remaining; -} - -/* Like write(), but keep trying until everything has been written or we know - * for sure that there was an error. */ -size_t -full_write(int fd, const void *buf, size_t count) -{ - ssize_t bytes_written; - size_t bytes_remaining; - - for (bytes_remaining = count; - bytes_remaining != 0; - bytes_remaining -= bytes_written, buf += bytes_written) - { - bytes_written = write(fd, buf, bytes_remaining); - if (bytes_written < 0) { - if (errno == EINTR) - continue; - break; - } - } - return count - bytes_remaining; -} - -/* Like pread(), but keep trying until everything has been read or we know for - * sure that there was an error (or end-of-file) */ -size_t -full_pread(int fd, void *buf, size_t count, off_t offset) -{ - ssize_t bytes_read; - size_t bytes_remaining; - - for (bytes_remaining = count; - bytes_remaining != 0; - bytes_remaining -= bytes_read, buf += bytes_read, - offset += bytes_read) - { - bytes_read = pread(fd, buf, bytes_remaining, offset); - if (bytes_read <= 0) { - if (bytes_read == 0) - errno = EIO; - else if (errno == EINTR) - continue; - break; - } - } - return count - 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_written; - size_t bytes_remaining; - - for (bytes_remaining = count; - bytes_remaining != 0; - bytes_remaining -= bytes_written, buf += bytes_written, - offset += bytes_written) - { - bytes_written = pwrite(fd, buf, bytes_remaining, offset); - if (bytes_written < 0) { - if (errno == EINTR) - continue; - break; - } - } - return count - bytes_remaining; -} - -/* Like writev(), but keep trying until everything has been written or we know - * for sure that there was an error. */ -size_t -full_writev(int fd, struct iovec *iov, int iovcnt) -{ - size_t total_bytes_written = 0; - while (iovcnt > 0) { - ssize_t bytes_written; - - bytes_written = writev(fd, iov, iovcnt); - if (bytes_written < 0) { - if (errno == EINTR) - continue; - break; - } - total_bytes_written += bytes_written; - while (bytes_written) { - if (bytes_written >= iov[0].iov_len) { - bytes_written -= iov[0].iov_len; - iov++; - iovcnt--; - } else { - iov[0].iov_base += bytes_written; - iov[0].iov_len -= bytes_written; - bytes_written = 0; - } - } - } - return total_bytes_written; -} -off_t -filedes_offset(int 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++); }