summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/kpathsea/ChangeLog5
-rw-r--r--Build/source/texk/kpathsea/win32lib.c7
2 files changed, 11 insertions, 1 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index ef737820cef..4e7668d52cb 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-23 Akira Kakuto <kakuto@fuk.kindai.ac.jp>
+
+ * win32lib.c: rewrite kpathsea_win32_popen to use always binary
+ mode.
+
2012-07-13 Peter Breitenlohner <peb@mppmu.mpg.de>
* Makefile.am (libkpathsea_la_SOURCES): Skip compilation of
diff --git a/Build/source/texk/kpathsea/win32lib.c b/Build/source/texk/kpathsea/win32lib.c
index 77dde008303..4baa2e7ea6d 100644
--- a/Build/source/texk/kpathsea/win32lib.c
+++ b/Build/source/texk/kpathsea/win32lib.c
@@ -20,8 +20,9 @@
#include <kpathsea/concatn.h>
#include <kpathsea/variable.h>
-FILE * __cdecl kpathsea_win32_popen (kpathsea kpse, const char *cmd, const char *mode)
+FILE * __cdecl kpathsea_win32_popen (kpathsea kpse, const char *cmd, const char *fmode)
{
+ char *mode = "Xb";
STARTUPINFO si;
PROCESS_INFORMATION pi;
SECURITY_ATTRIBUTES sa = { sizeof(SECURITY_ATTRIBUTES), NULL, TRUE };
@@ -42,6 +43,10 @@ FILE * __cdecl kpathsea_win32_popen (kpathsea kpse, const char *cmd, const char
char **s;
BOOL go_on;
+ /* We always use binary mode */
+
+ *mode = *fmode;
+
/* We should look for the application name along the PATH,
and decide to prepend "%COMSPEC% /c " or not to the command line.
Do nothing for the moment. */