procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Support exec-directory with non-ASCII characters on Windows

Browse source 
* src/w32proc.c (sys_spawnve): Make sure exec-directory is encoded
in the system's ANSI codepage, when it is used for invoking
cmdproxy.
This commit is contained in:
Eli Zaretskii 2015-08-23 18:01:35 +03:00
parent 6b1765e05d
commit 877e77e3ee
1 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/w32proc.c
View file

@ -1813,13 +1813,21 @@ sys_spawnve (int mode, char *cmdname, char **argv, char **envp)
cmdname = alloca (MAX_PATH);
if (egetenv ("CMDPROXY"))
strcpy (cmdname, egetenv ("CMDPROXY"));
{
/* Implementation note: since process-environment, where
'egetenv' looks, is encoded in the system codepage, we
don't need to encode the cmdproxy file name if we get it
from the environment. */
strcpy (cmdname, egetenv ("CMDPROXY"));
}
else
{
char *q = lispstpcpy (cmdname, Vexec_directory);
char *q = lispstpcpy (cmdname,
/* exec-directory needs to be encoded. */
ansi_encode_filename (Vexec_directory));
/* If we are run from the source tree, use cmdproxy.exe from
the same source tree. */
for (p = q - 2; p > cmdname; p--)
for (p = q - 2; p > cmdname; p = CharPrevA (cmdname, p))
if (*p == '/')
break;
if (*p == '/' && xstrcasecmp (p, "/lib-src/") == 0)