*/
/*
- * Copyright (C) 2012 Eric Biggers
+ * Copyright (C) 2012, 2013 Eric Biggers
*
* This file is part of wimlib, a library for working with WIM files.
*
* along with wimlib; if not, see http://www.gnu.org/licenses/.
*/
+#include "config.h"
+
+#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 "sha1.h"
#include "timestamp.h"
-#include <sys/time.h>
-
-#include <iconv.h>
-#include <string.h>
#include <ctype.h>
-#include <stdlib.h>
-#include <time.h>
-#include <unistd.h>
#include <errno.h>
-
-/* 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 <stdlib.h>
#include <stdarg.h>
-bool __wimlib_print_errors = false;
-void wimlib_error(const char *format, ...)
+#include <unistd.h> /* for getpid() */
+
+#ifdef __WIN32__
+#include "win32.h"
+#endif
+
+static size_t
+utf16le_strlen(const utf16lechar *s)
{
- if (__wimlib_print_errors) {
- va_list va;
- int errno_save;
-
- va_start(va, format);
- errno_save = errno;
- fputs("[ERROR] ", stderr);
- vfprintf(stderr, format, va);
- putc('\n', stderr);
- errno = errno_save;
- va_end(va);
+ const utf16lechar *p = s;
+ while (*p)
+ p++;
+ return (p - s) * sizeof(utf16lechar);
+}
+
+#ifdef __WIN32__
+# define wimlib_vfprintf vfwprintf
+#else
+/* Handle %W for UTF16-LE printing.
+ *
+ * TODO: this is not yet done properly--- it's assumed that if the format string
+ * contains %W, then it contains no other format specifiers.
+ */
+static int
+wimlib_vfprintf(FILE *fp, const tchar *format, va_list va)
+{
+ const tchar *p;
+ int n;
+
+ for (p = format; *p; p++)
+ if (*p == T('%') && *(p + 1) == T('W'))
+ goto special;
+ return tvfprintf(fp, format, va);
+special:
+ n = 0;
+ for (p = format; *p; p++) {
+ if (*p == T('%') && (*(p + 1) == T('W'))) {
+ int ret;
+ tchar *tstr;
+ size_t tstr_nbytes;
+ utf16lechar *ucs = va_arg(va, utf16lechar*);
+
+ if (ucs) {
+ size_t ucs_nbytes = utf16le_strlen(ucs);
+
+ ret = utf16le_to_tstr(ucs, ucs_nbytes,
+ &tstr, &tstr_nbytes);
+ if (ret) {
+ ret = tfprintf(fp, T("??????"));
+ } else {
+ ret = tfprintf(fp, T("%"TS), tstr);
+ FREE(tstr);
+ }
+ if (ret < 0)
+ return -1;
+ else
+ n += ret;
+ } else {
+ n += tfprintf(fp, T("(null)"));
+ }
+ p++;
+ } else {
+ if (tputc(*p, fp) == EOF)
+ return -1;
+ n++;
+ }
}
+ return n;
}
-void wimlib_error_with_errno(const char *format, ...)
+int
+wimlib_printf(const tchar *format, ...)
{
- if (__wimlib_print_errors) {
- va_list va;
- int errno_save;
+ int ret;
+ 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);
+ ret = wimlib_vfprintf(stdout, format, va);
+ va_end(va);
+ return ret;
}
-void wimlib_warning(const char *format, ...)
+int
+wimlib_fprintf(FILE *fp, const tchar *format, ...)
{
- if (__wimlib_print_errors) {
- va_list va;
- int errno_save;
+ int ret;
+ va_list va;
- va_start(va, format);
- errno_save = errno;
+ va_start(va, format);
+ ret = wimlib_vfprintf(fp, format, va);
+ va_end(va);
+ return ret;
+}
+#endif
+
+#if defined(ENABLE_ERROR_MESSAGES) || defined(ENABLE_DEBUG)
+static void
+wimlib_vmsg(const tchar *tag, const tchar *format,
+ va_list va, bool perror)
+{
+#ifndef DEBUG
+ if (wimlib_print_errors) {
+#endif
+ int errno_save = errno;
fflush(stdout);
- fputs("[WARNING] ", stderr);
- vfprintf(stderr, format, va);
- putc('\n', stderr);
+ tfputs(tag, stderr);
+ wimlib_vfprintf(stderr, format, va);
+ if (perror && errno_save != 0) {
+ tchar buf[50];
+ int res;
+ res = tstrerror_r(errno_save, buf, sizeof(buf));
+ if (res) {
+ tsprintf(buf,
+ T("unknown error (errno=%d)"),
+ errno_save);
+ }
+ tfprintf(stderr, T(": %"TS), buf);
+ }
+ tputc(T('\n'), stderr);
+ fflush(stderr);
errno = errno_save;
- va_end(va);
+#ifndef DEBUG
}
+#endif
+}
+#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
+static bool wimlib_print_errors = false;
+
+
+void
+wimlib_error(const tchar *format, ...)
+{
+ va_list va;
+
+ va_start(va, format);
+ wimlib_vmsg(T("\r[ERROR] "), format, va, false);
+ va_end(va);
}
+void
+wimlib_error_with_errno(const tchar *format, ...)
+{
+ va_list va;
+
+ va_start(va, format);
+ wimlib_vmsg(T("\r[ERROR] "), format, va, true);
+ va_end(va);
+}
+
+void
+wimlib_warning(const tchar *format, ...)
+{
+ va_list va;
+
+ va_start(va, format);
+ wimlib_vmsg(T("\r[WARNING] "), format, va, false);
+ va_end(va);
+}
+
+void
+wimlib_warning_with_errno(const tchar *format, ...)
+{
+ va_list va;
+
+ va_start(va, format);
+ wimlib_vmsg(T("\r[WARNING] "), format, va, true);
+ va_end(va);
+}
+
+#endif
+
+#if defined(ENABLE_DEBUG) || defined(ENABLE_MORE_DEBUG)
+void wimlib_debug(const tchar *file, int line, const char *func,
+ const tchar *format, ...)
+{
+ va_list va;
+ tchar buf[tstrlen(file) + strlen(func) + 30];
+
+ tsprintf(buf, T("[%"TS" %d] %s(): "), file, line, func);
+
+ va_start(va, format);
+ wimlib_vmsg(buf, format, va, false);
+ va_end(va);
+}
#endif
-WIMLIBAPI int wimlib_set_print_errors(bool show_error_messages)
+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)
#endif
}
-static const char *error_strings[] = {
+static const tchar *error_strings[] = {
[WIMLIB_ERR_SUCCESS]
- = "Success",
+ = T("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",
+ = T("The WIM is already locked for writing"),
[WIMLIB_ERR_COMPRESSED_LOOKUP_TABLE]
- = "Lookup table is compressed",
+ = T("Lookup table is compressed"),
[WIMLIB_ERR_DECOMPRESSION]
- = "Failed to decompress compressed data",
+ = T("Failed to decompress compressed data"),
[WIMLIB_ERR_DELETE_STAGING_DIR]
- = "Failed to delete staging directory",
+ = T("Failed to delete staging directory"),
+ [WIMLIB_ERR_FILESYSTEM_DAEMON_CRASHED]
+ = T("The process servicing the mounted WIM has crashed"),
[WIMLIB_ERR_FORK]
- = "Failed to fork another process",
+ = T("Failed to fork another process"),
[WIMLIB_ERR_FUSE]
- = "An error was returned by fuse_main()",
+ = T("An error was returned by fuse_main()"),
[WIMLIB_ERR_FUSERMOUNT]
- = "Could not execute the `fusermount' program, or it exited "
- "with a failure status",
+ = T("Could not execute the `fusermount' program, or it exited "
+ "with a failure status"),
+ [WIMLIB_ERR_ICONV_NOT_AVAILABLE]
+ = T("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",
+ = T("Inconsistent image count among the metadata "
+ "resources, the WIM header, and/or the XML data"),
[WIMLIB_ERR_IMAGE_NAME_COLLISION]
- = "Tried to add an image with a name that is already in use",
+ = T("Tried to add an image with a name that is already in use"),
[WIMLIB_ERR_INTEGRITY]
- = "The WIM failed an integrity check",
+ = T("The WIM failed an integrity check"),
[WIMLIB_ERR_INVALID_CAPTURE_CONFIG]
- = "The capture configuration string was invalid",
+ = T("The capture configuration string was invalid"),
[WIMLIB_ERR_INVALID_CHUNK_SIZE]
- = "The WIM is compressed but does not have a chunk "
- "size of 32768",
+ = T("The WIM is compressed but does not have a chunk "
+ "size of 32768"),
[WIMLIB_ERR_INVALID_COMPRESSION_TYPE]
- = "The WIM is compressed, but is not marked as having LZX or "
- "XPRESS compression",
+ = T("The WIM is compressed, but is not marked as having LZX or "
+ "XPRESS compression"),
[WIMLIB_ERR_INVALID_DENTRY]
- = "A directory entry in the WIM was invalid",
+ = T("A directory entry in the WIM was invalid"),
[WIMLIB_ERR_INVALID_HEADER_SIZE]
- = "The WIM header was not 208 bytes",
+ = T("The WIM header was not 208 bytes"),
[WIMLIB_ERR_INVALID_IMAGE]
- = "Tried to select an image that does not exist in the WIM",
+ = T("Tried to select an image that does not exist in the WIM"),
[WIMLIB_ERR_INVALID_INTEGRITY_TABLE]
- = "The WIM's integrity table is invalid",
+ = T("The WIM's integrity table is invalid"),
[WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY]
- = "An entry in the WIM's lookup table is invalid",
+ = T("An entry in the WIM's lookup table is invalid"),
+ [WIMLIB_ERR_INVALID_MULTIBYTE_STRING]
+ = T("A string was not valid in the current locale's character encoding"),
+ [WIMLIB_ERR_INVALID_OVERLAY]
+ = T("Conflicting files in overlay when creating a WIM image"),
[WIMLIB_ERR_INVALID_PARAM]
- = "An invalid parameter was given",
+ = T("An invalid parameter was given"),
[WIMLIB_ERR_INVALID_PART_NUMBER]
- = "The part number or total parts of the WIM is invalid",
+ = T("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",
+ = T("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",
+ = T("A resource entry in the WIM has an invalid size"),
+ [WIMLIB_ERR_INVALID_SECURITY_DATA]
+ = T("The table of security descriptors in the WIM is invalid"),
+ [WIMLIB_ERR_INVALID_UNMOUNT_MESSAGE]
+ = T("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]
+ = 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_LIBXML_UTF16_HANDLER_NOT_AVAILABLE]
+ = T("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",
+ = T("Failed to create a hard or symbolic link when extracting "
+ "a file from the WIM"),
[WIMLIB_ERR_MKDIR]
- = "Failed to create a directory",
+ = T("Failed to create a directory"),
[WIMLIB_ERR_MQUEUE]
- = "Failed to create or use a POSIX message queue",
+ = T("Failed to create or use a POSIX message queue"),
[WIMLIB_ERR_NOMEM]
- = "Ran out of memory",
+ = T("Ran out of memory"),
[WIMLIB_ERR_NOTDIR]
- = "Expected a directory",
+ = T("Expected a directory"),
[WIMLIB_ERR_NOT_A_WIM_FILE]
- = "The file did not begin with the magic characters that "
- "identify a WIM file",
+ = T("The file did not begin with the magic characters that "
+ "identify a WIM file"),
[WIMLIB_ERR_NO_FILENAME]
- = "The WIM is not identified with a filename",
+ = T("The WIM is not identified with a filename"),
[WIMLIB_ERR_NTFS_3G]
- = "NTFS-3g encountered an error (check errno)",
+ = T("NTFS-3g encountered an error (check errno)"),
[WIMLIB_ERR_OPEN]
- = "Failed to open a file",
+ = T("Failed to open a file"),
[WIMLIB_ERR_OPENDIR]
- = "Failed to open a directory",
+ = T("Failed to open a directory"),
[WIMLIB_ERR_READ]
- = "Could not read data from a file",
+ = T("Could not read data from a file"),
[WIMLIB_ERR_READLINK]
- = "Could not read the target of a symbolic link",
+ = T("Could not read the target of a symbolic link"),
[WIMLIB_ERR_RENAME]
- = "Could not rename a file",
+ = T("Could not rename a file"),
[WIMLIB_ERR_REOPEN]
- = "Could not re-open the WIM after overwriting it",
+ = T("Could not re-open the WIM after overwriting it"),
[WIMLIB_ERR_RESOURCE_ORDER]
- = "The components of the WIM were arranged in an unexpected order",
+ = T("The components of the WIM were arranged in an unexpected order"),
[WIMLIB_ERR_SPECIAL_FILE]
- = "Encountered a special file that cannot be archived",
+ = T("Encountered a special file that cannot be archived"),
[WIMLIB_ERR_SPLIT_INVALID]
- = "The WIM is part of an invalid split WIM",
+ = T("The WIM is part of an invalid split WIM"),
[WIMLIB_ERR_SPLIT_UNSUPPORTED]
- = "The WIM is part of a split WIM, which is not supported for this operation",
+ = T("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",
+ = T("Could not read the metadata for a file or directory"),
[WIMLIB_ERR_TIMEOUT]
- = "Timed out",
+ = T("Timed out while waiting for a message to arrive from another process"),
+ [WIMLIB_ERR_UNICODE_STRING_NOT_REPRESENTABLE]
+ = T("A Unicode string could not be represented in the current locale's encoding"),
[WIMLIB_ERR_UNKNOWN_VERSION]
- = "The WIM file is marked with an unknown version number",
+ = T("The WIM file is marked with an unknown version number"),
[WIMLIB_ERR_UNSUPPORTED]
- = "The requested operation is unsupported",
+ = T("The requested operation is unsupported"),
+ [WIMLIB_ERR_VOLUME_LACKS_FEATURES]
+ = T("The volume did not support a feature necessary to complete the operation"),
[WIMLIB_ERR_WRITE]
- = "Failed to write data to a file",
+ = T("Failed to write data to a file"),
[WIMLIB_ERR_XML]
- = "The XML data of the WIM is invalid",
+ = T("The XML data of the WIM is invalid"),
};
-WIMLIBAPI const char *wimlib_get_error_string(enum wimlib_error_code code)
+WIMLIBAPI const tchar *
+wimlib_get_error_string(enum wimlib_error_code code)
{
- if (code < WIMLIB_ERR_SUCCESS || code > WIMLIB_ERR_XML)
+ if (code < 0 || code >= ARRAY_LEN(error_strings))
return NULL;
else
return error_strings[code];
void (*wimlib_free_func) (void *) = free;
void *(*wimlib_realloc_func)(void *, size_t) = realloc;
-void *wimlib_calloc(size_t nmemb, size_t size)
+void *
+wimlib_calloc(size_t nmemb, size_t size)
{
size_t total_size = nmemb * size;
void *p = MALLOC(total_size);
return p;
}
-char *wimlib_strdup(const char *str)
+char *
+wimlib_strdup(const char *str)
{
size_t size;
char *p;
return p;
}
-extern void xml_set_memory_allocator(void *(*malloc_func)(size_t),
- void (*free_func)(void *),
- void *(*realloc_func)(void *, size_t));
+#ifdef __WIN32__
+wchar_t *
+wimlib_wcsdup(const wchar_t *str)
+{
+ size_t size;
+ wchar_t *p;
+
+ size = wcslen(str);
+ p = MALLOC((size + 1) * sizeof(wchar_t));
+ if (p)
+ memcpy(p, str, (size + 1) * sizeof(wchar_t));
+ 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
-WIMLIBAPI int wimlib_set_memory_allocator(void *(*malloc_func)(size_t),
- void (*free_func)(void *),
- void *(*realloc_func)(void *, size_t))
+WIMLIBAPI int
+wimlib_set_memory_allocator(void *(*malloc_func)(size_t),
+ void (*free_func)(void *),
+ void *(*realloc_func)(void *, size_t))
{
#ifdef ENABLE_CUSTOM_MEMORY_ALLOCATOR
wimlib_malloc_func = malloc_func ? malloc_func : malloc;
#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)
-{
- 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;
-}
-
-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)
-{
- 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;
-}
-
static bool seeded = false;
-static void seed_random()
+static void
+seed_random()
{
srand(time(NULL) * getpid());
seeded = true;
}
-/* Fills @n bytes pointed to by @p with random alphanumeric characters. */
-void randomize_char_array_with_alnum(char p[], size_t n)
+/* Fills @n characters pointed to by @p with random alphanumeric characters. */
+void
+randomize_char_array_with_alnum(tchar p[], size_t n)
{
if (!seeded)
seed_random();
}
/* Fills @n bytes pointer to by @p with random numbers. */
-void randomize_byte_array(u8 *p, size_t n)
+void
+randomize_byte_array(u8 *p, size_t n)
{
if (!seeded)
seed_random();
*p++ = rand();
}
-/* Takes in a path of length @len in @buf, and transforms it into a string for
- * the path of its parent directory. */
-void to_parent_name(char buf[], size_t len)
-{
- ssize_t i = (ssize_t)len - 1;
- while (i >= 0 && buf[i] == '/')
- i--;
- while (i >= 0 && buf[i] != '/')
- i--;
- while (i >= 0 && buf[i] == '/')
- i--;
- buf[i + 1] = '\0';
-}
-
-/* Like the basename() function, but does not modify @path; it just returns a
- * pointer to it. */
-const char *path_basename(const char *path)
+const tchar *
+path_basename_with_len(const tchar *path, size_t len)
{
- const char *p = path;
- while (*p)
- p++;
- p--;
+ const tchar *p = &path[len] - 1;
/* Trailing slashes. */
while (1) {
if (p == path - 1)
- return "";
- if (*p != '/')
+ return T("");
+ if (*p != T('/'))
break;
p--;
}
- while ((p != path - 1) && *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 char *path_stream_name(const char *path)
+const tchar *
+path_stream_name(const tchar *path)
{
- const char *base = path_basename(path);
- const char *stream_name = strchr(base, ':');
+ const tchar *base = path_basename(path);
+ const tchar *stream_name = tstrchr(base, T(':'));
if (!stream_name)
return NULL;
else
return stream_name + 1;
}
-/*
- * Splits a file path into the part before the first '/', or the entire name if
- * there is no '/', and the part after the first sequence of '/' characters.
- *
- * @path: The file path to split.
- * @first_part_len_ret: A pointer to a `size_t' into which the length of the
- * first part of the path will be returned.
- * @return: A pointer to the next part of the path, after the first
- * sequence of '/', or a pointer to the terminating
- * null byte in the case of a path without any '/'.
- */
-const char *path_next_part(const char *path, size_t *first_part_len_ret)
-{
- size_t i;
- const char *next_part;
-
- i = 0;
- while (path[i] != '/' && path[i] != '\0')
- i++;
- if (first_part_len_ret)
- *first_part_len_ret = i;
- next_part = &path[i];
- while (*next_part == '/')
- next_part++;
- return next_part;
-}
-
-/* Returns the number of components of @path. */
-int get_num_path_components(const char *path)
-{
- int num_components = 0;
- while (*path) {
- while (*path == '/')
- path++;
- if (*path)
- num_components++;
- while (*path && *path != '/')
- path++;
- }
- return num_components;
-}
-
-
-/*
- * Prints a string. Printable characters are printed as-is, while unprintable
- * characters are printed as their octal escape codes.
- */
-void print_string(const void *string, size_t len)
-{
- const u8 *p = string;
-
- while (len--) {
- if (isprint(*p))
- putchar(*p);
- else
- printf("\\%03hho", *p);
- p++;
- }
-}
-
-u64 get_wim_timestamp()
+u64
+get_wim_timestamp()
{
struct timeval tv;
gettimeofday(&tv, NULL);
- return timeval_to_wim_timestamp(&tv);
+ return timeval_to_wim_timestamp(tv);
}
-void wim_timestamp_to_str(u64 timestamp, char *buf, size_t len)
+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);
- strftime(buf, len, "%a %b %d %H:%M:%S %Y UTC", &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++;
+ }
+ }
}
git://wimlib.net / wimlib / blobdiff