X-Git-Url: https://wimlib.net/git/?a=blobdiff_plain;ds=inline;f=src%2Fwin32_replacements.c;h=0e1023f6113e11c87f5416e584f3cc7f1bc25f58;hb=e3dc3c76cf0896eb98f455f2538999d23f95b61a;hp=610afbdf448f78bb00c4e37359aaca85ea3ecae8;hpb=e176e9731e696562bab8de7b9bd34c019deef3e8;p=wimlib

diff --git a/src/win32_replacements.c b/src/win32_replacements.c
index 610afbdf..0e1023f6 100644
--- a/src/win32_replacements.c
+++ b/src/win32_replacements.c
@@ -37,6 +37,7 @@
 #include "wimlib/file_io.h"
 #include "wimlib/glob.h"
 #include "wimlib/error.h"
+#include "wimlib/wildcard.h"
 #include "wimlib/util.h"
 
 /* Replacement for POSIX fsync() */
@@ -188,16 +189,6 @@ err_set_errno:
 	return -1;
 }
 
-/* Replacement for POSIX fnmatch() (partial functionality only) */
-int
-fnmatch(const wchar_t *pattern, const wchar_t *string, int flags)
-{
-	if (PathMatchSpecW(string, pattern))
-		return 0;
-	else
-		return FNM_NOMATCH;
-}
-
 /* truncate() replacement */
 int
 win32_truncate_replacement(const wchar_t *path, off_t size)
@@ -310,33 +301,6 @@ pwrite(int fd, const void *buf, size_t count, off_t offset)
 	return do_pread_or_pwrite(fd, (void*)buf, count, offset, true);
 }
 
-#if 0
-/* Dumb Windows implementation of writev().  It writes the vectors one at a
- * time. */
-ssize_t writev(int fd, const struct iovec *iov, int iovcnt)
-{
-	ssize_t total_bytes_written = 0;
-
-	if (iovcnt <= 0) {
-		errno = EINVAL;
-		return -1;
-	}
-	for (int i = 0; i < iovcnt; i++) {
-		ssize_t bytes_written;
-
-		bytes_written = write(fd, iov[i].iov_base, iov[i].iov_len);
-		if (bytes_written >= 0)
-			total_bytes_written += bytes_written;
-		if (bytes_written != iov[i].iov_len) {
-			if (total_bytes_written == 0)
-				total_bytes_written = -1;
-			break;
-		}
-	}
-	return total_bytes_written;
-}
-#endif
-
 int
 win32_get_file_and_vol_ids(const wchar_t *path, u64 *ino_ret, u64 *dev_ret)
 {
@@ -379,6 +343,7 @@ win32_wglob(const wchar_t *pattern, int flags,
 	HANDLE hFind;
 	int ret;
 	size_t nspaces;
+	int errno_save;
 
 	const wchar_t *backslash, *end_slash;
 	size_t prefix_len;
@@ -408,9 +373,7 @@ win32_wglob(const wchar_t *pattern, int flags,
 			errno = 0;
 			return GLOB_NOMATCH;
 		} else {
-			/* The other possible error codes for FindFirstFile()
-			 * are undocumented. */
-			errno = EIO;
+			set_errno_from_win32_error(err);
 			return GLOB_ABORTED;
 		}
 	}
@@ -444,22 +407,21 @@ win32_wglob(const wchar_t *pattern, int flags,
 	} while (FindNextFileW(hFind, &dat));
 	err = GetLastError();
 	CloseHandle(hFind);
-	if (err == ERROR_NO_MORE_FILES) {
-		errno = 0;
-		return 0;
-	} else {
-		/* Other possible error codes for FindNextFile() are
-		 * undocumented */
-		errno = EIO;
+	if (err != ERROR_NO_MORE_FILES) {
+		set_errno_from_win32_error(err);
 		ret = GLOB_ABORTED;
 		goto fail_globfree;
 	}
+	return 0;
+
 oom:
 	CloseHandle(hFind);
 	errno = ENOMEM;
 	ret = GLOB_NOSPACE;
 fail_globfree:
+	errno_save = errno;
 	globfree(pglob);
+	errno = errno_save;
 	return ret;
 }