From 625a4e14d27d1deaab146dd754d15efa58c42768 Mon Sep 17 00:00:00 2001 From: Akira Kakuto Date: Fri, 22 Aug 2014 23:13:48 +0000 Subject: Simplify support of multibyte filenames (Windows only) git-svn-id: svn://tug.org/texlive/trunk@35018 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/texk/web2c/lib/ChangeLog | 7 ++++++- Build/source/texk/web2c/lib/texmfmp.c | 35 +---------------------------------- 2 files changed, 7 insertions(+), 35 deletions(-) (limited to 'Build') diff --git a/Build/source/texk/web2c/lib/ChangeLog b/Build/source/texk/web2c/lib/ChangeLog index 1ba4c893545..47da30ca613 100644 --- a/Build/source/texk/web2c/lib/ChangeLog +++ b/Build/source/texk/web2c/lib/ChangeLog @@ -1,10 +1,15 @@ +2014-08-22 Akira Kakuto + + * texmfmp.c: Symplify support of multibyte file names, by + updating fsyscp_popen in kpathsea. + 2014-08-22 Peter Breitenlohner * texmfmp.c: Avoid several compiler warnings (Windows only). 2014-08-22 Akira Kakuto - * texmfmp.c: Support multibyte filenames in pipe (Windows only). + * texmfmp.c: Support multibyte file names in pipe (Windows only). 2014-07-23 Akira Kakuto diff --git a/Build/source/texk/web2c/lib/texmfmp.c b/Build/source/texk/web2c/lib/texmfmp.c index b9ca7b4676a..9a6fec3137e 100644 --- a/Build/source/texk/web2c/lib/texmfmp.c +++ b/Build/source/texk/web2c/lib/texmfmp.c @@ -490,42 +490,9 @@ shell_cmd_is_allowed (const char *cmd, char **safecmd, char **cmdname) #ifdef WIN32 #undef system #define system fsyscp_system - #if ENABLE_PIPES -static int is_include_space(const char *s) -{ - char *p; - p = strchr(s, ' '); - if(p) return 1; - p = strchr(s, '\t'); - if(p) return 1; - return 0; -} - -static FILE *wbinpopen(const char *cmd, const char *mode) -{ - assert(cmd && mode); - if (is_include_space (cmd)) { - FILE *ret; - const char *p; - char *cmd2, *q; - cmd2 = xmalloc (strlen (cmd) + 3); - q = cmd2; - p = cmd; - *q++= '\"'; - while(*p) - *q++ = *p++; - *q++ = '\"'; - *q = '\0'; - ret = fsyscp_popen (cmd2, mode); - free (cmd2); - return ret; - } else { - return fsyscp_popen (cmd, mode); - } -} #undef popen -#define popen wbinpopen +#define popen fsyscp_popen #endif /* ENABLE_PIPES */ #endif /* WIN32 */ -- cgit v1.2.3