office-gobmx/external/hyphen/hyphen-fdo48017-wfopen.patch
László Németh d7374d4812 fdo#80363 _wfullpath in MyThes and Hyphen
Change-Id: I4232040d4c62220389ca356797d18b1c87673e64
2014-07-20 13:46:57 +02:00

49 lines
1.3 KiB
Diff

diff -u hyphen/hyphen.c build/hyphen/hyphen.c
--- hyphen/hyphen.c 2014-05-22 00:28:13.164587974 +0200
+++ build/hyphen/hyphen.c 2015-05-22 11:08:55.000000000 +0200
@@ -44,6 +44,11 @@
#include <unistd.h> /* for exit */
#endif
+#ifdef _WIN32
+#include <windows.h>
+#include <wchar.h>
+#endif
+
#define noVERBOSE
/* calculate hyphenmin values with long ligature length (2 or 3 characters
@@ -371,12 +376,32 @@
}
}
+FILE * hnj_fopen(const char * path, const char * mode) {
+#ifdef _WIN32
+#define WIN32_LONG_PATH_PREFIX "\\\\?\\"
+ if (strncmp(path, WIN32_LONG_PATH_PREFIX, 4) == 0) {
+ int len = MultiByteToWideChar(CP_UTF8, 0, path, -1, NULL, 0);
+ wchar_t *buff = (wchar_t *) malloc(len * sizeof(wchar_t));
+ wchar_t *buff2 = (wchar_t *) malloc(len * sizeof(wchar_t));
+ FILE * f = NULL;
+ MultiByteToWideChar(CP_UTF8, 0, path, -1, buff, len);
+ if (_wfullpath( buff2, buff, len ) != NULL) {
+ f = _wfopen(buff2, (strcmp(mode, "r") == 0) ? L"r" : L"rb");
+ }
+ free(buff);
+ free(buff2);
+ return f;
+ }
+#endif
+ return fopen(path, mode);
+}
+
HyphenDict *
hnj_hyphen_load (const char *fn)
{
HyphenDict *result;
FILE *f;
- f = fopen (fn, "r");
+ f = hnj_fopen (fn, "r");
if (f == NULL)
return NULL;