From: Eric Biggers Date: Sun, 5 May 2013 03:00:34 +0000 (-0500) Subject: Add Windows implementations of pread(), pwrite(), writev() X-Git-Tag: v1.4.0~132 X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=161e7cdd2c0d3b3c1025da452a3192d381297465;ds=sidebyside Add Windows implementations of pread(), pwrite(), writev() --- diff --git a/src/util.c b/src/util.c index 485303eb..709ba465 100644 --- a/src/util.c +++ b/src/util.c @@ -39,12 +39,16 @@ #include #include #include -#include #include #ifdef __WIN32__ -#include "win32.h" +# include "win32.h" +# define pread win32_pread +# define pwrite win32_pwrite +# define writev win32_writev +#else +# include /* for writev() and `struct iovec' */ #endif static size_t diff --git a/src/util.h b/src/util.h index e32496a5..7bff1b5d 100644 --- a/src/util.h +++ b/src/util.h @@ -299,7 +299,15 @@ 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); diff --git a/src/win32.c b/src/win32.c index d403fba7..43336469 100644 --- a/src/win32.c +++ b/src/win32.c @@ -78,6 +78,279 @@ win32_error(u32 err_code) # define win32_error(err_code) #endif /* !ENABLE_ERROR_MESSAGES */ +static int +win32_error_to_errno(DWORD err_code) +{ + /* This mapping is that used in Cygwin. + * Some of these choices are arbitrary. */ + switch (err_code) { + case ERROR_ACCESS_DENIED: + return EACCES; + case ERROR_ACTIVE_CONNECTIONS: + return EAGAIN; + case ERROR_ALREADY_EXISTS: + return EEXIST; + case ERROR_BAD_DEVICE: + return ENODEV; + case ERROR_BAD_EXE_FORMAT: + return ENOEXEC; + case ERROR_BAD_NETPATH: + return ENOENT; + case ERROR_BAD_NET_NAME: + return ENOENT; + case ERROR_BAD_NET_RESP: + return ENOSYS; + case ERROR_BAD_PATHNAME: + return ENOENT; + case ERROR_BAD_PIPE: + return EINVAL; + case ERROR_BAD_UNIT: + return ENODEV; + case ERROR_BAD_USERNAME: + return EINVAL; + case ERROR_BEGINNING_OF_MEDIA: + return EIO; + case ERROR_BROKEN_PIPE: + return EPIPE; + case ERROR_BUSY: + return EBUSY; + case ERROR_BUS_RESET: + return EIO; + case ERROR_CALL_NOT_IMPLEMENTED: + return ENOSYS; + case ERROR_CANNOT_MAKE: + return EPERM; + case ERROR_CHILD_NOT_COMPLETE: + return EBUSY; + case ERROR_COMMITMENT_LIMIT: + return EAGAIN; + case ERROR_CRC: + return EIO; + case ERROR_DEVICE_DOOR_OPEN: + return EIO; + case ERROR_DEVICE_IN_USE: + return EAGAIN; + case ERROR_DEVICE_REQUIRES_CLEANING: + return EIO; + case ERROR_DIRECTORY: + return ENOTDIR; + case ERROR_DIR_NOT_EMPTY: + return ENOTEMPTY; + case ERROR_DISK_CORRUPT: + return EIO; + case ERROR_DISK_FULL: + return ENOSPC; +#ifdef ENOTUNIQ + case ERROR_DUP_NAME: + return ENOTUNIQ; +#endif + case ERROR_EAS_DIDNT_FIT: + return ENOSPC; + case ERROR_EAS_NOT_SUPPORTED: + return ENOTSUP; + case ERROR_EA_LIST_INCONSISTENT: + return EINVAL; + case ERROR_EA_TABLE_FULL: + return ENOSPC; + case ERROR_END_OF_MEDIA: + return ENOSPC; + case ERROR_EOM_OVERFLOW: + return EIO; + case ERROR_EXE_MACHINE_TYPE_MISMATCH: + return ENOEXEC; + case ERROR_EXE_MARKED_INVALID: + return ENOEXEC; + case ERROR_FILEMARK_DETECTED: + return EIO; + case ERROR_FILENAME_EXCED_RANGE: + return ENAMETOOLONG; + case ERROR_FILE_CORRUPT: + return EEXIST; + case ERROR_FILE_EXISTS: + return EEXIST; + case ERROR_FILE_INVALID: + return ENXIO; + case ERROR_FILE_NOT_FOUND: + return ENOENT; + case ERROR_HANDLE_DISK_FULL: + return ENOSPC; +#ifdef ENODATA + case ERROR_HANDLE_EOF: + return ENODATA; +#endif + case ERROR_INVALID_ADDRESS: + return EINVAL; + case ERROR_INVALID_AT_INTERRUPT_TIME: + return EINTR; + case ERROR_INVALID_BLOCK_LENGTH: + return EIO; + case ERROR_INVALID_DATA: + return EINVAL; + case ERROR_INVALID_DRIVE: + return ENODEV; + case ERROR_INVALID_EA_NAME: + return EINVAL; + case ERROR_INVALID_EXE_SIGNATURE: + return ENOEXEC; +#ifdef EBADRQC + case ERROR_INVALID_FUNCTION: + return EBADRQC; +#endif + case ERROR_INVALID_HANDLE: + return EBADF; + case ERROR_INVALID_NAME: + return ENOENT; + case ERROR_INVALID_PARAMETER: + return EINVAL; + case ERROR_INVALID_SIGNAL_NUMBER: + return EINVAL; + case ERROR_IOPL_NOT_ENABLED: + return ENOEXEC; + case ERROR_IO_DEVICE: + return EIO; + case ERROR_IO_INCOMPLETE: + return EAGAIN; + case ERROR_IO_PENDING: + return EAGAIN; + case ERROR_LOCK_VIOLATION: + return EBUSY; + case ERROR_MAX_THRDS_REACHED: + return EAGAIN; + case ERROR_META_EXPANSION_TOO_LONG: + return EINVAL; + case ERROR_MOD_NOT_FOUND: + return ENOENT; +#ifdef EMSGSIZE + case ERROR_MORE_DATA: + return EMSGSIZE; +#endif + case ERROR_NEGATIVE_SEEK: + return EINVAL; + case ERROR_NETNAME_DELETED: + return ENOENT; + case ERROR_NOACCESS: + return EFAULT; + case ERROR_NONE_MAPPED: + return EINVAL; + case ERROR_NONPAGED_SYSTEM_RESOURCES: + return EAGAIN; +#ifdef ENOLINK + case ERROR_NOT_CONNECTED: + return ENOLINK; +#endif + case ERROR_NOT_ENOUGH_MEMORY: + return ENOMEM; + case ERROR_NOT_OWNER: + return EPERM; +#ifdef ENOMEDIUM + case ERROR_NOT_READY: + return ENOMEDIUM; +#endif + case ERROR_NOT_SAME_DEVICE: + return EXDEV; + case ERROR_NOT_SUPPORTED: + return ENOSYS; + case ERROR_NO_DATA: + return EPIPE; + case ERROR_NO_DATA_DETECTED: + return EIO; +#ifdef ENOMEDIUM + case ERROR_NO_MEDIA_IN_DRIVE: + return ENOMEDIUM; +#endif +#ifdef ENMFILE + case ERROR_NO_MORE_FILES: + return ENMFILE; +#endif +#ifdef ENMFILE + case ERROR_NO_MORE_ITEMS: + return ENMFILE; +#endif + case ERROR_NO_MORE_SEARCH_HANDLES: + return ENFILE; + case ERROR_NO_PROC_SLOTS: + return EAGAIN; + case ERROR_NO_SIGNAL_SENT: + return EIO; + case ERROR_NO_SYSTEM_RESOURCES: + return EFBIG; + case ERROR_NO_TOKEN: + return EINVAL; + case ERROR_OPEN_FAILED: + return EIO; + case ERROR_OPEN_FILES: + return EAGAIN; + case ERROR_OUTOFMEMORY: + return ENOMEM; + case ERROR_PAGED_SYSTEM_RESOURCES: + return EAGAIN; + case ERROR_PAGEFILE_QUOTA: + return EAGAIN; + case ERROR_PATH_NOT_FOUND: + return ENOENT; + case ERROR_PIPE_BUSY: + return EBUSY; + case ERROR_PIPE_CONNECTED: + return EBUSY; +#ifdef ECOMM + case ERROR_PIPE_LISTENING: + return ECOMM; + case ERROR_PIPE_NOT_CONNECTED: + return ECOMM; +#endif + case ERROR_POSSIBLE_DEADLOCK: + return EDEADLOCK; + case ERROR_PRIVILEGE_NOT_HELD: + return EPERM; + case ERROR_PROCESS_ABORTED: + return EFAULT; + case ERROR_PROC_NOT_FOUND: + return ESRCH; +#ifdef ENONET + case ERROR_REM_NOT_LIST: + return ENONET; +#endif + case ERROR_SECTOR_NOT_FOUND: + return EINVAL; + case ERROR_SEEK: + return EINVAL; + case ERROR_SETMARK_DETECTED: + return EIO; + case ERROR_SHARING_BUFFER_EXCEEDED: + return ENOLCK; + case ERROR_SHARING_VIOLATION: + return EBUSY; + case ERROR_SIGNAL_PENDING: + return EBUSY; + case ERROR_SIGNAL_REFUSED: + return EIO; +#ifdef ELIBBAD + case ERROR_SXS_CANT_GEN_ACTCTX: + return ELIBBAD; +#endif + case ERROR_THREAD_1_INACTIVE: + return EINVAL; + case ERROR_TOO_MANY_LINKS: + return EMLINK; + case ERROR_TOO_MANY_OPEN_FILES: + return EMFILE; + case ERROR_WAIT_NO_CHILDREN: + return ECHILD; + case ERROR_WORKING_SET_QUOTA: + return EAGAIN; + case ERROR_WRITE_PROTECT: + return EROFS; + default: + return -1; + } +} + +static void +set_errno_from_GetLastError() +{ + errno = win32_error_to_errno(GetLastError()); +} + /* Pointers to functions that are not available on all targetted versions of * Windows (XP and later). NOTE: The WINAPI annotations seem to be important; I * assume it specifies a certain calling convention. */ @@ -1724,7 +1997,7 @@ win32_encrypted_import_cb(unsigned char *data, void *_ctx, len = min(len, wim_resource_size(lte) - ctx->offset); - if (read_partial_wim_resource_into_buf(lte, len, ctx->offset, data, false)) + if (read_partial_wim_resource_into_buf(lte, len, ctx->offset, data)) return ERROR_READ_FAULT; ctx->offset += len; @@ -2577,21 +2850,14 @@ fsync(int fd) HANDLE h; h = (HANDLE)_get_osfhandle(fd); - if (h == INVALID_HANDLE_VALUE) { - err = GetLastError(); - ERROR("Could not get Windows handle for file descriptor"); - win32_error(err); - errno = EBADF; - return -1; - } - if (!FlushFileBuffers(h)) { - err = GetLastError(); - ERROR("Could not flush file buffers to disk"); - win32_error(err); - errno = EIO; - return -1; - } + if (h == INVALID_HANDLE_VALUE) + goto err; + if (!FlushFileBuffers(h)) + goto err; return 0; +err: + set_errno_from_GetLastError(); + return -1; } /* Use the Win32 API to get the number of processors */ @@ -2610,8 +2876,8 @@ wchar_t * realpath(const wchar_t *path, wchar_t *resolved_path) { DWORD ret; - wimlib_assert(resolved_path == NULL); DWORD err; + wimlib_assert(resolved_path == NULL); ret = GetFullPathNameW(path, 0, NULL, NULL); if (!ret) { @@ -2631,8 +2897,7 @@ realpath(const wchar_t *path, wchar_t *resolved_path) } goto out; fail_win32: - win32_error(err); - errno = -1; + errno = win32_error_to_errno(err); out: return resolved_path; } @@ -2645,8 +2910,7 @@ win32_rename_replacement(const wchar_t *oldpath, const wchar_t *newpath) if (MoveFileExW(oldpath, newpath, MOVEFILE_REPLACE_EXISTING)) { return 0; } else { - /* As usual, the possible error values are not documented */ - errno = -1; + set_errno_from_GetLastError(); return -1; } } @@ -2687,9 +2951,7 @@ fail_close_handle: fail: if (err == NO_ERROR) err = GetLastError(); - ERROR("Can't truncate \"%ls\" to %"PRIu64" bytes", path, size); - win32_error(err); - errno = -1; + errno = win32_error_to_errno(err); return -1; } @@ -2709,4 +2971,85 @@ win32_strerror_r_replacement(int errnum, wchar_t *buf, size_t buflen) return 0; } +static int +do_pread_or_pwrite(int fd, void *buf, size_t count, off_t offset, + bool is_pwrite) +{ + HANDLE h; + LARGE_INTEGER orig_offset; + DWORD bytes_read_or_written; + LARGE_INTEGER relative_offset; + OVERLAPPED overlapped; + BOOL bret; + + wimlib_assert(count <= 0xffffffff); + + h = (HANDLE)_get_osfhandle(fd); + if (h == INVALID_HANDLE_VALUE) { + errno = EBADF; + return -1; + } + + /* Get original position */ + relative_offset.QuadPart = 0; + if (!SetFilePointerEx(h, relative_offset, &orig_offset, FILE_CURRENT)) + goto err; + + memset(&overlapped, 0, sizeof(overlapped)); + overlapped.Offset = offset; + overlapped.OffsetHigh = offset >> 32; + + /* Do the read or write at the specified offset */ + if (is_pwrite) + bret = WriteFile(h, buf, count, &bytes_read_or_written, &overlapped); + else + bret = ReadFile(h, buf, count, &bytes_read_or_written, &overlapped); + if (!bret) + goto err; + + /* Restore the original position */ + if (!SetFilePointerEx(h, orig_offset, NULL, FILE_BEGIN)) + goto err; + + return bytes_read_or_written; +err: + set_errno_from_GetLastError(); + return -1; +} + +/* Dumb Windows implementation of pread(). It temporarily changes the file + * offset, so it is not safe to use with readers/writers on the same file + * descriptor. */ +extern ssize_t +win32_pread(int fd, void *buf, size_t count, off_t offset) +{ + return do_pread_or_pwrite(fd, buf, count, offset, false); +} + +/* Dumb Windows implementation of pwrite(). It temporarily changes the file + * offset, so it is not safe to use with readers/writers on the same file + * descriptor. */ +extern ssize_t +win32_pwrite(int fd, const void *buf, size_t count, off_t offset) +{ + return do_pread_or_pwrite(fd, (void*)buf, count, offset, true); +} + +/* Dumb Windows implementation of writev(). It writes the vectors one at a + * time. */ +extern ssize_t +win32_writev(int fd, const struct iovec *iov, int iovcnt) +{ + size_t total_bytes_written = 0; + for (int i = 0; i < iovcnt; i++) { + size_t bytes_written; + + bytes_written = full_write(fd, iov[i].iov_base, iov[i].iov_len); + total_bytes_written += bytes_written; + if (bytes_written != iov[i].iov_len) + break; + } + return total_bytes_written; +} + #endif /* __WIN32__ */ diff --git a/src/win32.h b/src/win32.h index e525ccb4..51e2f3f2 100644 --- a/src/win32.h +++ b/src/win32.h @@ -77,4 +77,13 @@ win32_global_cleanup(); extern int win32_strerror_r_replacement(int errnum, tchar *buf, size_t buflen); +extern ssize_t +win32_pread(int fd, void *buf, size_t count, off_t offset); + +extern ssize_t +win32_pwrite(int fd, const void *buf, size_t count, off_t offset); + +extern ssize_t +win32_writev(int fd, const struct iovec *iov, int iovcnt); + #endif /* _WIMLIB_WIN32_H */ diff --git a/src/write.c b/src/write.c index 16ce531a..1dd35e52 100644 --- a/src/write.c +++ b/src/write.c @@ -48,6 +48,7 @@ #endif #include +#include #include #ifdef WITH_NTFS_3G @@ -65,6 +66,10 @@ #include +#ifndef __WIN32__ +# include /* for `struct iovec' */ +#endif + /* Chunk table that's located at the beginning of each compressed resource in * the WIM. (This is not the on-disk format; the on-disk format just has an * array of offsets.) */ @@ -1833,7 +1838,7 @@ lock_wim(WIMStruct *w, filedes_t fd) static int open_wim_writable(WIMStruct *w, const tchar *path, int open_flags) { - w->out_fd = open(path, open_flags, 0644); + w->out_fd = topen(path, open_flags, 0644); if (w->out_fd == INVALID_FILEDES) { ERROR_WITH_ERRNO("Failed to open `%"TS"' for writing", path); return WIMLIB_ERR_OPEN;