X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=programs%2Fimagex-win32.c;h=6ff838ca63e845a7053dbc7a2a984b9fafb9a491;hp=24f99108e6ec30d948468c9fd7e4c54ceae69655;hb=151463861a212a1ae7deae7e9844cd0cd1c4343c;hpb=b79609d7660ef30bdfba091f839e61b256059a80

diff --git a/programs/imagex-win32.c b/programs/imagex-win32.c
index 24f99108..6ff838ca 100644
--- a/programs/imagex-win32.c
+++ b/programs/imagex-win32.c
@@ -1,127 +1,16 @@
-
-/* Replacements for functions needed specifically by the 'imagex' program in
- * Windows native builds; also, Windows-specific code to acquire and release
- * privileges needed to backup and restore files */
+/* Windows-specific code for wimlib-imagex.  */
 
 #ifndef __WIN32__
 #  error "This file contains Windows code"
 #endif
 
 #include "imagex-win32.h"
-#include <windows.h>
-#include <errno.h>
-#include <string.h>
-#include <assert.h>
-#include <stdio.h>
 #include <fcntl.h>
 #include <io.h>
+#include <stdio.h>
+#include <windows.h>
 
-/* Replacement for glob() in Windows native builds that operates on wide
- * characters. */
-int
-win32_wglob(const wchar_t *pattern, int flags,
-	    int (*errfunc)(const wchar_t *epath, int eerrno),
-	    glob_t *pglob)
-{
-	WIN32_FIND_DATAW dat;
-	DWORD err;
-	HANDLE hFind;
-	int ret;
-	size_t nspaces;
-
-	const wchar_t *backslash, *end_slash;
-	size_t prefix_len;
-
-	backslash = wcsrchr(pattern, L'\\');
-	end_slash = wcsrchr(pattern, L'/');
-
-	if (backslash > end_slash)
-		end_slash = backslash;
-
-	if (end_slash)
-		prefix_len = end_slash - pattern + 1;
-	else
-		prefix_len = 0;
-
-	/* This function does not support all functionality of the POSIX glob(),
-	 * so make sure the parameters are consistent with supported
-	 * functionality. */
-	assert(errfunc == NULL);
-	assert((flags & GLOB_ERR) == GLOB_ERR);
-	assert((flags & ~(GLOB_NOSORT | GLOB_ERR)) == 0);
-
-	hFind = FindFirstFileW(pattern, &dat);
-	if (hFind == INVALID_HANDLE_VALUE) {
-		err = GetLastError();
-		if (err == ERROR_FILE_NOT_FOUND) {
-			errno = 0;
-			return GLOB_NOMATCH;
-		} else {
-			/* The other possible error codes for FindFirstFile()
-			 * are undocumented. */
-			errno = EIO;
-			return GLOB_ABORTED;
-		}
-	}
-	pglob->gl_pathc = 0;
-	pglob->gl_pathv = NULL;
-	nspaces = 0;
-	do {
-		wchar_t *path;
-		if (pglob->gl_pathc == nspaces) {
-			size_t new_nspaces;
-			wchar_t **pathv;
-
-		 	new_nspaces = nspaces * 2 + 1;	
-			pathv = realloc(pglob->gl_pathv,
-					new_nspaces * sizeof(pglob->gl_pathv[0]));
-			if (!pathv)
-				goto oom;
-			pglob->gl_pathv = pathv;
-			nspaces = new_nspaces;
-		}
-		size_t filename_len = wcslen(dat.cFileName);
-		size_t len_needed = prefix_len + filename_len;
-
-		path = malloc((len_needed + 1) * sizeof(wchar_t));
-		if (!path)
-			goto oom;
-
-		wmemcpy(path, pattern, prefix_len);
-		wmemcpy(path + prefix_len, dat.cFileName, filename_len + 1);
-		pglob->gl_pathv[pglob->gl_pathc++] = path;
-	} 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;
-		ret = GLOB_ABORTED;
-		goto fail_globfree;
-	}
-oom:
-	CloseHandle(hFind);
-	errno = ENOMEM;
-	ret = GLOB_NOSPACE;
-fail_globfree:
-	globfree(pglob);
-	return ret;
-}
-
-void
-globfree(glob_t *pglob)
-{
-	size_t i;
-	for (i = 0; i < pglob->gl_pathc; i++)
-		free(pglob->gl_pathv[i]);
-	free(pglob->gl_pathv);
-}
-
-/* Convert a string from the "current Windows codepage" to UTF-16LE. */
+/* Convert a string from the "current Windows codepage" to UTF-16LE.  */
 wchar_t *
 win32_mbs_to_wcs(const char *mbs, size_t mbs_nbytes, size_t *num_wchars_ret)
 {
@@ -167,29 +56,46 @@ L"       Maybe try converting your text file to UTF-16LE?\n"
 	return NULL;
 }
 
-static inline bool
-is_path_separator(wchar_t c)
+/* Set a file descriptor to binary mode.  */
+void set_fd_to_binary_mode(int fd)
 {
-	return c == L'/' || c == L'\\';
+	_setmode(fd, _O_BINARY);
 }
 
-/* basename() (modifying, trailing-slash stripping version) for wide-character
- * strings. */
-wchar_t *
-win32_wbasename(wchar_t *path)
-{
-	wchar_t *p = wcschr(path, L'\0');
+#include <sddl.h>
 
-	p--;
-	while (p >= path && is_path_separator(*p))
-		*p-- = '\0';
-	while (p >= path && !is_path_separator(*p))
-		p--;
-	p++;
-	return p;
+static wchar_t *
+get_security_descriptor_string(PSECURITY_DESCRIPTOR desc)
+{
+	wchar_t *str = NULL;
+	/* 52 characters!!!  */
+	ConvertSecurityDescriptorToStringSecurityDescriptorW(
+			desc,
+			SDDL_REVISION_1,
+			OWNER_SECURITY_INFORMATION |
+				GROUP_SECURITY_INFORMATION |
+				DACL_SECURITY_INFORMATION |
+				SACL_SECURITY_INFORMATION,
+			&str,
+			NULL);
+	return str;
 }
 
-void set_fd_to_binary_mode(int fd)
+void
+win32_print_security_descriptor(const uint8_t *sd, size_t size)
 {
-	_setmode(fd, _O_BINARY);
+	wchar_t *str;
+	const wchar_t *printstr;
+
+	/* 'size' is ignored here due to the crappy Windows APIs.  Oh well, this
+	 * is just for debugging anyway.  */
+	str = get_security_descriptor_string((PSECURITY_DESCRIPTOR)sd);
+	if (str)
+		printstr = str;
+	else
+		printstr = L"(invalid)";
+
+	wprintf(L"Security Descriptor = %ls\n", printstr);
+
+	LocalFree(str);
 }