Commit b4c7684c authored by Geoff Voelker's avatar Geoff Voelker
Browse files

(child_setup) [WINDOWSNT]: Change directory of

child instead of parent.
parent 7547360e
...@@ -954,6 +954,7 @@ child_setup (in, out, err, new_argv, set_pgrp, current_dir) ...@@ -954,6 +954,7 @@ child_setup (in, out, err, new_argv, set_pgrp, current_dir)
if (!IS_DIRECTORY_SEP (temp[i - 1])) temp[i++] = DIRECTORY_SEP; if (!IS_DIRECTORY_SEP (temp[i - 1])) temp[i++] = DIRECTORY_SEP;
temp[i] = 0; temp[i] = 0;
#ifndef WINDOWSNT
/* We can't signal an Elisp error here; we're in a vfork. Since /* We can't signal an Elisp error here; we're in a vfork. Since
the callers check the current directory before forking, this the callers check the current directory before forking, this
should only return an error if the directory's permissions should only return an error if the directory's permissions
...@@ -961,6 +962,7 @@ child_setup (in, out, err, new_argv, set_pgrp, current_dir) ...@@ -961,6 +962,7 @@ child_setup (in, out, err, new_argv, set_pgrp, current_dir)
at least check. */ at least check. */
if (chdir (temp) < 0) if (chdir (temp) < 0)
_exit (errno); _exit (errno);
#endif
/* Strip trailing slashes for PWD, but leave "/" and "//" alone. */ /* Strip trailing slashes for PWD, but leave "/" and "//" alone. */
while (i > 2 && IS_DIRECTORY_SEP (temp[i - 1])) while (i > 2 && IS_DIRECTORY_SEP (temp[i - 1]))
...@@ -1020,6 +1022,7 @@ child_setup (in, out, err, new_argv, set_pgrp, current_dir) ...@@ -1020,6 +1022,7 @@ child_setup (in, out, err, new_argv, set_pgrp, current_dir)
} }
#ifdef WINDOWSNT #ifdef WINDOWSNT
prepare_standard_handles (in, out, err, handles); prepare_standard_handles (in, out, err, handles);
set_process_dir (XSTRING (current_dir)->data);
#else /* not WINDOWSNT */ #else /* not WINDOWSNT */
/* Make sure that in, out, and err are not actually already in /* Make sure that in, out, and err are not actually already in
descriptors zero, one, or two; this could happen if Emacs is descriptors zero, one, or two; this could happen if Emacs is
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment