summaryrefslogtreecommitdiffstats
path: root/windows.c
diff options
context:
space:
mode:
authorGravatar Lubomir I. Ivanov <neolit123@gmail.com>2013-12-19 15:00:50 +0200
committerGravatar Dirk Hohndel <dirk@hohndel.org>2013-12-19 07:28:20 -0800
commitf487953ad360b941fe225418cd3e5801d5a6508b (patch)
treea284c375543c2de073d4df26500a35d7c30afbe6 /windows.c
parentcad0d45fe17abedcb86bcdae6896d42324efbf96 (diff)
downloadsubsurface-f487953ad360b941fe225418cd3e5801d5a6508b.tar.gz
Files: add wrappers for certain open() methods
Due to filepath encoding issues on win32 we need wrappers for: - open() - fopen() - opendir() - zip_open() (this is readonly on win32) Patch only declares/defines the wrappers in dive.h, windows.c, linux.c, macos.c. Suggestions-by: Thiago Macieira <thiago@macieira.org> Suggestions-by: Jef Driesen <jefdriesen@telenet.be> Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'windows.c')
-rw-r--r--windows.c93
1 files changed, 93 insertions, 0 deletions
diff --git a/windows.c b/windows.c
index ff6e2e036..536205c39 100644
--- a/windows.c
+++ b/windows.c
@@ -4,6 +4,11 @@
#include "display.h"
#include <windows.h>
#include <shlobj.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <assert.h>
+#include <dirent.h>
+#include <zip.h>
const char system_divelist_default_font[] = "Sans 8";
@@ -78,3 +83,91 @@ int enumerate_devices (device_callback_t callback, void *userdata)
RegCloseKey(hKey);
return index;
}
+
+/* this function converts a utf-8 string to win32's utf-16 2 byte string.
+ * the caller function should manage the allocated memory.
+ */
+static wchar_t *utf8_to_utf16_fl(const char *utf8, char *file, int line)
+{
+ assert(utf8 != NULL);
+ assert(file != NULL);
+ assert(line);
+ /* estimate buffer size */
+ const int sz = strlen(utf8) + 1;
+ wchar_t *utf16 = (wchar_t *)malloc(sizeof(wchar_t) * sz);
+ if (!utf16) {
+ fprintf(stderr, "%s:%d: %s %d.", file, line, "cannot allocate buffer of size", sz);
+ return NULL;
+ }
+ if (MultiByteToWideChar(CP_UTF8, 0, utf8, -1, utf16, sz))
+ return utf16;
+ fprintf(stderr, "%s:%d: %s", file, line, "cannot convert string.");
+ free((void *)utf16);
+ return NULL;
+}
+
+#define utf8_to_utf16(s) utf8_to_utf16_fl(s, __FILE__, __LINE__)
+
+/* bellow we provide a set of wrappers for some I/O functions to use wchar_t.
+ * on win32 this solves the issue that we need paths to be utf-16 encoded.
+ */
+int subsurface_open(const char *path, int oflags, mode_t mode)
+{
+ int ret = -1;
+ wchar_t *wpath = utf8_to_utf16(path);
+ if (wpath) {
+ ret = _wopen(wpath, oflags, mode);
+ free((void *)wpath);
+ return ret;
+ }
+ return ret;
+}
+
+FILE *subsurface_fopen(const char *path, const char *mode)
+{
+ FILE *ret = NULL;
+ wchar_t *wpath = utf8_to_utf16(path);
+ if (wpath) {
+ const int len = strlen(mode);
+ wchar_t wmode[len + 1];
+ for (int i = 0; i < len; i++)
+ wmode[i] = (wchar_t)mode[i];
+ wmode[len] = 0;
+ ret = _wfopen(wpath, wmode);
+ free((void *)wpath);
+ return ret;
+ }
+ return ret;
+}
+
+/* here we return a void pointer instead of _WDIR or DIR pointer */
+void *subsurface_opendir(const char *path)
+{
+ _WDIR *ret = NULL;
+ wchar_t *wpath = utf8_to_utf16(path);
+ if (wpath) {
+ ret = _wopendir(wpath);
+ free((void *)wpath);
+ return (void *)ret;
+ }
+ return (void *)ret;
+}
+
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
+
+/* we use zip_fdopen since zip_open doesn't have a wchar_t version */
+struct zip *subsurface_zip_open_readonly(const char *path, int flags, int *errorp)
+{
+ int fd = subsurface_open(path, O_RDONLY | O_BINARY, 0);
+ struct zip *ret = zip_fdopen(fd, flags, errorp);
+ if (!ret)
+ close(fd);
+ return ret;
+}
+
+int subsurface_zip_close(struct zip *zip)
+{
+ return zip_close(zip);
+}