aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman1996-06-12 16:02:09 +0000
committerRichard M. Stallman1996-06-12 16:02:09 +0000
commitde05443f3b174e11508417c77698ed8ed55a0239 (patch)
treeaaa15dafff48e398b6b065a5298c97f2f10581c2 /src
parent4ffab11c42e4510456fe4bd5988ecc2b063b5661 (diff)
downloademacs-de05443f3b174e11508417c77698ed8ed55a0239.tar.gz
emacs-de05443f3b174e11508417c77698ed8ed55a0239.zip
(restrict_dos_process): Renamed from can_run_dos_process.
(sys_spawnve): Refer to restrict_dos_process.
Diffstat (limited to 'src')
-rw-r--r--src/w32proc.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/w32proc.c b/src/w32proc.c
index 89167148854..790b7d2dabe 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -63,7 +63,7 @@ Lisp_Object Vwin32_downcase_file_names;
63 63
64/* Keep track of whether we have already started a DOS program, and 64/* Keep track of whether we have already started a DOS program, and
65 whether we can run them in the first place. */ 65 whether we can run them in the first place. */
66BOOL can_run_dos_process; 66BOOL restrict_dos_process;
67BOOL dos_process_running; 67BOOL dos_process_running;
68 68
69#ifndef SYS_SIGLIST_DECLARED 69#ifndef SYS_SIGLIST_DECLARED
@@ -384,7 +384,8 @@ reap_subprocess (child_process *cp)
384 cp->procinfo.hThread = NULL; 384 cp->procinfo.hThread = NULL;
385 385
386 /* If this was a DOS process, indicate that it is now safe to 386 /* If this was a DOS process, indicate that it is now safe to
387 start a new one. */ 387 start a new one. dos_process_running is only referred to under
388 Win95, so it doesn't matter if it is incorrect on NT. */
388 if (cp->is_dos_process) 389 if (cp->is_dos_process)
389 dos_process_running = FALSE; 390 dos_process_running = FALSE;
390 } 391 }
@@ -622,9 +623,9 @@ sys_spawnve (int mode, char *cmdname, char **argv, char **envp)
622 /* Check if program is a DOS executable, and if so whether we are 623 /* Check if program is a DOS executable, and if so whether we are
623 allowed to start it. */ 624 allowed to start it. */
624 is_dos_binary = win32_is_dos_binary (cmdname); 625 is_dos_binary = win32_is_dos_binary (cmdname);
625 if (is_dos_binary && (!can_run_dos_process || dos_process_running)) 626 if (is_dos_binary && restrict_dos_process && dos_process_running)
626 { 627 {
627 errno = (can_run_dos_process) ? EAGAIN : EINVAL; 628 errno = EAGAIN;
628 return -1; 629 return -1;
629 } 630 }
630 631