summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-07-24 08:40:02 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-07-24 08:40:02 +0000
commit5c61483aad70d3170b38c8c4a5b74d6f1c7581fd (patch)
tree45b4d95d7f9e446a850dc356e45c9ee703e14c6a
parentfb958e59a21aa2c05fbbedab0bc40c8ff163a8da (diff)
luaTeX: Binary mode for popen() on Windows now done in kpathsea
git-svn-id: svn://tug.org/texlive/trunk@27136 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Build/source/texk/web2c/luatexdir/ChangeLog4
-rw-r--r--Build/source/texk/web2c/luatexdir/tex/texfileio.w14
2 files changed, 6 insertions, 12 deletions
diff --git a/Build/source/texk/web2c/luatexdir/ChangeLog b/Build/source/texk/web2c/luatexdir/ChangeLog
index 7e74ec4d279..dc34e5397d0 100644
--- a/Build/source/texk/web2c/luatexdir/ChangeLog
+++ b/Build/source/texk/web2c/luatexdir/ChangeLog
@@ -1,3 +1,7 @@
+2012-07-23 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * tex/texfileio.w (runpopen): Sync with ../lib/texmfmp.c.
+
2012-07-19 Peter Breitenlohner <peb@mppmu.mpg.de>
* image/writejbig2.w: Use LONGINTEGER_PRI, not LONGINTEGER_PRId.
diff --git a/Build/source/texk/web2c/luatexdir/tex/texfileio.w b/Build/source/texk/web2c/luatexdir/tex/texfileio.w
index 3d9afbe37e6..396cfd78607 100644
--- a/Build/source/texk/web2c/luatexdir/tex/texfileio.w
+++ b/Build/source/texk/web2c/luatexdir/tex/texfileio.w
@@ -1125,22 +1125,15 @@ int readbinfile(FILE * f, unsigned char **tfm_buffer, int *tfm_size)
stderr, since we have nowhere better to use; and of course we return
a file handle (or NULL) instead of a status indicator.
- Also, we append "b" to IO_MODE on Windows.
-
@c
-static FILE *runpopen(char *cmd, const char *io_mode)
+static FILE *runpopen(char *cmd, const char *mode)
{
FILE *f = NULL;
char *safecmd = NULL;
char *cmdname = NULL;
int allow;
-#ifndef WIN32
- /* Use mode "r" or "w" for Posix. */
- char mode[] = "X";
-#else
- /* Use mode "rb" or "wb" for Windows. */
- char mode[] = "Xb";
+#ifdef WIN32
char *pp;
for (pp = cmd; *pp; pp++) {
@@ -1148,9 +1141,6 @@ static FILE *runpopen(char *cmd, const char *io_mode)
}
#endif
- /* Replace 'X' by 'r' or 'w'. */
- mode[0] = *io_mode;
-
/* If restrictedshell == 0, any command is allowed. */
if (restrictedshell == 0) {
allow = 1;