X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Futil.h;h=7bff1b5d21c5a4929920992ee45fe226683ec92f;hp=50b78bb944247bd7a006e86aab119b36d31b6f8d;hb=161e7cdd2c0d3b3c1025da452a3192d381297465;hpb=b5d427e440402aff987a060ff6ceefcb97117fa4 diff --git a/src/util.h b/src/util.h index 50b78bb9..7bff1b5d 100644 --- a/src/util.h +++ b/src/util.h @@ -1,12 +1,14 @@ #ifndef _WIMLIB_UTIL_H #define _WIMLIB_UTIL_H +#include "config.h" +#include "wimlib_tchar.h" + #include #include #include #include #include -#include "config.h" #ifdef __GNUC__ # if defined(__CYGWIN__) || defined(__WIN32__) @@ -17,7 +19,7 @@ # define ALWAYS_INLINE inline __attribute__((always_inline)) # define PACKED __attribute__((packed)) # define FORMAT(type, format_str, args_start) \ - __attribute__((format(type, format_str, args_start))) + /*__attribute__((format(type, format_str, args_start))) */ # if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) # define COLD __attribute__((cold)) # else @@ -49,24 +51,12 @@ typedef uint32_t u32; typedef uint64_t u64; #endif -/* A pointer to 'mbchar' indicates a string of "multibyte characters" provided - * in the default encoding of the user's locale, which may be "UTF-8", - * "ISO-8859-1", "C", or any other ASCII-compatible encoding. - * "ASCII-compatible" here means any encoding where all ASCII characters have - * the same representation, and any non-ASCII character is represented as a - * sequence of one or more bytes not already used by any ASCII character. */ -typedef char mbchar; - -/* A pointer to 'utf8char' indicates a UTF-8 encoded string */ -typedef char utf8char; - -/* Note: in some places in the code, strings of plain old 'char' are still used. - * This means that the string is being operated on in an ASCII-compatible way, - * and may be either a multibyte or UTF-8 string. */ /* A pointer to 'utf16lechar' indicates a UTF-16LE encoded string */ typedef u16 utf16lechar; +#define TMALLOC(n) MALLOC((n) * sizeof(tchar)) + /* encoding.c */ extern void iconv_global_cleanup(); @@ -77,29 +67,29 @@ extern bool wimlib_mbs_is_utf8; chartype1, chartype2) \ \ extern int \ +varname1##_to_##varname2(const chartype1 *in, size_t in_nbytes, \ + chartype2 **out_ret, \ + size_t *out_nbytes_ret); \ + \ +extern int \ varname1##_to_##varname2##_nbytes(const chartype1 *in, size_t in_nbytes,\ size_t *out_nbytes_ret); \ \ extern int \ varname1##_to_##varname2##_buf(const chartype1 *in, size_t in_nbytes, \ - chartype2 *out); \ - \ -extern int \ -varname1##_to_##varname2(const chartype1 *in, size_t in_nbytes, \ - chartype2 **out_ret, \ - size_t *out_nbytes_ret); \ + chartype2 *out); -/* multi-byte string to UTF16-LE string */ -DECLARE_CHAR_CONVERSION_FUNCTIONS(mbs, utf16le, mbchar, utf16lechar); -/* UTF16-LE string to multi-byte string */ -DECLARE_CHAR_CONVERSION_FUNCTIONS(utf16le, mbs, utf16lechar, mbchar); +#if !TCHAR_IS_UTF16LE +DECLARE_CHAR_CONVERSION_FUNCTIONS(utf16le, tstr, utf16lechar, tchar); +DECLARE_CHAR_CONVERSION_FUNCTIONS(tstr, utf16le, tchar, utf16lechar); +#endif -/* UTF-8 string to multi-byte string */ -DECLARE_CHAR_CONVERSION_FUNCTIONS(utf8, mbs, utf8char, mbchar); +extern int +utf8_to_tstr_simple(const char *utf8str, tchar **out); -extern bool -utf8_str_contains_nonascii_chars(const utf8char *utf8_str); +extern int +tstr_to_utf8_simple(const tchar *tstr, char **out); #ifndef min #define min(a, b) ({ typeof(a) __a = (a); typeof(b) __b = (b); \ @@ -139,65 +129,73 @@ utf8_str_contains_nonascii_chars(const utf8char *utf8_str); #define ZERO_ARRAY(array) memset(array, 0, sizeof(array)) /* Used for buffering FILE IO in a few places */ -#define BUFFER_SIZE 4096 +#define BUFFER_SIZE 32768 static inline void FORMAT(printf, 1, 2) -dummy_printf(const char *format, ...) +dummy_tprintf(const tchar *format, ...) { } #ifdef ENABLE_ERROR_MESSAGES extern void -wimlib_error(const char *format, ...) FORMAT(printf, 1, 2) COLD; +wimlib_error(const tchar *format, ...) FORMAT(printf, 1, 2) COLD; extern void -wimlib_error_with_errno(const char *format, ...) FORMAT(printf, 1, 2) COLD; +wimlib_error_with_errno(const tchar *format, ...) FORMAT(printf, 1, 2) COLD; extern void -wimlib_warning(const char *format, ...) FORMAT(printf, 1, 2) COLD; +wimlib_warning(const tchar *format, ...) FORMAT(printf, 1, 2) COLD; extern void -wimlib_warning_with_errno(const char *format, ...) FORMAT(printf, 1, 2) COLD; -# define ERROR wimlib_error -# define ERROR_WITH_ERRNO wimlib_error_with_errno -# define WARNING wimlib_warning -# define WARNING_WITH_ERRNO wimlib_warning +wimlib_warning_with_errno(const tchar *format, ...) FORMAT(printf, 1, 2) COLD; +# define ERROR(format, ...) wimlib_error(T(format), ## __VA_ARGS__) +# define ERROR_WITH_ERRNO(format, ...) wimlib_error_with_errno(T(format), ## __VA_ARGS__) +# define WARNING(format, ...) wimlib_warning(T(format), ## __VA_ARGS__) +# define WARNING_WITH_ERRNO(format, ...) wimlib_warning_with_errno(T(format), ## __VA_ARGS__) #else /* ENABLE_ERROR_MESSAGES */ -# define ERROR(format, ...) dummy_printf(format, ## __VA_ARGS__) -# define ERROR_WITH_ERRNO(format, ...) dummy_printf(format, ## __VA_ARGS__) -# define WARNING(format, ...) dummy_printf(format, ## __VA_ARGS__) -# define WARNING_WITH_ERRNO(format, ...) dummy_printf(format, ## __VA_ARGS__) +# define ERROR(format, ...) dummy_tprintf(T(format), ## __VA_ARGS__) +# define ERROR_WITH_ERRNO(format, ...) dummy_tprintf(T(format), ## __VA_ARGS__) +# define WARNING(format, ...) dummy_tprintf(T(format), ## __VA_ARGS__) +# define WARNING_WITH_ERRNO(format, ...) dummy_tprintf(T(format), ## __VA_ARGS__) #endif /* !ENABLE_ERROR_MESSAGES */ -#if defined(ENABLE_DEBUG) || defined(ENABLE_MORE_DEBUG) +#if defined(ENABLE_MORE_DEBUG) && !defined(ENABLE_DEBUG) +# define ENABLE_DEBUG 1 +#endif + +#if defined(ENABLE_MORE_ASSERTIONS) && !defined(ENABLE_ASSERTIONS) +# define ENABLE_ASSERTIONS 1 +#endif + +#ifdef ENABLE_DEBUG extern void -wimlib_debug(const char *file, int line, const char *func, - const char *format, ...); +wimlib_debug(const tchar *file, int line, const char *func, + const tchar *format, ...); # define DEBUG(format, ...) \ - wimlib_debug(__FILE__, __LINE__, __func__, format, ## __VA_ARGS__); + wimlib_debug(T(__FILE__), __LINE__, __func__, T(format), ## __VA_ARGS__) #else -# define DEBUG(format, ...) dummy_printf(format, ## __VA_ARGS__) -#endif /* ENABLE_DEBUG || ENABLE_MORE_DEBUG */ +# define DEBUG(format, ...) dummy_tprintf(T(format), ## __VA_ARGS__) +#endif /* !ENABLE_DEBUG */ #ifdef ENABLE_MORE_DEBUG # define DEBUG2(format, ...) DEBUG(format, ## __VA_ARGS__) #else -# define DEBUG2(format, ...) dummy_printf(format, ## __VA_ARGS__) -#endif /* ENABLE_DEBUG */ +# define DEBUG2(format, ...) dummy_tprintf(T(format), ## __VA_ARGS__) +#endif /* !ENABLE_MORE_DEBUG */ #ifdef ENABLE_ASSERTIONS #include # define wimlib_assert(expr) assert(expr) #else # define wimlib_assert(expr) -#endif +#endif /* !ENABLE_ASSERTIONS */ #ifdef ENABLE_MORE_ASSERTIONS # define wimlib_assert2(expr) wimlib_assert(expr) #else # define wimlib_assert2(expr) -#endif +#endif /* !ENABLE_MORE_ASSERTIONS */ #define BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)])) @@ -206,12 +204,16 @@ extern void *(*wimlib_malloc_func)(size_t); extern void (*wimlib_free_func)(void *); extern void *(*wimlib_realloc_func)(void *, size_t); extern void *wimlib_calloc(size_t nmemb, size_t size); +#ifdef __WIN32__ +extern wchar_t *wimlib_wcsdup(const wchar_t *str); +#endif extern char *wimlib_strdup(const char *str); # define MALLOC wimlib_malloc_func # define FREE wimlib_free_func # define REALLOC wimlib_realloc_func # define CALLOC wimlib_calloc # define STRDUP wimlib_strdup +# define WSTRDUP wimlib_wcsdup #else /* ENABLE_CUSTOM_MEMORY_ALLOCATOR */ # include # include @@ -220,6 +222,7 @@ extern char *wimlib_strdup(const char *str); # define REALLOC realloc # define CALLOC calloc # define STRDUP strdup +# define WSTRDUP wcsdup #endif /* !ENABLE_CUSTOM_MEMORY_ALLOCATOR */ @@ -228,31 +231,22 @@ extern void randomize_byte_array(u8 *p, size_t n); extern void -randomize_char_array_with_alnum(char p[], size_t n); - -extern const char * -path_next_part(const char *path, size_t *first_part_len_ret); - -extern const char * -path_basename(const char *path); +randomize_char_array_with_alnum(tchar p[], size_t n); -extern const char * -path_stream_name(const char *path); +const tchar * +path_basename_with_len(const tchar *path, size_t len); -extern void -to_parent_name(char buf[], size_t len); - -extern void -print_string(const void *string, size_t len); +const tchar * +path_basename(const tchar *path); -extern int -get_num_path_components(const char *path); +extern const tchar * +path_stream_name(const tchar *path); static inline void -print_byte_field(const u8 field[], size_t len) +print_byte_field(const u8 field[], size_t len, FILE *out) { while (len--) - printf("%02hhx", *field++); + tfprintf(out, T("%02hhx"), *field++); } static inline u32 @@ -271,10 +265,56 @@ bsr32(u32 n) #endif } +#ifdef __WIN32__ +# define wimlib_fprintf fwprintf +# define wimlib_printf wprintf +#else /* __WIN32__ */ extern int -wimlib_fprintf(FILE *fp, const char *format, ...) FORMAT(printf, 2, 3); +wimlib_fprintf(FILE *fp, const tchar *format, ...) FORMAT(printf, 2, 3); extern int -wimlib_printf(const char *format, ...) FORMAT(printf, 1, 2); +wimlib_printf(const tchar *format, ...) FORMAT(printf, 1, 2); +#endif /* !__WIN32__ */ + +extern void +zap_backslashes(tchar *s); + +static inline u64 +hash_u64(u64 n) +{ + return n * 0x9e37fffffffc0001ULL; +} + +typedef int filedes_t; + +extern size_t +full_read(filedes_t fd, void *buf, size_t n); + +extern size_t +full_write(filedes_t fd, const void *buf, size_t n); + +extern size_t +full_pread(filedes_t fd, void *buf, size_t nbyte, off_t offset); + +extern size_t +full_pwrite(filedes_t fd, const void *buf, size_t count, off_t offset); + +#ifdef __WIN32__ +struct iovec { + void *iov_base; + size_t iov_len; +}; +#else +struct iovec; +#endif + + +extern size_t +full_writev(int fd, struct iovec *iov, int iovcnt); + +extern off_t +filedes_offset(filedes_t fd); + +#define INVALID_FILEDES (-1) #endif /* _WIMLIB_UTIL_H */