From 6d06aa8ba83b7629603cd86cf14a63c432ce268f Mon Sep 17 00:00:00 2001
From: László Németh <nemeth@numbertext.org>
Date: Thu, 22 May 2014 12:27:44 +0200
Subject: fdo#48017 WIN32 long path support in Hyphen and MyThes

Change-Id: Ifb068efb553ed24a7caf65dbab28726bdeced0e6
---
 external/hyphen/UnpackedTarball_hyphen.mk    |  1 +
 external/hyphen/hyphen-fdo48017-wfopen.patch | 46 ++++++++++++++++++
 external/mythes/UnpackedTarball_mythes.mk    |  1 +
 external/mythes/mythes-fdo48017-wfopen.patch | 72 ++++++++++++++++++++++++++++
 4 files changed, 120 insertions(+)
 create mode 100644 external/hyphen/hyphen-fdo48017-wfopen.patch
 create mode 100644 external/mythes/mythes-fdo48017-wfopen.patch

(limited to 'external')

diff --git a/external/hyphen/UnpackedTarball_hyphen.mk b/external/hyphen/UnpackedTarball_hyphen.mk
index 5cd0af80bd22..c112b3597338 100644
--- a/external/hyphen/UnpackedTarball_hyphen.mk
+++ b/external/hyphen/UnpackedTarball_hyphen.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,hyphen,\
 	external/hyphen/hyphen-android.patch \
 	external/hyphen/hyphen-rhmin.patch \
 	external/hyphen/hyphen-build.patch \
+	external/hyphen/hyphen-fdo48017-wfopen.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/hyphen/hyphen-fdo48017-wfopen.patch b/external/hyphen/hyphen-fdo48017-wfopen.patch
new file mode 100644
index 000000000000..9a73b4a75025
--- /dev/null
+++ b/external/hyphen/hyphen-fdo48017-wfopen.patch
@@ -0,0 +1,46 @@
+diff -u hyphen/hyphen.c build/hyphen/hyphen.c
+--- hyphen/hyphen.c	2014-05-22 00:28:13.164587974 +0200
++++ build/hyphen/hyphen.c	2014-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,6 +376,21 @@
+ 	    }
+ }
+ 
++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));
++        MultiByteToWideChar(CP_UTF8, 0, path, -1, buff, len);
++        FILE * f = _wfopen(buff, (strcmp(mode, "r") == 0) ? L"r" : L"rb");
++        free(buff);
++        return f;
++    }
++#endif
++    return fopen(path, mode);
++}
++
+ HyphenDict *
+ hnj_hyphen_load (const char *fn)
+ {
+@@ -383,7 +403,7 @@
+   HashEntry *e;
+   int state_num = 0;
+ 
+-  f = fopen (fn, "r");
++  f = hnj_fopen (fn, "r");
+   if (f == NULL)
+     return NULL;
+ 
diff --git a/external/mythes/UnpackedTarball_mythes.mk b/external/mythes/UnpackedTarball_mythes.mk
index d2d4e1d6e772..7571c34e3a37 100644
--- a/external/mythes/UnpackedTarball_mythes.mk
+++ b/external/mythes/UnpackedTarball_mythes.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,mythes,\
 	external/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch \
 	external/mythes/mythes-1.2.0-android.patch \
 	external/mythes/mythes-ssizet.patch \
+	external/mythes/mythes-fdo48017-wfopen.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/mythes/mythes-fdo48017-wfopen.patch b/external/mythes/mythes-fdo48017-wfopen.patch
new file mode 100644
index 000000000000..1621b1d35641
--- /dev/null
+++ b/external/mythes/mythes-fdo48017-wfopen.patch
@@ -0,0 +1,72 @@
+diff -u mythes/mythes.cxx build/mythes/mythes.cxx
+--- mythes/mythes.cxx	2014-05-22 00:27:38.508588487 +0200
++++ build/mythes/mythes.cxx	2014-05-22 10:07:06.107547417 +0200
+@@ -8,6 +8,11 @@
+ 
+ #include "mythes.hxx"
+ 
++#ifdef _WIN32
++#include <windows.h>
++#include <wchar.h>
++#endif
++
+ MyThes::MyThes(const char* idxpath, const char * datpath)
+ {
+     nw = 0;
+@@ -35,7 +40,7 @@
+ {
+ 
+     // open the index file
+-    FILE * pifile = fopen(idxpath,"r");
++    FILE * pifile = myfopen(idxpath,"r");
+     if (!pifile) {
+         return 0;
+     } 
+@@ -90,7 +95,7 @@
+     fclose(pifile);
+ 
+     /* next open the data file */
+-    pdfile = fopen(datpath,"r");
++    pdfile = myfopen(datpath,"r");
+     if (!pdfile) {
+         return 0;
+     } 
+@@ -370,3 +375,17 @@
+   return -1;
+ }
+ 
++FILE * MyThes::myfopen(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));
++        MultiByteToWideChar(CP_UTF8, 0, path, -1, buff, len);
++        FILE * f = _wfopen(buff, (strcmp(mode, "r") == 0) ? L"r" : L"rb");
++        free(buff);
++        return f;
++    }
++#endif
++    return fopen(path, mode);
++}
+diff -u mythes/mythes.hxx build/mythes/mythes.hxx
+--- mythes/mythes.hxx	2010-03-04 12:56:23.000000000 +0100
++++ build/mythes/mythes.hxx	2014-05-22 10:11:14.363543731 +0200
+@@ -30,6 +30,7 @@
+ 	MyThes & operator = (const MyThes &);
+ 
+ public:
++        // use UTF-8 encoded paths in WIN32 environment
+ 	MyThes(const char* idxpath, const char* datpath);
+ 	~MyThes();
+ 
+@@ -66,6 +67,9 @@
+         // return index of char in string
+         int mystr_indexOfChar(const char * d, int c);
+ 
++        // fopen or _wfopen
++        FILE * myfopen(const char * path, const char * mode);
++
+ };
+ 
+ #endif
-- 
cgit