X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=src%2Fcallproc.c;h=9b39b48c7e3dc269dbf004570012566ef76609de;hb=90d6a4c131eb79a8fb6b04079dd00784d913814e;hp=0ee95f032fbfad87042eeaec24de60c979b9cab0;hpb=3062d425fac0473eb5aa2efc0bb002f6ce0cb028;p=chise%2Fxemacs-chise.git- diff --git a/src/callproc.c b/src/callproc.c index 0ee95f0..9b39b48 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -1,4 +1,4 @@ -/* Synchronous subprocess invocation for XEmacs. +/* Old synchronous subprocess invocation for XEmacs. Copyright (C) 1985, 86, 87, 88, 93, 94, 95 Free Software Foundation, Inc. This file is part of XEmacs. @@ -21,6 +21,16 @@ Boston, MA 02111-1307, USA. */ /* Synched up with: Mule 2.0, FSF 19.30. */ /* Partly sync'ed with 19.36.4 */ + +/* #### This ENTIRE file is only used in batch mode. + + We only need two things to get rid of both this and ntproc.c: + + -- my `stderr-proc' ws, which adds support for a separate stderr + in asynch. subprocesses. (it's a feature in `old-call-process-internal'.) + -- a noninteractive event loop that supports processes. +*/ + #include #include "lisp.h" @@ -762,13 +772,14 @@ child_setup (int in, int out, int err, char **new_argv, close (out); close (err); - /* I can't think of any reason why child processes need any more - than the standard 3 file descriptors. It would be cleaner to + /* Close non-process-related file descriptors. It would be cleaner to close just the ones that need to be, but the following brute force approach is certainly effective, and not too slow. */ + { int fd; - for (fd=3; fd<=64; fd++) + + for (fd = 3; fd < MAXDESC; fd++) close (fd); } #endif /* not WIN32_NATIVE */ @@ -893,13 +904,40 @@ init_callproc (void) { /* Initialize shell-file-name from environment variables or best guess. */ #ifdef WIN32_NATIVE - const char *shell = egetenv ("COMSPEC"); - if (!shell) shell = "\\WINNT\\system32\\cmd.exe"; + const char *shell = egetenv ("SHELL"); + if (!shell) shell = egetenv ("COMSPEC"); + /* Should never happen! */ + if (!shell) shell = (GetVersion () & 0x80000000 ? "command" : "cmd"); #else /* not WIN32_NATIVE */ const char *shell = egetenv ("SHELL"); if (!shell) shell = "/bin/sh"; #endif +#if 0 /* defined (WIN32_NATIVE) */ + /* BAD BAD BAD. We do not wanting to be passing an XEmacs-created + SHELL var down to some inferior Cygwin process, which might get + screwed up. + + There are a few broken apps (eterm/term.el, eterm/tshell.el, + os-utils/terminal.el, texinfo/tex-mode.el) where this will + cause problems. Those broken apps don't look at + shell-file-name, instead just at explicit-shell-file-name, + ESHELL and SHELL. They are apparently attempting to borrow + what `M-x shell' uses, but that latter also looks at + shell-file-name. What we want is for all of these apps to look + at shell-file-name, so that the user can change the value of + shell-file-name and everything will work out hunky-dorey. + */ + + if (!egetenv ("SHELL")) + { + CBufbyte *faux_var = alloca_array (CBufbyte, 7 + strlen (shell)); + sprintf (faux_var, "SHELL=%s", shell); + Vprocess_environment = Fcons (build_string (faux_var), + Vprocess_environment); + } +#endif /* 0 */ + Vshell_file_name = build_string (shell); } }