#include "wimlib_internal.h"
#include "endianness.h"
#include "sha1.h"
+#include "timestamp.h"
+#include <sys/time.h>
#include <iconv.h>
va_start(va, format);
errno_save = errno;
- fputs("ERROR: ", stderr);
+ fputs("[ERROR] ", stderr);
vfprintf(stderr, format, va);
putc('\n', stderr);
errno = errno_save;
va_start(va, format);
errno_save = errno;
- fputs("ERROR: ", stderr);
+ fflush(stdout);
+ fputs("[ERROR] ", stderr);
vfprintf(stderr, format, va);
fprintf(stderr, ": %s\n", strerror(errno_save));
errno = errno_save;
va_start(va, format);
errno_save = errno;
- fputs("WARNING: ", stderr);
+ fflush(stdout);
+ fputs("[WARNING] ", stderr);
vfprintf(stderr, format, va);
putc('\n', stderr);
errno = errno_save;
= "Tried to add an image with a name that is already in use",
[WIMLIB_ERR_INTEGRITY]
= "The WIM failed an integrity check",
+ [WIMLIB_ERR_INVALID_CAPTURE_CONFIG]
+ = "The capture configuration string was invalid",
[WIMLIB_ERR_INVALID_CHUNK_SIZE]
= "The WIM is compressed but does not have a chunk "
"size of 32768",
= "Tried to select an image that does not exist in the WIM",
[WIMLIB_ERR_INVALID_INTEGRITY_TABLE]
= "The WIM's integrity table is invalid",
+ [WIMLIB_ERR_INVALID_LOOKUP_TABLE_ENTRY]
+ = "An entry in the WIM's lookup table is invalid",
[WIMLIB_ERR_INVALID_PARAM]
= "An invalid parameter was given",
+ [WIMLIB_ERR_INVALID_RESOURCE_HASH]
+ = "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 is invalid",
[WIMLIB_ERR_LINK]
= "Failed to open a directory",
[WIMLIB_ERR_READ]
= "Could not read data from a file",
+ [WIMLIB_ERR_READLINK]
+ = "Could not read the target of a symbolic link",
[WIMLIB_ERR_RENAME]
= "Could not rename a file",
+ [WIMLIB_ERR_SPECIAL_FILE]
+ = "Encountered a special file that cannot be archived",
[WIMLIB_ERR_SPLIT_INVALID]
= "The WIM is part of an invalid split WIM",
[WIMLIB_ERR_SPLIT_UNSUPPORTED]
/* 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)
+ size_t *utf8_len_ret)
{
if (cd_utf16_to_utf8 == (iconv_t)(-1)) {
cd_utf16_to_utf8 = iconv_open("UTF-8", "UTF-16LE");
}
/* Fills @n bytes pointer to by @p with random numbers. */
-void randomize_byte_array(void *__p, size_t n)
+void randomize_byte_array(u8 *p, size_t n)
{
- u8 *p = __p;
-
if (!seeded) {
srand(time(NULL));
seeded = true;
p--;
/* Trailing slashes. */
- while ((p != path - 1) && *p == '/')
+ while (1) {
+ if (p == path - 1)
+ return "";
+ if (*p != '/')
+ break;
p--;
+ }
while ((p != path - 1) && *p != '/')
p--;
return p + 1;
}
+/*
+ * 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 char *base = path_basename(path);
+ const char *stream_name = strchr(base, ':');
+ 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.
p++;
}
}
+
+u64 get_wim_timestamp()
+{
+ struct timeval tv;
+ gettimeofday(&tv, NULL);
+ return timeval_to_wim_timestamp(&tv);
+}
+
+