Cleanup: move overflow safe alloc code into libsquashfs

There were only a hand full of instances outside libsquashfs that used
the alloc code. In most cases, the thing allocated hat its size derived
from something already in memory anyway, so it is safe to assume its
size fits into a size_t.

At the same time, the opencoded Windows path conversion functions are
all unified into a single helper function.

Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>

1 files changed, 3 insertions, 18 deletions

diff --git a/lib/common/mkdir_p.c b/lib/common/mkdir_p.c
index a568567..0413495 100644
--- a/lib/common/mkdir_p.c
+++ b/lib/common/mkdir_p.c
@@ -12,9 +12,6 @@
 #include <errno.h>
 
 #ifdef _WIN32
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
 /*
   Supported paths:
    - <letter>:\ <absolute path>
@@ -85,25 +82,13 @@ static WCHAR *skip_prefix(WCHAR *ptr)
 int mkdir_p(const char *path)
 {
 	WCHAR *wpath, *ptr, *end;
-	DWORD length, error;
+	DWORD error;
 	bool done;
 
-	length = MultiByteToWideChar(CP_UTF8, 0, path, -1, NULL, 0) + 1;
-	wpath = alloc_array(sizeof(wpath[0]), length);
 
-	if (wpath == NULL) {
-		fprintf(stderr, "Converting UTF-8 path to UTF-16: %ld\n",
-			GetLastError());
+	wpath = path_to_windows(path);
+	if (wpath == NULL)
 		return -1;
-	}
-
-	MultiByteToWideChar(CP_UTF8, 0, path, -1, wpath, length);
-	wpath[length - 1] = '\0';
-
-	for (ptr = wpath; *ptr != '\0'; ++ptr) {
-		if (*ptr == '/')
-			*ptr = '\\';
-	}
 
 	ptr = skip_prefix(wpath);
 	if (ptr == NULL) {