#include <time.h>
#include <unistd.h>
-static size_t
+size_t
utf16le_strlen(const utf16lechar *s)
{
const utf16lechar *p = s;
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;
-}
-
-int
-wimlib_printf(const tchar *format, ...)
-{
- int ret;
- va_list va;
-
- va_start(va, format);
- ret = wimlib_vfprintf(stdout, format, va);
- va_end(va);
- return ret;
-}
-
-int
-wimlib_fprintf(FILE *fp, const tchar *format, ...)
-{
- int ret;
- va_list va;
-
- va_start(va, format);
- ret = wimlib_vfprintf(fp, format, va);
- va_end(va);
- return ret;
-}
-
-#endif /* __WIN32__ */
-
#ifdef ENABLE_ERROR_MESSAGES
bool wimlib_print_errors = false;
#endif
int errno_save = errno;
fflush(stdout);
tfputs(tag, stderr);
- wimlib_vfprintf(stderr, format, va);
+ tvfprintf(stderr, format, va);
if (perror && errno_save != 0) {
tchar buf[64];
int res;
= T("The WIM is already locked for writing"),
[WIMLIB_ERR_DECOMPRESSION]
= T("Failed to decompress compressed data"),
- [WIMLIB_ERR_DELETE_STAGING_DIR]
- = T("Failed to delete staging directory"),
- [WIMLIB_ERR_FILESYSTEM_DAEMON_CRASHED]
- = T("The process servicing the mounted WIM has crashed"),
- [WIMLIB_ERR_FORK]
- = T("Failed to fork another process"),
[WIMLIB_ERR_FUSE]
= T("An error was returned by fuse_main()"),
- [WIMLIB_ERR_FUSERMOUNT]
- = T("Could not execute the `fusermount' program, or it exited "
- "with a failure status"),
[WIMLIB_ERR_GLOB_HAD_NO_MATCHES]
= T("The provided file glob did not match any files"),
[WIMLIB_ERR_ICONV_NOT_AVAILABLE]
= T("The WIM's integrity table is invalid"),
[WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY]
= T("An entry in the WIM's lookup table is invalid"),
+ [WIMLIB_ERR_INVALID_METADATA_RESOURCE]
+ = T("The metadata resource 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("The reparse data of a reparse point was invalid"),
[WIMLIB_ERR_INVALID_RESOURCE_HASH]
= T("The SHA1 message digest of a WIM resource did not match the expected value"),
- [WIMLIB_ERR_INVALID_METADATA_RESOURCE]
- = T("The metadata resource 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("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_NOT_A_WIM_FILE]
+ = T("The file did not begin with the magic characters that "
+ "identify a WIM file"),
[WIMLIB_ERR_NO_FILENAME]
= T("The WIM is not identified with a filename"),
[WIMLIB_ERR_NOT_PIPABLE]
= T("The WIM is part of an invalid split WIM"),
[WIMLIB_ERR_STAT]
= T("Could not read the metadata for a file or directory"),
- [WIMLIB_ERR_TIMEOUT]
- = T("Timed out while waiting for a message to arrive from another process"),
[WIMLIB_ERR_UNEXPECTED_END_OF_FILE]
= T("Unexpectedly reached the end of the file"),
[WIMLIB_ERR_UNICODE_STRING_NOT_REPRESENTABLE]
= T("The requested operation is unsupported"),
[WIMLIB_ERR_UNSUPPORTED_FILE]
= T("A file in the directory tree to archive was not of a supported type"),
- [WIMLIB_ERR_VOLUME_LACKS_FEATURES]
- = T("The volume did not support a feature necessary to complete the operation"),
[WIMLIB_ERR_WIM_IS_READONLY]
= T("The WIM is read-only (file permissions, header flag, or split WIM)"),
[WIMLIB_ERR_WRITE]
= T("The WIM file (or parts of it) is encrypted"),
[WIMLIB_ERR_WIMBOOT]
= T("Failed to set WIMBoot pointer data"),
+ [WIMLIB_ERR_ABORTED_BY_PROGRESS]
+ = T("The operation was aborted by the library user"),
+ [WIMLIB_ERR_UNKNOWN_PROGRESS_STATUS]
+ = T("The user-provided progress function returned an unrecognized value"),
+ [WIMLIB_ERR_MKNOD]
+ = T("Unable to create a special file (e.g. device node or socket)"),
+ [WIMLIB_ERR_MOUNTED_IMAGE_IS_BUSY]
+ = T("There are still files open on the mounted WIM image"),
+ [WIMLIB_ERR_NOT_A_MOUNTPOINT]
+ = T("There is not a WIM image mounted on the directory"),
+ [WIMLIB_ERR_NOT_PERMITTED_TO_UNMOUNT]
+ = T("The current user does not have permission to unmount the WIM image"),
};
/* API function documented in wimlib.h */
void *
wimlib_malloc(size_t size)
{
- if (size == 0)
- size = 1;
- void *ptr = (*wimlib_malloc_func)(size);
- if (ptr == NULL)
+ void *ptr;
+
+retry:
+ ptr = (*wimlib_malloc_func)(size);
+ if (unlikely(!ptr)) {
+ if (!size) {
+ size++;
+ goto retry;
+ }
ERROR("memory exhausted");
+ }
return ptr;
}
git://wimlib.net / wimlib / blobdiff