Move errno translation to win32_replacements.c

diff --git a/include/wimlib/win32_common.h b/include/wimlib/win32_common.h
index f27a2d71be285a634185de1d0ba263a73656e370..324285138006ecb0edbe055cce89ccb65734e31f 100644 (file)
--- a/include/wimlib/win32_common.h
+++ b/include/wimlib/win32_common.h
@@ -11,12 +11,6 @@
 #include "wimlib/types.h"
 #include "wimlib/win32.h"
 
 #include "wimlib/types.h"
 #include "wimlib/win32.h"
 

-extern void
-set_errno_from_GetLastError(void);
-
-extern void
-set_errno_from_win32_error(DWORD err);
-

 /* ntdll functions  */
 
 extern NTSTATUS (WINAPI *func_NtCreateFile)(PHANDLE FileHandle,
 /* ntdll functions  */
 
 extern NTSTATUS (WINAPI *func_NtCreateFile)(PHANDLE FileHandle,

diff --git a/src/win32_common.c b/src/win32_common.c
index bc92fe33a51258d170db6cb5d92e9a11f0c70bd9..6d75c47e26b44c12e79c1576d6b588b9ec99fea2 100644 (file)
--- a/src/win32_common.c
+++ b/src/win32_common.c
@@ -25,294 +25,11 @@
 #  include "config.h"
 #endif
 
 #  include "config.h"
 #endif
 

-#include <errno.h>
-

 #include "wimlib/win32_common.h"
 
 #include "wimlib/error.h"
 #include "wimlib/util.h"
 
 #include "wimlib/win32_common.h"
 
 #include "wimlib/error.h"
 #include "wimlib/util.h"
 

-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;
-#ifdef ENOTSUP
-       case ERROR_EAS_NOT_SUPPORTED:
-               return ENOTSUP;
-#endif
-       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;
-       }
-}
-
-void
-set_errno_from_win32_error(DWORD err)
-{
-       errno = win32_error_to_errno(err);
-}
-
-void
-set_errno_from_GetLastError(void)
-{
-       set_errno_from_win32_error(GetLastError());
-}
-

 static bool
 win32_modify_privilege(const wchar_t *privilege, bool enable)
 {
 static bool
 win32_modify_privilege(const wchar_t *privilege, bool enable)
 {

diff --git a/src/win32_replacements.c b/src/win32_replacements.c
index ebf6e20e6cc2d4414b6270df65f7a3a214893982..89289b0e056ab708a3696bee00094073c69876db 100644 (file)
--- a/src/win32_replacements.c
+++ b/src/win32_replacements.c
@@ -38,6 +38,287 @@
 #include "wimlib/error.h"
 #include "wimlib/util.h"
 
 #include "wimlib/error.h"
 #include "wimlib/util.h"
 

+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;
+#ifdef ENOTSUP
+       case ERROR_EAS_NOT_SUPPORTED:
+               return ENOTSUP;
+#endif
+       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_win32_error(DWORD err)
+{
+       errno = win32_error_to_errno(err);
+}
+
+static void
+set_errno_from_GetLastError(void)
+{
+       set_errno_from_win32_error(GetLastError());
+}
+

 /* Replacement for POSIX fsync() */
 int
 fsync(int fd)
 /* Replacement for POSIX fsync() */
 int
 fsync(int fd)