X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=src%2Fwin32_replacements.c;h=3082255033b3123cec78f70d965df4cb16e9c39c;hp=0e1023f6113e11c87f5416e584f3cc7f1bc25f58;hb=32614c9f026be20f0336df3053b91090dc53297f;hpb=eeb96703721a2ba6c64ec63f2c330515e8992b4f

diff --git a/src/win32_replacements.c b/src/win32_replacements.c
index 0e1023f6..30822550 100644
--- a/src/win32_replacements.c
+++ b/src/win32_replacements.c
@@ -30,14 +30,14 @@
 
 #include <errno.h>
 #include <pthread.h>
-#include <shlwapi.h> /* for PathMatchSpecW() */
+#include <io.h>	/* for _get_osfhandle()  */
+#include <fcntl.h>
+
 #include "wimlib/win32_common.h"
 
 #include "wimlib/assert.h"
-#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() */
@@ -189,41 +189,10 @@ err_set_errno:
 	return -1;
 }
 
-/* truncate() replacement */
-int
-win32_truncate_replacement(const wchar_t *path, off_t size)
-{
-	DWORD err = NO_ERROR;
-	LARGE_INTEGER liOffset;
-
-	HANDLE h = win32_open_existing_file(path, GENERIC_WRITE);
-	if (h == INVALID_HANDLE_VALUE)
-		goto fail;
-
-	liOffset.QuadPart = size;
-	if (!SetFilePointerEx(h, liOffset, NULL, FILE_BEGIN))
-		goto fail_close_handle;
-
-	if (!SetEndOfFile(h))
-		goto fail_close_handle;
-	CloseHandle(h);
-	return 0;
-
-fail_close_handle:
-	err = GetLastError();
-	CloseHandle(h);
-fail:
-	if (err == NO_ERROR)
-		err = GetLastError();
-	set_errno_from_win32_error(err);
-	return -1;
-}
-
-
 /* This really could be replaced with _wcserror_s, but this doesn't seem to
  * actually be available in MSVCRT.DLL on Windows XP (perhaps it's statically
  * linked in by Visual Studio...?). */
-extern int
+int
 win32_strerror_r_replacement(int errnum, wchar_t *buf, size_t buflen)
 {
 	static pthread_mutex_t strerror_lock = PTHREAD_MUTEX_INITIALIZER;
@@ -301,36 +270,6 @@ pwrite(int fd, const void *buf, size_t count, off_t offset)
 	return do_pread_or_pwrite(fd, (void*)buf, count, offset, true);
 }
 
-int
-win32_get_file_and_vol_ids(const wchar_t *path, u64 *ino_ret, u64 *dev_ret)
-{
-	HANDLE h;
-	BY_HANDLE_FILE_INFORMATION file_info;
-	int ret;
-	DWORD err;
-
-	h = win32_open_existing_file(path, FILE_READ_ATTRIBUTES);
-	if (h == INVALID_HANDLE_VALUE) {
-		ret = WIMLIB_ERR_OPEN;
-		goto out;
-	}
-
-	if (!GetFileInformationByHandle(h, &file_info)) {
-		ret = WIMLIB_ERR_STAT;
-	} else {
-		*ino_ret = ((u64)file_info.nFileIndexHigh << 32) |
-			    (u64)file_info.nFileIndexLow;
-		*dev_ret = file_info.dwVolumeSerialNumber;
-		ret = 0;
-	}
-	err = GetLastError();
-	CloseHandle(h);
-	SetLastError(err);
-out:
-	set_errno_from_GetLastError();
-	return ret;
-}
-
 /* Replacement for glob() in Windows native builds that operates on wide
  * characters.  */
 int
@@ -434,4 +373,33 @@ globfree(glob_t *pglob)
 	FREE(pglob->gl_pathv);
 }
 
+/* Replacement for fopen(path, "a") that doesn't prevent other processes from
+ * reading the file  */
+FILE *
+win32_open_logfile(const wchar_t *path)
+{
+	HANDLE h;
+	int fd;
+	FILE *fp;
+
+	h = CreateFile(path, FILE_APPEND_DATA, FILE_SHARE_VALID_FLAGS,
+		       NULL, OPEN_ALWAYS, 0, NULL);
+	if (h == INVALID_HANDLE_VALUE)
+		return NULL;
+
+	fd = _open_osfhandle((intptr_t)h, O_APPEND);
+	if (fd < 0) {
+		CloseHandle(h);
+		return NULL;
+	}
+
+	fp = fdopen(fd, "a");
+	if (!fp) {
+		close(fd);
+		return NULL;
+	}
+
+	return fp;
+}
+
 #endif /* __WIN32__ */