#include <string.h>
#define _GNU_SOURCE
-#include <unistd.h>
-#include "wimlib_internal.h"
#include "endianness.h"
#include "timestamp.h"
+#include "wimlib_internal.h"
#include <ctype.h>
#include <errno.h>
-#include <stdlib.h>
#include <stdarg.h>
+#include <stdlib.h>
+#include <unistd.h>
+
#ifdef __WIN32__
-#include "win32.h"
+# include "win32.h"
+# define pread win32_pread
+# define pwrite win32_pwrite
+# define writev win32_writev
+#else
+# include <sys/uio.h> /* for writev() and `struct iovec' */
#endif
static size_t
= 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_IS_DIRECTORY]
+ = T("One of the specified paths to delete was a directory"),
[WIMLIB_ERR_LIBXML_UTF16_HANDLER_NOT_AVAILABLE]
= T("libxml2 was unable to find a character encoding conversion handler "
"for UTF-16LE"),
= T("Ran out of memory"),
[WIMLIB_ERR_NOTDIR]
= 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_NO_FILENAME]
= T("The WIM is not identified with a filename"),
[WIMLIB_ERR_NTFS_3G]
= T("Failed to open a file"),
[WIMLIB_ERR_OPENDIR]
= T("Failed to open a directory"),
+ [WIMLIB_ERR_PATH_DOES_NOT_EXIST]
+ = T("The path does not exist in the WIM image"),
[WIMLIB_ERR_READ]
= T("Could not read data from a file"),
[WIMLIB_ERR_READLINK]
}
}
-/* Write @n bytes from @buf to the file descriptor @fd, retrying on internupt
- * and on short writes.
- *
- * Returns short count and set errno on failure. */
+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_write(int fd, const void *buf, size_t n)
+full_read(int fd, void *buf, size_t count)
{
- const void *p = buf;
- ssize_t ret;
- ssize_t total = 0;
+ ssize_t bytes_read;
+ size_t bytes_remaining;
- while (total != n) {
- ret = write(fd, p, n);
- if (ret <= 0) {
- if (errno == EINTR)
- continue;
- if (ret == 0)
+ 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;
}
- total += ret;
- p += ret;
}
- return total;
+ return count - bytes_remaining;
}
-/* Read @n bytes from the file descriptor @fd to the buffer @buf, retrying on
- * interrupt and on short reads.
- *
- * Returns short count and set errno on failure. */
+/* Like write(), but keep trying until everything has been written or we know
+ * for sure that there was an error. */
size_t
-full_read(int fd, void *buf, size_t n)
+full_write(int fd, const void *buf, size_t count)
{
- size_t bytes_remaining = n;
- while (bytes_remaining) {
- ssize_t bytes_read = read(fd, buf, bytes_remaining);
- if (bytes_read <= 0) {
+ 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;
- if (bytes_read == 0)
- errno = EIO;
break;
}
- bytes_remaining -= bytes_read;
- buf += bytes_read;
}
- return n - bytes_remaining;
+ return count - bytes_remaining;
}
-/* Read @n bytes from the file descriptor @fd at the offset @offset to the
- * buffer @buf, retrying on interrupt and on short reads.
- *
- * Returns short count and set errno on failure. */
+/* 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 nbyte, off_t offset)
+full_pread(int fd, void *buf, size_t count, off_t offset)
{
- size_t bytes_remaining = nbyte;
ssize_t bytes_read;
+ size_t bytes_remaining;
- while (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 (errno == EINTR)
- continue;
if (bytes_read == 0)
errno = EIO;
+ else if (errno == EINTR)
+ continue;
break;
}
- bytes_remaining -= bytes_read;
- buf += bytes_read;
- offset += bytes_read;
}
- return nbyte - bytes_remaining;
+ return count - bytes_remaining;
}
/* Like pwrite(), but keep trying until everything has been written or we know
size_t
full_pwrite(int fd, const void *buf, size_t count, off_t offset)
{
- ssize_t bytes_remaining = count;
ssize_t bytes_written;
+ size_t bytes_remaining;
- while (bytes_remaining > 0) {
+ 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 (bytes_written < 0) {
if (errno == EINTR)
continue;
- if (bytes_written == 0)
- errno = EIO;
break;
}
- bytes_remaining -= bytes_written;
- buf += bytes_written;
- offset += bytes_written;
}
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(filedes_t fd)
+filedes_offset(int fd)
{
return lseek(fd, 0, SEEK_CUR);
}