summaryrefslogtreecommitdiff
path: root/src/process.c
diff options
context:
space:
mode:
authorPhilipp Stephani <phst@google.com>2020-12-23 16:26:57 +0100
committerPhilipp Stephani <phst@google.com>2020-12-23 16:26:57 +0100
commitbdcea81a2f906be3c573c42276dbfd35ccb432f9 (patch)
tree8780559b57846364b004aa4eadd75eecfd791f68 /src/process.c
parent95334ee79ab60c0910a5528e586a24d11f91743b (diff)
downloademacs-bdcea81a2f906be3c573c42276dbfd35ccb432f9.tar.gz
Pass C string pointer to current directory to 'child_setup'.
This avoids the impression that 'child_setup' could do anything Lisp-related. * src/callproc.c (child_setup): Pass C pointer to current directory name. (call_process): Adapt callers. * src/process.c (create_process): Adapt callers.
Diffstat (limited to 'src/process.c')
-rw-r--r--src/process.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/process.c b/src/process.c
index c579078c1ca..15b4a23784e 100644
--- a/src/process.c
+++ b/src/process.c
@@ -2259,9 +2259,11 @@ create_process (Lisp_Object process, char **new_argv, Lisp_Object current_dir)
if (forkerr < 0)
forkerr = forkout;
#ifdef WINDOWSNT
- pid = child_setup (forkin, forkout, forkerr, new_argv, env, current_dir);
+ pid = child_setup (forkin, forkout, forkerr, new_argv, env,
+ SSDATA (current_dir));
#else /* not WINDOWSNT */
- child_setup (forkin, forkout, forkerr, new_argv, env, current_dir);
+ child_setup (forkin, forkout, forkerr, new_argv, env,
+ SSDATA (current_dir));
#endif /* not WINDOWSNT */
}