/* Synchronous subprocess invocation for GNU Emacs.
- Copyright (C) 1985, 86, 87, 88, 93, 94, 95 Free Software Foundation, Inc.
+ Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001,
+ 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
This file is part of GNU Emacs.
You should have received a copy of the GNU General Public License
along with GNU Emacs; see the file COPYING. If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
+#include <config.h>
#include <signal.h>
#include <errno.h>
-
-#include <config.h>
#include <stdio.h>
+#ifndef USE_CRT_DLL
extern int errno;
-extern char *strerror ();
+#endif
/* Define SIGCHLD as an alias for SIGCLD. */
#include <sys/types.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
#include <sys/file.h>
-#ifdef USG5
+#ifdef HAVE_FCNTL_H
#define INCLUDED_FCNTL
#include <fcntl.h>
#endif
#endif
#ifdef MSDOS /* Demacs 1.1.1 91/10/16 HIRANO Satoshi */
-#include "msdos.h"
#define INCLUDED_FCNTL
#include <fcntl.h>
#include <sys/stat.h>
#include "commands.h"
#include "buffer.h"
#include "charset.h"
+#include "ccl.h"
#include "coding.h"
-#include <paths.h>
+#include "composite.h"
+#include <epaths.h>
#include "process.h"
#include "syssignal.h"
#include "systty.h"
+#include "blockinput.h"
+
+#ifdef MSDOS
+#include "msdos.h"
+#endif
#ifdef VMS
extern noshare char **environ;
#else
+#ifndef USE_CRT_DLL
extern char **environ;
#endif
+#endif
-#define max(a, b) ((a) > (b) ? (a) : (b))
-
-#ifdef DOS_NT
-/* When we are starting external processes we need to know whether they
- take binary input (no conversion) or text input (\n is converted to
- \r\n). Similar for output: if newlines are written as \r\n then it's
- text process output, otherwise it's binary. */
-Lisp_Object Vbinary_process_input;
-Lisp_Object Vbinary_process_output;
-#endif /* DOS_NT */
+#ifdef HAVE_SETPGID
+#if !defined (USG) || defined (BSD_PGRPS)
+#undef setpgrp
+#define setpgrp setpgid
+#endif
+#endif
-Lisp_Object Vexec_path, Vexec_directory, Vdata_directory, Vdoc_directory;
-Lisp_Object Vconfigure_info_directory;
+Lisp_Object Vexec_path, Vexec_directory, Vexec_suffixes;
+Lisp_Object Vdata_directory, Vdoc_directory;
+Lisp_Object Vconfigure_info_directory, Vshared_game_score_directory;
Lisp_Object Vtemp_file_name_pattern;
Lisp_Object Vshell_file_name;
/* Nonzero => this is a string explaining death of synchronous subprocess. */
char *synch_process_death;
+/* Nonzero => this is the signal number that terminated the subprocess. */
+int synch_process_termsig;
+
/* If synch_process_death is zero,
this is exit code of synchronous subprocess. */
int synch_process_retcode;
-
-extern Lisp_Object Vdoc_file_name;
-
-extern Lisp_Object Vfile_name_coding_system, Vdefault_file_name_coding_system;
\f
/* Clean up when exiting Fcall_process.
On MSDOS, delete the temporary file on any kind of termination.
call_process_kill (fdpid)
Lisp_Object fdpid;
{
- close (XFASTINT (Fcar (fdpid)));
+ emacs_close (XFASTINT (Fcar (fdpid)));
EMACS_KILLPG (XFASTINT (Fcdr (fdpid)), SIGKILL);
synch_process_alive = 0;
return Qnil;
call_process_cleanup (fdpid)
Lisp_Object fdpid;
{
-#ifdef MSDOS
+#if defined (MSDOS) || defined (MAC_OS8)
/* for MSDOS fdpid is really (fd . tempfile) */
register Lisp_Object file;
file = Fcdr (fdpid);
- close (XFASTINT (Fcar (fdpid)));
- if (strcmp (XSTRING (file)-> data, NULL_DEVICE) != 0)
- unlink (XSTRING (file)->data);
-#else /* not MSDOS */
+ emacs_close (XFASTINT (Fcar (fdpid)));
+ if (strcmp (SDATA (file), NULL_DEVICE) != 0)
+ unlink (SDATA (file));
+#else /* not MSDOS and not MAC_OS8 */
register int pid = XFASTINT (Fcdr (fdpid));
-
if (call_process_exited)
{
- close (XFASTINT (Fcar (fdpid)));
+ emacs_close (XFASTINT (Fcar (fdpid)));
return Qnil;
}
if (EMACS_KILLPG (pid, SIGINT) == 0)
{
- int count = specpdl_ptr - specpdl;
+ int count = SPECPDL_INDEX ();
record_unwind_protect (call_process_kill, fdpid);
message1 ("Waiting for process to die...(type C-g again to kill it instantly)");
immediate_quit = 1;
message1 ("Waiting for process to die...done");
}
synch_process_alive = 0;
- close (XFASTINT (Fcar (fdpid)));
+ emacs_close (XFASTINT (Fcar (fdpid)));
#endif /* not MSDOS */
return Qnil;
}
DEFUN ("call-process", Fcall_process, Scall_process, 1, MANY, 0,
- "Call PROGRAM synchronously in separate process.\n\
-The program's input comes from file INFILE (nil means `/dev/null').\n\
-Insert output in BUFFER before point; t means current buffer;\n\
- nil for BUFFER means discard it; 0 means discard and don't wait.\n\
-BUFFER can also have the form (REAL-BUFFER STDERR-FILE); in that case,\n\
-REAL-BUFFER says what to do with standard output, as above,\n\
-while STDERR-FILE says what to do with standard error in the child.\n\
-STDERR-FILE may be nil (discard standard error output),\n\
-t (mix it with ordinary output), or a file name string.\n\
-\n\
-Fourth arg DISPLAY non-nil means redisplay buffer as output is inserted.\n\
-Remaining arguments are strings passed as command arguments to PROGRAM.\n\
-\n\
-If BUFFER is 0, `call-process' returns immediately with value nil.\n\
-Otherwise it waits for PROGRAM to terminate\n\
-and returns a numeric exit status or a signal description string.\n\
-If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.")
- (nargs, args)
+ doc: /* Call PROGRAM synchronously in separate process.
+The remaining arguments are optional.
+The program's input comes from file INFILE (nil means `/dev/null').
+Insert output in BUFFER before point; t means current buffer;
+ nil for BUFFER means discard it; 0 means discard and don't wait.
+BUFFER can also have the form (REAL-BUFFER STDERR-FILE); in that case,
+REAL-BUFFER says what to do with standard output, as above,
+while STDERR-FILE says what to do with standard error in the child.
+STDERR-FILE may be nil (discard standard error output),
+t (mix it with ordinary output), or a file name string.
+
+Fourth arg DISPLAY non-nil means redisplay buffer as output is inserted.
+Remaining arguments are strings passed as command arguments to PROGRAM.
+
+If BUFFER is 0, `call-process' returns immediately with value nil.
+Otherwise it waits for PROGRAM to terminate
+and returns a numeric exit status or a signal description string.
+If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.
+
+usage: (call-process PROGRAM &optional INFILE BUFFER DISPLAY &rest ARGS) */)
+ (nargs, args)
int nargs;
register Lisp_Object *args;
{
- Lisp_Object infile, buffer, current_dir, display, path;
+ Lisp_Object infile, buffer, current_dir, path;
+ int display_p;
int fd[2];
int filefd;
register int pid;
- char buf[16384];
- char *bufptr = buf;
- int bufsize = 16384;
- int count = specpdl_ptr - specpdl;
-
- register unsigned char **new_argv
- = (unsigned char **) alloca ((max (2, nargs - 2)) * sizeof (char *));
+#define CALLPROC_BUFFER_SIZE_MIN (16 * 1024)
+#define CALLPROC_BUFFER_SIZE_MAX (4 * CALLPROC_BUFFER_SIZE_MIN)
+ char buf[CALLPROC_BUFFER_SIZE_MAX];
+ int bufsize = CALLPROC_BUFFER_SIZE_MIN;
+ int count = SPECPDL_INDEX ();
+
+ register const unsigned char **new_argv
+ = (const unsigned char **) alloca ((max (2, nargs - 2)) * sizeof (char *));
struct buffer *old = current_buffer;
/* File to use for stderr in the child.
t means use same as standard output. */
char *outf, *tempfile;
int outfilefd;
#endif
+#ifdef MAC_OS8
+ char *tempfile;
+ int outfilefd;
+#endif
#if 0
int mask;
#endif
struct coding_system process_coding; /* coding-system of process output */
struct coding_system argument_coding; /* coding-system of arguments */
+ /* Set to the return value of Ffind_operation_coding_system. */
+ Lisp_Object coding_systems;
- CHECK_STRING (args[0], 0);
+ /* Qt denotes that Ffind_operation_coding_system is not yet called. */
+ coding_systems = Qt;
+
+ CHECK_STRING (args[0]);
error_file = Qt;
#ifndef subprocesses
/* Without asynchronous processes we cannot have BUFFER == 0. */
- if (nargs >= 3 && INTEGERP (args[2]))
+ if (nargs >= 3
+ && (INTEGERP (CONSP (args[2]) ? XCAR (args[2]) : args[2])))
error ("Operating system cannot handle asynchronous subprocesses");
#endif /* subprocesses */
- /* Decide the coding-system for giving arguments and reading process
- output. */
+ /* Decide the coding-system for giving arguments. */
{
Lisp_Object val, *args2;
- /* Qt denotes we have not yet called Ffind_operation_coding_system. */
- Lisp_Object coding_systems = Qt;
int i;
/* If arguments are supplied, we may have to encode them. */
{
int must_encode = 0;
+ for (i = 4; i < nargs; i++)
+ CHECK_STRING (args[i]);
+
for (i = 4; i < nargs; i++)
if (STRING_MULTIBYTE (args[i]))
must_encode = 1;
for (i = 0; i < nargs; i++) args2[i + 1] = args[i];
coding_systems = Ffind_operation_coding_system (nargs + 1, args2);
if (CONSP (coding_systems))
- val = XCONS (coding_systems)->cdr;
+ val = XCDR (coding_systems);
else if (CONSP (Vdefault_process_coding_system))
- val = XCONS (Vdefault_process_coding_system)->cdr;
+ val = XCDR (Vdefault_process_coding_system);
else
val = Qnil;
}
setup_coding_system (Fcheck_coding_system (val), &argument_coding);
}
-
- /* If BUFFER is nil, we must read process output once and then
- discard it, so setup coding system but with nil. If BUFFER is
- an integer, we can discard it without reading. */
- if (nargs < 3 || NILP (args[2]))
- setup_coding_system (Qnil, &process_coding);
- else if (!INTEGERP (args[2]))
- {
- val = Qnil;
- if (!NILP (Vcoding_system_for_read))
- val = Vcoding_system_for_read;
- else if (NILP (current_buffer->enable_multibyte_characters))
- val = Qraw_text;
- else
- {
- if (!EQ (coding_systems, Qt))
- {
- args2 = (Lisp_Object *) alloca ((nargs + 1) * sizeof *args2);
- args2[0] = Qcall_process;
- for (i = 0; i < nargs; i++) args2[i + 1] = args[i];
- coding_systems
- = Ffind_operation_coding_system (nargs + 1, args2);
- }
- if (CONSP (coding_systems))
- val = XCONS (coding_systems)->car;
- else if (CONSP (Vdefault_process_coding_system))
- val = XCONS (Vdefault_process_coding_system)->car;
- else
- val = Qnil;
- }
- setup_coding_system (Fcheck_coding_system (val), &process_coding);
-#ifdef MSDOS
- /* On MSDOS, if the user did not ask for binary, treat it as
- "text" which means doing CRLF conversion. Otherwise, leave
- the EOLs alone.
-
- Note that ``binary'' here only means whether EOLs should or
- should not be converted, since that's what Vbinary_process_XXXput
- meant in the days before the coding systems were introduced.
-
- For other conversions, the caller should set coding-system
- variables explicitly, or rely on auto-detection. */
-
- /* FIXME: this probably should be moved into the guts of
- `Ffind_operation_coding_system' for the case of `call-process'. */
- if (NILP (Vbinary_process_output))
- {
- process_coding.eol_type = CODING_EOL_CRLF;
- if (process_coding.type == coding_type_no_conversion)
- /* FIXME: should we set type to undecided? */
- process_coding.type = coding_type_emacs_mule;
- }
- else
- process_coding.eol_type = CODING_EOL_LF;
-#endif
- }
}
if (nargs >= 2 && ! NILP (args[1]))
{
infile = Fexpand_file_name (args[1], current_buffer->directory);
- CHECK_STRING (infile, 1);
+ CHECK_STRING (infile);
}
else
infile = build_string (NULL_DEVICE);
(BUFFER-FOR-STDOUT FILE-FOR-STDERR). */
if (CONSP (buffer))
{
- if (CONSP (XCONS (buffer)->cdr))
+ if (CONSP (XCDR (buffer)))
{
Lisp_Object stderr_file;
- stderr_file = XCONS (XCONS (buffer)->cdr)->car;
+ stderr_file = XCAR (XCDR (buffer));
if (NILP (stderr_file) || EQ (Qt, stderr_file))
error_file = stderr_file;
error_file = Fexpand_file_name (stderr_file, Qnil);
}
- buffer = XCONS (buffer)->car;
+ buffer = XCAR (buffer);
}
if (!(EQ (buffer, Qnil)
|| EQ (buffer, Qt)
- || XFASTINT (buffer) == 0))
+ || INTEGERP (buffer)))
{
Lisp_Object spec_buffer;
spec_buffer = buffer;
buffer = Fget_buffer_create (buffer);
/* Mention the buffer name for a better error message. */
if (NILP (buffer))
- CHECK_BUFFER (spec_buffer, 2);
- CHECK_BUFFER (buffer, 2);
+ CHECK_BUFFER (spec_buffer);
+ CHECK_BUFFER (buffer);
}
}
- else
+ else
buffer = Qnil;
/* Make sure that the child will be able to chdir to the current
protected by the caller, so all we really have to worry about is
buffer. */
{
- struct gcpro gcpro1, gcpro2, gcpro3;
+ struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
current_dir = current_buffer->directory;
- GCPRO3 (infile, buffer, current_dir);
+ GCPRO4 (infile, buffer, current_dir, error_file);
current_dir
= expand_and_dir_to_file (Funhandled_file_name_directory (current_dir),
report_file_error ("Setting current directory",
Fcons (current_buffer->directory, Qnil));
+ if (STRING_MULTIBYTE (infile))
+ infile = ENCODE_FILE (infile);
+ if (STRING_MULTIBYTE (current_dir))
+ current_dir = ENCODE_FILE (current_dir);
+ if (STRINGP (error_file) && STRING_MULTIBYTE (error_file))
+ error_file = ENCODE_FILE (error_file);
UNGCPRO;
}
- display = nargs >= 4 ? args[3] : Qnil;
+ display_p = INTERACTIVE && nargs >= 4 && !NILP (args[3]);
- filefd = open (XSTRING (infile)->data, O_RDONLY, 0);
+ filefd = emacs_open (SDATA (infile), O_RDONLY, 0);
if (filefd < 0)
{
+ infile = DECODE_FILE (infile);
report_file_error ("Opening process input file", Fcons (infile, Qnil));
}
/* Search for program; barf if not found. */
struct gcpro gcpro1;
GCPRO1 (current_dir);
- openp (Vexec_path, args[0], EXEC_SUFFIXES, &path, 1);
+ openp (Vexec_path, args[0], Vexec_suffixes, &path, make_number (X_OK));
UNGCPRO;
}
if (NILP (path))
{
- close (filefd);
+ emacs_close (filefd);
report_file_error ("Searching for program", Fcons (args[0], Qnil));
}
- new_argv[0] = XSTRING (path)->data;
+
+ /* If program file name starts with /: for quoting a magic name,
+ discard that. */
+ if (SBYTES (path) > 2 && SREF (path, 0) == '/'
+ && SREF (path, 1) == ':')
+ path = Fsubstring (path, make_number (2), Qnil);
+
+ new_argv[0] = SDATA (path);
if (nargs > 4)
{
register int i;
+ struct gcpro gcpro1, gcpro2, gcpro3;
- for (i = 4; i < nargs; i++) CHECK_STRING (args[i], i);
-
- if (! CODING_REQUIRE_ENCODING (&argument_coding))
- {
- for (i = 4; i < nargs; i++)
- new_argv[i - 3] = XSTRING (args[i])->data;
- }
- else
+ GCPRO3 (infile, buffer, current_dir);
+ argument_coding.dst_multibyte = 0;
+ for (i = 4; i < nargs; i++)
{
- /* We must encode the arguments. */
- struct gcpro gcpro1, gcpro2, gcpro3;
-
- GCPRO3 (infile, buffer, current_dir);
- for (i = 4; i < nargs; i++)
+ argument_coding.src_multibyte = STRING_MULTIBYTE (args[i]);
+ if (CODING_REQUIRE_ENCODING (&argument_coding))
{
- int size = encoding_buffer_size (&argument_coding,
- STRING_BYTES (XSTRING (args[i])));
- unsigned char *dummy1 = (unsigned char *) alloca (size);
- int dummy;
-
- /* The Irix 4.0 compiler barfs if we eliminate dummy. */
- new_argv[i - 3] = dummy1;
- encode_coding (&argument_coding,
- XSTRING (args[i])->data,
- new_argv[i - 3],
- STRING_BYTES (XSTRING (args[i])),
- size);
- new_argv[i - 3][argument_coding.produced] = 0;
+ /* We must encode this argument. */
+ args[i] = encode_coding_string (args[i], &argument_coding, 1);
+ if (argument_coding.type == coding_type_ccl)
+ setup_ccl_program (&(argument_coding.spec.ccl.encoder), Qnil);
}
- UNGCPRO;
+ new_argv[i - 3] = SDATA (args[i]);
}
+ UNGCPRO;
new_argv[nargs - 3] = 0;
}
else
new_argv[1] = 0;
#ifdef MSDOS /* MW, July 1993 */
- if ((outf = egetenv ("TMP")) || (outf = egetenv ("TEMP")))
+ if ((outf = egetenv ("TMPDIR")))
strcpy (tempfile = alloca (strlen (outf) + 20), outf);
else
{
*tempfile = '\0';
}
dostounix_filename (tempfile);
- if (*tempfile == '\0' || tempfile[strlen (tempfile) - 1] != '/')
+ if (*tempfile == '\0' || tempfile[strlen (tempfile) - 1] != '/')
strcat (tempfile, "/");
strcat (tempfile, "detmp.XXX");
mktemp (tempfile);
outfilefd = creat (tempfile, S_IREAD | S_IWRITE);
if (outfilefd < 0)
{
- close (filefd);
+ emacs_close (filefd);
report_file_error ("Opening process output file",
Fcons (build_string (tempfile), Qnil));
}
fd[1] = outfilefd;
#endif /* MSDOS */
+#ifdef MAC_OS8
+ /* Since we don't have pipes on the Mac, create a temporary file to
+ hold the output of the subprocess. */
+ tempfile = (char *) alloca (SBYTES (Vtemp_file_name_pattern) + 1);
+ bcopy (SDATA (Vtemp_file_name_pattern), tempfile,
+ SBYTES (Vtemp_file_name_pattern) + 1);
+
+ mktemp (tempfile);
+
+ outfilefd = creat (tempfile, S_IREAD | S_IWRITE);
+ if (outfilefd < 0)
+ {
+ close (filefd);
+ report_file_error ("Opening process output file",
+ Fcons (build_string (tempfile), Qnil));
+ }
+ fd[0] = filefd;
+ fd[1] = outfilefd;
+#endif /* MAC_OS8 */
+
if (INTEGERP (buffer))
- fd[1] = open (NULL_DEVICE, O_WRONLY), fd[0] = -1;
+ fd[1] = emacs_open (NULL_DEVICE, O_WRONLY, 0), fd[0] = -1;
else
{
#ifndef MSDOS
- pipe (fd);
+#ifndef MAC_OS8
+ errno = 0;
+ if (pipe (fd) == -1)
+ {
+ emacs_close (filefd);
+ report_file_error ("Creating process pipe", Qnil);
+ }
+#endif
#endif
#if 0
/* Replaced by close_process_descs */
to avoid timing error if process terminates soon. */
synch_process_death = 0;
synch_process_retcode = 0;
+ synch_process_termsig = 0;
if (NILP (error_file))
- fd_error = open (NULL_DEVICE, O_WRONLY);
+ fd_error = emacs_open (NULL_DEVICE, O_WRONLY, 0);
else if (STRINGP (error_file))
{
#ifdef DOS_NT
- fd_error = open (XSTRING (error_file)->data,
- O_WRONLY | O_TRUNC | O_CREAT | O_TEXT,
- S_IREAD | S_IWRITE);
+ fd_error = emacs_open (SDATA (error_file),
+ O_WRONLY | O_TRUNC | O_CREAT | O_TEXT,
+ S_IREAD | S_IWRITE);
#else /* not DOS_NT */
- fd_error = creat (XSTRING (error_file)->data, 0666);
+ fd_error = creat (SDATA (error_file), 0666);
#endif /* not DOS_NT */
}
if (fd_error < 0)
{
- close (filefd);
+ emacs_close (filefd);
if (fd[0] != filefd)
- close (fd[0]);
+ emacs_close (fd[0]);
if (fd1 >= 0)
- close (fd1);
+ emacs_close (fd1);
#ifdef MSDOS
unlink (tempfile);
#endif
- report_file_error ("Cannot redirect stderr",
- Fcons ((NILP (error_file)
- ? build_string (NULL_DEVICE) : error_file),
- Qnil));
+ if (NILP (error_file))
+ error_file = build_string (NULL_DEVICE);
+ else if (STRINGP (error_file))
+ error_file = DECODE_FILE (error_file);
+ report_file_error ("Cannot redirect stderr", Fcons (error_file, Qnil));
}
- current_dir = ENCODE_FILE (current_dir);
+#ifdef MAC_OS8
+ {
+ /* Call run_mac_command in sysdep.c here directly instead of doing
+ a child_setup as for MSDOS and other platforms. Note that this
+ code does not handle passing the environment to the synchronous
+ Mac subprocess. */
+ char *infn, *outfn, *errfn, *currdn;
+
+ /* close these files so subprocess can write to them */
+ close (outfilefd);
+ if (fd_error != outfilefd)
+ close (fd_error);
+ fd1 = -1; /* No harm in closing that one! */
+
+ infn = SDATA (infile);
+ outfn = tempfile;
+ if (NILP (error_file))
+ errfn = NULL_DEVICE;
+ else if (EQ (Qt, error_file))
+ errfn = outfn;
+ else
+ errfn = SDATA (error_file);
+ currdn = SDATA (current_dir);
+ pid = run_mac_command (new_argv, currdn, infn, outfn, errfn);
+
+ /* Record that the synchronous process exited and note its
+ termination status. */
+ synch_process_alive = 0;
+ synch_process_retcode = pid;
+ if (synch_process_retcode < 0) /* means it couldn't be exec'ed */
+ {
+ synchronize_system_messages_locale ();
+ synch_process_death = strerror (errno);
+ }
+ /* Since CRLF is converted to LF within `decode_coding', we can
+ always open a file with binary mode. */
+ fd[0] = open (tempfile, O_BINARY);
+ if (fd[0] < 0)
+ {
+ unlink (tempfile);
+ close (filefd);
+ report_file_error ("Cannot re-open temporary file", Qnil);
+ }
+ }
+#else /* not MAC_OS8 */
#ifdef MSDOS /* MW, July 1993 */
- /* ??? Someone who knows MSDOG needs to check whether this properly
- closes all descriptors that it opens.
-
- Note that run_msdos_command() actually returns the child process
+ /* Note that on MSDOS `child_setup' actually returns the child process
exit status, not its PID, so we assign it to `synch_process_retcode'
below. */
- pid = run_msdos_command (new_argv, current_dir,
- filefd, outfilefd, fd_error);
+ pid = child_setup (filefd, outfilefd, fd_error, (char **) new_argv,
+ 0, current_dir);
/* Record that the synchronous process exited and note its
termination status. */
synch_process_alive = 0;
synch_process_retcode = pid;
if (synch_process_retcode < 0) /* means it couldn't be exec'ed */
- synch_process_death = strerror (errno);
+ {
+ synchronize_system_messages_locale ();
+ synch_process_death = strerror (errno);
+ }
- close (outfilefd);
+ emacs_close (outfilefd);
if (fd_error != outfilefd)
- close (fd_error);
+ emacs_close (fd_error);
fd1 = -1; /* No harm in closing that one! */
/* Since CRLF is converted to LF within `decode_coding', we can
always open a file with binary mode. */
- fd[0] = open (tempfile, O_BINARY);
+ fd[0] = emacs_open (tempfile, O_RDONLY | O_BINARY, 0);
if (fd[0] < 0)
{
unlink (tempfile);
- close (filefd);
+ emacs_close (filefd);
report_file_error ("Cannot re-open temporary file", Qnil);
}
#else /* not MSDOS */
pid = child_setup (filefd, fd1, fd_error, (char **) new_argv,
0, current_dir);
#else /* not WINDOWSNT */
+ BLOCK_INPUT;
+
pid = vfork ();
if (pid == 0)
{
if (fd[0] >= 0)
- close (fd[0]);
+ emacs_close (fd[0]);
#ifdef HAVE_SETSID
setsid ();
#endif
child_setup (filefd, fd1, fd_error, (char **) new_argv,
0, current_dir);
}
+
+ UNBLOCK_INPUT;
#endif /* not WINDOWSNT */
/* The MSDOS case did this already. */
if (fd_error >= 0)
- close (fd_error);
+ emacs_close (fd_error);
#endif /* not MSDOS */
+#endif /* not MAC_OS8 */
environ = save_environ;
/* Close most of our fd's, but not fd[0]
since we will use that to read input from. */
- close (filefd);
+ emacs_close (filefd);
if (fd1 >= 0 && fd1 != fd_error)
- close (fd1);
+ emacs_close (fd1);
}
if (pid < 0)
{
if (fd[0] >= 0)
- close (fd[0]);
+ emacs_close (fd[0]);
report_file_error ("Doing vfork", Qnil);
}
if (INTEGERP (buffer))
{
if (fd[0] >= 0)
- close (fd[0]);
+ emacs_close (fd[0]);
#ifndef subprocesses
/* If Emacs has been built with asynchronous subprocess support,
we don't need to do this, I think because it will then have
/* Enable sending signal if user quits below. */
call_process_exited = 0;
-#ifdef MSDOS
+#if defined(MSDOS) || defined(MAC_OS8)
/* MSDOS needs different cleanup information. */
record_unwind_protect (call_process_cleanup,
Fcons (make_number (fd[0]), build_string (tempfile)));
#else
record_unwind_protect (call_process_cleanup,
Fcons (make_number (fd[0]), make_number (pid)));
-#endif /* not MSDOS */
+#endif /* not MSDOS and not MAC_OS8 */
if (BUFFERP (buffer))
Fset_buffer (buffer);
+ if (NILP (buffer))
+ {
+ /* If BUFFER is nil, we must read process output once and then
+ discard it, so setup coding system but with nil. */
+ setup_coding_system (Qnil, &process_coding);
+ }
+ else
+ {
+ Lisp_Object val, *args2;
+
+ val = Qnil;
+ if (!NILP (Vcoding_system_for_read))
+ val = Vcoding_system_for_read;
+ else
+ {
+ if (EQ (coding_systems, Qt))
+ {
+ int i;
+
+ args2 = (Lisp_Object *) alloca ((nargs + 1) * sizeof *args2);
+ args2[0] = Qcall_process;
+ for (i = 0; i < nargs; i++) args2[i + 1] = args[i];
+ coding_systems
+ = Ffind_operation_coding_system (nargs + 1, args2);
+ }
+ if (CONSP (coding_systems))
+ val = XCAR (coding_systems);
+ else if (CONSP (Vdefault_process_coding_system))
+ val = XCAR (Vdefault_process_coding_system);
+ else
+ val = Qnil;
+ }
+ setup_coding_system (Fcheck_coding_system (val), &process_coding);
+ /* In unibyte mode, character code conversion should not take
+ place but EOL conversion should. So, setup raw-text or one
+ of the subsidiary according to the information just setup. */
+ if (NILP (current_buffer->enable_multibyte_characters)
+ && !NILP (val))
+ setup_raw_text_coding_system (&process_coding);
+ }
+ process_coding.src_multibyte = 0;
+ process_coding.dst_multibyte
+ = (BUFFERP (buffer)
+ ? ! NILP (XBUFFER (buffer)->enable_multibyte_characters)
+ : ! NILP (current_buffer->enable_multibyte_characters));
+
immediate_quit = 1;
QUIT;
int first = 1;
int total_read = 0;
int carryover = 0;
-
+ int display_on_the_fly = display_p;
+ struct coding_system saved_coding;
+ int pt_orig = PT, pt_byte_orig = PT_BYTE;
+ int inserted;
+
+ saved_coding = process_coding;
+ if (process_coding.composing != COMPOSITION_DISABLED)
+ coding_allocate_composition_data (&process_coding, PT);
while (1)
{
/* Repeatedly read until we've filled as much as possible
of the buffer size we have. But don't read
less than 1024--save that for the next bufferful. */
-
nread = carryover;
while (nread < bufsize - 1024)
{
- int this_read = read (fd[0], bufptr + nread, bufsize - nread);
+ int this_read = emacs_read (fd[0], buf + nread,
+ bufsize - nread);
if (this_read < 0)
goto give_up;
if (this_read == 0)
- goto give_up_1;
+ {
+ process_coding.mode |= CODING_MODE_LAST_BLOCK;
+ break;
+ }
nread += this_read;
- }
+ total_read += this_read;
- give_up_1:
+ if (display_on_the_fly)
+ break;
+ }
/* Now NREAD is the total amount of data in the buffer. */
- if (nread == carryover)
- /* Here, just tell decode_coding that we are processing the
- last block. We break the loop after decoding. */
- process_coding.mode |= CODING_MODE_LAST_BLOCK;
-
immediate_quit = 0;
- total_read += nread - carryover;
-
+
if (!NILP (buffer))
{
- if (process_coding.type == coding_type_no_conversion)
- insert (bufptr, nread);
+ if (! CODING_MAY_REQUIRE_DECODING (&process_coding))
+ insert_1_both (buf, nread, nread, 0, 1, 0);
else
{ /* We have to decode the input. */
- int size = decoding_buffer_size (&process_coding, nread);
- char *decoding_buf = get_conversion_buffer (size);
+ int size;
+ char *decoding_buf;
+
+ repeat_decoding:
+ size = decoding_buffer_size (&process_coding, nread);
+ decoding_buf = (char *) xmalloc (size);
+
+ /* We can't use the macro CODING_REQUIRE_DETECTION
+ because it always returns nonzero if the coding
+ system requires EOL detection. Here, we have to
+ check only whether or not the coding system
+ requires text-encoding detection. */
+ if (process_coding.type == coding_type_undecided)
+ {
+ detect_coding (&process_coding, buf, nread);
+ if (process_coding.composing != COMPOSITION_DISABLED)
+ /* We have not yet allocated the composition
+ data because the coding type was undecided. */
+ coding_allocate_composition_data (&process_coding, PT);
+ }
+ if (process_coding.cmp_data)
+ process_coding.cmp_data->char_offset = PT;
- decode_coding (&process_coding, bufptr, decoding_buf,
+ decode_coding (&process_coding, buf, decoding_buf,
nread, size);
+
+ if (display_on_the_fly
+ && saved_coding.type == coding_type_undecided
+ && process_coding.type != coding_type_undecided)
+ {
+ /* We have detected some coding system. But,
+ there's a possibility that the detection was
+ done by insufficient data. So, we try the code
+ detection again with more data. */
+ xfree (decoding_buf);
+ display_on_the_fly = 0;
+ process_coding = saved_coding;
+ carryover = nread;
+ /* This is to make the above condition always
+ fails in the future. */
+ saved_coding.type = coding_type_no_conversion;
+ continue;
+ }
+
if (process_coding.produced > 0)
- insert (decoding_buf, process_coding.produced);
- carryover = nread - process_coding.consumed;
- if (carryover > 0)
+ insert_1_both (decoding_buf, process_coding.produced_char,
+ process_coding.produced, 0, 1, 0);
+ xfree (decoding_buf);
+
+ if (process_coding.result == CODING_FINISH_INCONSISTENT_EOL)
{
- /* As CARRYOVER should not be that large, we had
- better avoid overhead of bcopy. */
- char *p = bufptr + process_coding.consumed;
- char *pend = p + carryover;
- char *dst = bufptr;
+ Lisp_Object eol_type, coding;
+
+ if (process_coding.eol_type == CODING_EOL_CR)
+ {
+ /* CRs have been replaced with LFs. Undo
+ that in the text inserted above. */
+ unsigned char *p;
+
+ move_gap_both (PT, PT_BYTE);
+
+ p = BYTE_POS_ADDR (pt_byte_orig);
+ for (; p < GPT_ADDR; ++p)
+ if (*p == '\n')
+ *p = '\r';
+ }
+ else if (process_coding.eol_type == CODING_EOL_CRLF)
+ {
+ /* CR LFs have been replaced with LFs. Undo
+ that by inserting CRs in front of LFs in
+ the text inserted above. */
+ EMACS_INT bytepos, old_pt, old_pt_byte, nCR;
+
+ old_pt = PT;
+ old_pt_byte = PT_BYTE;
+ nCR = 0;
+
+ for (bytepos = PT_BYTE - 1;
+ bytepos >= pt_byte_orig;
+ --bytepos)
+ if (FETCH_BYTE (bytepos) == '\n')
+ {
+ EMACS_INT charpos = BYTE_TO_CHAR (bytepos);
+ TEMP_SET_PT_BOTH (charpos, bytepos);
+ insert_1_both ("\r", 1, 1, 0, 1, 0);
+ ++nCR;
+ }
+
+ TEMP_SET_PT_BOTH (old_pt + nCR, old_pt_byte + nCR);
+ }
+
+ /* Set the coding system symbol to that for
+ Unix-like EOL. */
+ eol_type = Fget (saved_coding.symbol, Qeol_type);
+ if (VECTORP (eol_type)
+ && ASIZE (eol_type) == 3
+ && SYMBOLP (AREF (eol_type, CODING_EOL_LF)))
+ coding = AREF (eol_type, CODING_EOL_LF);
+ else
+ coding = saved_coding.symbol;
+
+ process_coding.symbol = coding;
+ process_coding.eol_type = CODING_EOL_LF;
+ process_coding.mode
+ &= ~CODING_MODE_INHIBIT_INCONSISTENT_EOL;
+ }
- while (p < pend) *dst++ = *p++;
+ nread -= process_coding.consumed;
+ carryover = nread;
+ if (carryover > 0)
+ /* As CARRYOVER should not be that large, we had
+ better avoid overhead of bcopy. */
+ BCOPY_SHORT (buf + process_coding.consumed, buf,
+ carryover);
+ if (process_coding.result == CODING_FINISH_INSUFFICIENT_CMP)
+ {
+ /* The decoding ended because of insufficient data
+ area to record information about composition.
+ We must try decoding with additional data area
+ before reading more output for the process. */
+ coding_allocate_composition_data (&process_coding, PT);
+ goto repeat_decoding;
}
}
}
+
if (process_coding.mode & CODING_MODE_LAST_BLOCK)
- {
- if (carryover > 0)
- insert (bufptr, carryover);
- break;
- }
+ break;
+#if (CALLPROC_BUFFER_SIZE_MIN != CALLPROC_BUFFER_SIZE_MAX)
/* Make the buffer bigger as we continue to read more data,
- but not past 64k. */
- if (bufsize < 64 * 1024 && total_read > 32 * bufsize)
- {
- bufsize *= 2;
- bufptr = (char *) alloca (bufsize);
- }
+ but not past CALLPROC_BUFFER_SIZE_MAX. */
+ if (bufsize < CALLPROC_BUFFER_SIZE_MAX && total_read > 32 * bufsize)
+ if ((bufsize *= 2) > CALLPROC_BUFFER_SIZE_MAX)
+ bufsize = CALLPROC_BUFFER_SIZE_MAX;
+#endif
- if (!NILP (display) && INTERACTIVE)
+ if (display_p)
{
if (first)
prepare_menu_bars ();
first = 0;
- redisplay_preserve_echo_area ();
+ redisplay_preserve_echo_area (1);
+ /* This variable might have been set to 0 for code
+ detection. In that case, we set it back to 1 because
+ we should have already detected a coding system. */
+ display_on_the_fly = 1;
}
immediate_quit = 1;
QUIT;
}
give_up: ;
- }
- Vlast_coding_system_used = process_coding.symbol;
+ if (!NILP (buffer)
+ && process_coding.cmp_data)
+ {
+ coding_restore_composition (&process_coding, Fcurrent_buffer ());
+ coding_free_composition_data (&process_coding);
+ }
+
+ {
+ int post_read_count = SPECPDL_INDEX ();
+
+ record_unwind_protect (save_excursion_restore, save_excursion_save ());
+ inserted = PT - pt_orig;
+ TEMP_SET_PT_BOTH (pt_orig, pt_byte_orig);
+ if (SYMBOLP (process_coding.post_read_conversion)
+ && !NILP (Ffboundp (process_coding.post_read_conversion)))
+ call1 (process_coding.post_read_conversion, make_number (inserted));
+
+ Vlast_coding_system_used = process_coding.symbol;
+
+ /* If the caller required, let the buffer inherit the
+ coding-system used to decode the process output. */
+ if (inherit_process_coding_system)
+ call1 (intern ("after-insert-file-set-buffer-file-coding-system"),
+ make_number (total_read));
+
+ unbind_to (post_read_count, Qnil);
+ }
+ }
/* Wait for it to terminate, unless it already has. */
wait_for_termination (pid);
unbind_to (count, Qnil);
+ if (synch_process_termsig)
+ {
+ char *signame;
+
+ synchronize_system_messages_locale ();
+ signame = strsignal (synch_process_termsig);
+
+ if (signame == 0)
+ signame = "unknown";
+
+ synch_process_death = signame;
+ }
+
if (synch_process_death)
- return build_string (synch_process_death);
+ return code_convert_string_norecord (build_string (synch_process_death),
+ Vlocale_coding_system, 0);
return make_number (synch_process_retcode);
}
#endif
delete_temp_file (name)
Lisp_Object name;
{
- /* Use Fdelete_file (indirectly) because that runs a file name handler.
- We did that when writing the file, so we should do so when deleting. */
+ /* Suppress jka-compr handling, etc. */
+ int count = SPECPDL_INDEX ();
+ specbind (intern ("file-name-handler-alist"), Qnil);
internal_delete_file (name);
+ unbind_to (count, Qnil);
+ return Qnil;
}
DEFUN ("call-process-region", Fcall_process_region, Scall_process_region,
- 3, MANY, 0,
- "Send text from START to END to a synchronous process running PROGRAM.\n\
-Delete the text if fourth arg DELETE is non-nil.\n\
-\n\
-Insert output in BUFFER before point; t means current buffer;\n\
- nil for BUFFER means discard it; 0 means discard and don't wait.\n\
-BUFFER can also have the form (REAL-BUFFER STDERR-FILE); in that case,\n\
-REAL-BUFFER says what to do with standard output, as above,\n\
-while STDERR-FILE says what to do with standard error in the child.\n\
-STDERR-FILE may be nil (discard standard error output),\n\
-t (mix it with ordinary output), or a file name string.\n\
-\n\
-Sixth arg DISPLAY non-nil means redisplay buffer as output is inserted.\n\
-Remaining args are passed to PROGRAM at startup as command args.\n\
-\n\
-If BUFFER is nil, `call-process-region' returns immediately with value nil.\n\
-Otherwise it waits for PROGRAM to terminate\n\
-and returns a numeric exit status or a signal description string.\n\
-If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.")
- (nargs, args)
+ 3, MANY, 0,
+ doc: /* Send text from START to END to a synchronous process running PROGRAM.
+The remaining arguments are optional.
+Delete the text if fourth arg DELETE is non-nil.
+
+Insert output in BUFFER before point; t means current buffer;
+ nil for BUFFER means discard it; 0 means discard and don't wait.
+BUFFER can also have the form (REAL-BUFFER STDERR-FILE); in that case,
+REAL-BUFFER says what to do with standard output, as above,
+while STDERR-FILE says what to do with standard error in the child.
+STDERR-FILE may be nil (discard standard error output),
+t (mix it with ordinary output), or a file name string.
+
+Sixth arg DISPLAY non-nil means redisplay buffer as output is inserted.
+Remaining args are passed to PROGRAM at startup as command args.
+
+If BUFFER is 0, `call-process-region' returns immediately with value nil.
+Otherwise it waits for PROGRAM to terminate
+and returns a numeric exit status or a signal description string.
+If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.
+
+usage: (call-process-region START END PROGRAM &optional DELETE BUFFER DISPLAY &rest ARGS) */)
+ (nargs, args)
int nargs;
register Lisp_Object *args;
{
struct gcpro gcpro1;
Lisp_Object filename_string;
register Lisp_Object start, end;
- int count = specpdl_ptr - specpdl;
+ int count = SPECPDL_INDEX ();
/* Qt denotes we have not yet called Ffind_operation_coding_system. */
- Lisp_Object coding_systems = Qt;
+ Lisp_Object coding_systems;
Lisp_Object val, *args2;
int i;
#ifdef DOS_NT
char *tempfile;
char *outf = '\0';
- if ((outf = egetenv ("TMP")) || (outf = egetenv ("TEMP")))
+ if ((outf = egetenv ("TMPDIR"))
+ || (outf = egetenv ("TMP"))
+ || (outf = egetenv ("TEMP")))
strcpy (tempfile = alloca (strlen (outf) + 20), outf);
else
{
strcat (tempfile, "detmp.XXX");
#endif
#else /* not DOS_NT */
- char *tempfile = (char *) alloca (STRING_BYTES (XSTRING (Vtemp_file_name_pattern)) + 1);
- bcopy (XSTRING (Vtemp_file_name_pattern)->data, tempfile,
- STRING_BYTES (XSTRING (Vtemp_file_name_pattern)) + 1);
+ char *tempfile = (char *) alloca (SBYTES (Vtemp_file_name_pattern) + 1);
+ bcopy (SDATA (Vtemp_file_name_pattern), tempfile,
+ SBYTES (Vtemp_file_name_pattern) + 1);
#endif /* not DOS_NT */
+ coding_systems = Qt;
+
+#ifdef HAVE_MKSTEMP
+ {
+ int fd = mkstemp (tempfile);
+ if (fd == -1)
+ report_file_error ("Failed to open temporary file",
+ Fcons (Vtemp_file_name_pattern, Qnil));
+ else
+ close (fd);
+ }
+#else
mktemp (tempfile);
+#endif
filename_string = build_string (tempfile);
GCPRO1 (filename_string);
start = args[0];
end = args[1];
/* Decide coding-system of the contents of the temporary file. */
-#ifdef DOS_NT
- /* This is to cause find-buffer-file-type-coding-system (see
- dos-w32.el) to choose correct EOL translation for write-region. */
- specbind (Qbuffer_file_type, Vbinary_process_input);
-#endif
if (!NILP (Vcoding_system_for_write))
val = Vcoding_system_for_write;
else if (NILP (current_buffer->enable_multibyte_characters))
for (i = 0; i < nargs; i++) args2[i + 1] = args[i];
coding_systems = Ffind_operation_coding_system (nargs + 1, args2);
if (CONSP (coding_systems))
- val = XCONS (coding_systems)->cdr;
+ val = XCDR (coding_systems);
else if (CONSP (Vdefault_process_coding_system))
- val = XCONS (Vdefault_process_coding_system)->cdr;
+ val = XCDR (Vdefault_process_coding_system);
else
val = Qnil;
}
-#ifdef DOS_NT
- /* binary-process-input tells whether the buffer needs to be
- written with EOL conversions, but it doesn't say anything
- about the rest of text encoding. It takes effect whenever
- the coding system doesn't otherwise specify what to do for
- eol conversion. */
- if (NILP (val))
- {
- if (! NILP (Vbinary_process_input))
- val = intern ("undecided-unix");
- else
- val = intern ("undecided-dos");
- }
- else if (SYMBOLP (val) && NILP (Vcoding_system_for_write))
- {
- Lisp_Object eolval;
- eolval = Fget (val, Qeol_type);
- if (VECTORP (eolval) && XVECTOR (eolval)->size > 1)
- /* Use element 1 (CRLF conversion) for "text",
- and element 0 (LF conversion) for "binary". */
- val = XVECTOR (eolval)->contents[NILP (Vbinary_process_input)];
- }
-#endif
+ {
+ int count1 = SPECPDL_INDEX ();
+
+ specbind (intern ("coding-system-for-write"), val);
+ /* POSIX lets mk[s]temp use "."; don't invoke jka-compr if we
+ happen to get a ".Z" suffix. */
+ specbind (intern ("file-name-handler-alist"), Qnil);
+ Fwrite_region (start, end, filename_string, Qnil, Qlambda, Qnil, Qnil);
- specbind (intern ("coding-system-for-write"), val);
- Fwrite_region (start, end, filename_string, Qnil, Qlambda, Qnil, Qnil);
+ unbind_to (count1, Qnil);
+ }
- /* Note that Fcall_process takes care of binding
+ /* Note that Fcall_process takes care of binding
coding-system-for-read. */
record_unwind_protect (delete_temp_file, filename_string);
- if (!NILP (args[3]))
+ if (nargs > 3 && !NILP (args[3]))
Fdelete_region (start, end);
- args[3] = filename_string;
+ if (nargs > 3)
+ {
+ args += 2;
+ nargs -= 2;
+ }
+ else
+ {
+ args[0] = args[2];
+ nargs = 2;
+ }
+ args[1] = filename_string;
- RETURN_UNGCPRO (unbind_to (count, Fcall_process (nargs - 2, args + 2)));
+ RETURN_UNGCPRO (unbind_to (count, Fcall_process (nargs, args)));
}
\f
#ifndef VMS /* VMS version is in vmsproc.c. */
Therefore, the superior process must save and restore the value
of environ around the vfork and the call to this function.
- ENV is the environment for the subprocess.
-
SET_PGRP is nonzero if we should put the subprocess into a separate
- process group.
+ process group.
CURRENT_DIR is an elisp string giving the path of the current
directory the subprocess should have. Since we can't really signal
int set_pgrp;
Lisp_Object current_dir;
{
-#ifdef MSDOS
- /* The MSDOS port of gcc cannot fork, vfork, ... so we must call system
- instead. */
-#else /* not MSDOS */
char **env;
char *pwd_var;
#ifdef WINDOWSNT
#ifdef SET_EMACS_PRIORITY
{
- extern int emacs_priority;
+ extern EMACS_INT emacs_priority;
if (emacs_priority < 0)
nice (- emacs_priority);
/* Close Emacs's descriptors that this process should not have. */
close_process_descs ();
#endif
+ /* DOS_NT isn't in a vfork, so if we are in the middle of load-file,
+ we will lose if we call close_load_descs here. */
+#ifndef DOS_NT
close_load_descs ();
+#endif
/* Note that use of alloca is always safe here. It's obvious for systems
that do not have true vfork or that have true (stack) alloca.
register char *temp;
register int i;
- i = STRING_BYTES (XSTRING (current_dir));
+ i = SBYTES (current_dir);
+#ifdef MSDOS
+ /* MSDOS must have all environment variables malloc'ed, because
+ low-level libc functions that launch subsidiary processes rely
+ on that. */
+ pwd_var = (char *) xmalloc (i + 6);
+#else
pwd_var = (char *) alloca (i + 6);
+#endif
temp = pwd_var + 4;
bcopy ("PWD=", pwd_var, 4);
- bcopy (XSTRING (current_dir)->data, temp, i);
+ bcopy (SDATA (current_dir), temp, i);
if (!IS_DIRECTORY_SEP (temp[i - 1])) temp[i++] = DIRECTORY_SEP;
temp[i] = 0;
-#ifndef WINDOWSNT
+#ifndef DOS_NT
/* We can't signal an Elisp error here; we're in a vfork. Since
the callers check the current directory before forking, this
should only return an error if the directory's permissions
_exit (errno);
#endif
+#ifdef DOS_NT
+ /* Get past the drive letter, so that d:/ is left alone. */
+ if (i > 2 && IS_DEVICE_SEP (temp[1]) && IS_DIRECTORY_SEP (temp[2]))
+ {
+ temp += 2;
+ i -= 2;
+ }
+#endif
+
/* Strip trailing slashes for PWD, but leave "/" and "//" alone. */
while (i > 2 && IS_DIRECTORY_SEP (temp[i - 1]))
temp[--i] = 0;
new_length = 0;
for (tem = Vprocess_environment;
- CONSP (tem) && STRINGP (XCONS (tem)->car);
- tem = XCONS (tem)->cdr)
+ CONSP (tem) && STRINGP (XCAR (tem));
+ tem = XCDR (tem))
new_length++;
/* new_length + 2 to include PWD and terminating 0. */
/* Copy the Vprocess_environment strings into new_env. */
for (tem = Vprocess_environment;
- CONSP (tem) && STRINGP (XCONS (tem)->car);
- tem = XCONS (tem)->cdr)
+ CONSP (tem) && STRINGP (XCAR (tem));
+ tem = XCDR (tem))
{
char **ep = env;
- char *string = (char *) XSTRING (XCONS (tem)->car)->data;
+ char *string = (char *) SDATA (XCAR (tem));
/* See if this string duplicates any string already in the env.
If so, don't put it in.
When an env var has multiple definitions,
}
#ifdef WINDOWSNT
prepare_standard_handles (in, out, err, handles);
- set_process_dir (XSTRING (current_dir)->data);
+ set_process_dir (SDATA (current_dir));
#else /* not WINDOWSNT */
/* Make sure that in, out, and err are not actually already in
descriptors zero, one, or two; this could happen if Emacs is
err = relocate_fd (err, 3);
}
- close (0);
- close (1);
- close (2);
+#ifndef MSDOS
+ emacs_close (0);
+ emacs_close (1);
+ emacs_close (2);
dup2 (in, 0);
dup2 (out, 1);
dup2 (err, 2);
- close (in);
- close (out);
- close (err);
+ emacs_close (in);
+ emacs_close (out);
+ emacs_close (err);
+#endif /* not MSDOS */
#endif /* not WINDOWSNT */
#if defined(USG) && !defined(BSD_PGRPS)
/* setpgrp_of_tty is incorrect here; it uses input_fd. */
EMACS_SET_TTY_PGRP (0, &pid);
-#ifdef vipc
- something missing here;
-#endif /* vipc */
-
+#ifdef MSDOS
+ pid = run_msdos_command (new_argv, pwd_var + 4, in, out, err, env);
+ xfree (pwd_var);
+ if (pid == -1)
+ /* An error occurred while trying to run the subprocess. */
+ report_file_error ("Spawning child process", Qnil);
+ return pid;
+#else /* not MSDOS */
#ifdef WINDOWSNT
/* Spawn the child. (See ntproc.c:Spawnve). */
cpid = spawnve (_P_NOWAIT, new_argv[0], new_argv, env);
environ = env;
execvp (new_argv[0], new_argv);
- write (1, "Can't exec program: ", 20);
- write (1, new_argv[0], strlen (new_argv[0]));
- write (1, "\n", 1);
+ emacs_write (1, "Can't exec program: ", 20);
+ emacs_write (1, new_argv[0], strlen (new_argv[0]));
+ emacs_write (1, "\n", 1);
_exit (1);
#endif /* not WINDOWSNT */
#endif /* not MSDOS */
char *message1 = "Error while setting up child: ";
char *errmessage = strerror (errno);
char *message2 = "\n";
- write (2, message1, strlen (message1));
- write (2, errmessage, strlen (errmessage));
- write (2, message2, strlen (message2));
+ emacs_write (2, message1, strlen (message1));
+ emacs_write (2, errmessage, strlen (errmessage));
+ emacs_write (2, message2, strlen (message2));
_exit (1);
}
/* Note that we hold the original FD open while we recurse,
to guarantee we'll get a new FD if we need it. */
new = relocate_fd (new, minfd);
- close (fd);
+ emacs_close (fd);
return new;
}
}
{
Lisp_Object scan;
- for (scan = Vprocess_environment; CONSP (scan); scan = XCONS (scan)->cdr)
+ for (scan = Vprocess_environment; CONSP (scan); scan = XCDR (scan))
{
Lisp_Object entry;
- entry = XCONS (scan)->car;
+ entry = XCAR (scan);
if (STRINGP (entry)
- && STRING_BYTES (XSTRING (entry)) > varlen
- && XSTRING (entry)->data[varlen] == '='
+ && SBYTES (entry) > varlen
+ && SREF (entry, varlen) == '='
#ifdef WINDOWSNT
/* NT environment variables are case insensitive. */
- && ! strnicmp (XSTRING (entry)->data, var, varlen)
+ && ! strnicmp (SDATA (entry), var, varlen)
#else /* not WINDOWSNT */
- && ! bcmp (XSTRING (entry)->data, var, varlen)
+ && ! bcmp (SDATA (entry), var, varlen)
#endif /* not WINDOWSNT */
)
{
- *value = (char *) XSTRING (entry)->data + (varlen + 1);
- *valuelen = STRING_BYTES (XSTRING (entry)) - (varlen + 1);
+ *value = (char *) SDATA (entry) + (varlen + 1);
+ *valuelen = SBYTES (entry) - (varlen + 1);
return 1;
}
}
return 0;
}
-DEFUN ("getenv", Fgetenv, Sgetenv, 1, 1, 0,
- "Return the value of environment variable VAR, as a string.\n\
-VAR should be a string. Value is nil if VAR is undefined in the environment.\n\
-This function consults the variable ``process-environment'' for its value.")
- (var)
+DEFUN ("getenv-internal", Fgetenv_internal, Sgetenv_internal, 1, 1, 0,
+ doc: /* Return the value of environment variable VAR, as a string.
+VAR should be a string. Value is nil if VAR is undefined in the environment.
+This function consults the variable ``process-environment'' for its value. */)
+ (var)
Lisp_Object var;
{
char *value;
int valuelen;
- CHECK_STRING (var, 0);
- if (getenv_internal (XSTRING (var)->data, STRING_BYTES (XSTRING (var)),
+ CHECK_STRING (var);
+ if (getenv_internal (SDATA (var), SBYTES (var),
&value, &valuelen))
return make_string (value, valuelen);
else
#endif /* not VMS */
\f
/* This is run before init_cmdargs. */
-
+
void
init_callproc_1 ()
{
char *doc_dir = egetenv ("EMACSDOC");
Vdata_directory
- = Ffile_name_as_directory (build_string (data_dir ? data_dir
+ = Ffile_name_as_directory (build_string (data_dir ? data_dir
: PATH_DATA));
Vdoc_directory
= Ffile_name_as_directory (build_string (doc_dir ? doc_dir
: PATH_DOC));
/* Check the EMACSPATH environment variable, defaulting to the
- PATH_EXEC path from paths.h. */
+ PATH_EXEC path from epaths.h. */
Vexec_path = decode_env_path ("EMACSPATH", PATH_EXEC);
Vexec_directory = Ffile_name_as_directory (Fcar (Vexec_path));
Vexec_path = nconc2 (decode_env_path ("PATH", ""), Vexec_path);
init_callproc ()
{
char *data_dir = egetenv ("EMACSDATA");
-
+
register char * sh;
Lisp_Object tempdir;
- if (initialized && !NILP (Vinstallation_directory))
+ if (!NILP (Vinstallation_directory))
{
/* Add to the path the lib-src subdir of the installation dir. */
Lisp_Object tem;
tem = Fexpand_file_name (build_string ("lib-src"),
Vinstallation_directory);
- if (NILP (Fmember (tem, Vexec_path)))
- {
#ifndef DOS_NT
/* MSDOS uses wrapped binaries, so don't do this. */
- Vexec_path = nconc2 (Vexec_path, Fcons (tem, Qnil));
- Vexec_directory = Ffile_name_as_directory (tem);
-#endif /* not DOS_NT */
+ if (NILP (Fmember (tem, Vexec_path)))
+ {
+ Vexec_path = decode_env_path ("EMACSPATH", PATH_EXEC);
+ Vexec_path = Fcons (tem, Vexec_path);
+ Vexec_path = nconc2 (decode_env_path ("PATH", ""), Vexec_path);
}
+ Vexec_directory = Ffile_name_as_directory (tem);
+#endif /* not DOS_NT */
+
/* Maybe use ../etc as well as ../lib-src. */
if (data_dir == 0)
{
source directory. */
if (data_dir == 0)
{
- Lisp_Object tem, tem1, newdir;
+ Lisp_Object tem, tem1, srcdir;
+ srcdir = Fexpand_file_name (build_string ("../src/"),
+ build_string (PATH_DUMPLOADSEARCH));
tem = Fexpand_file_name (build_string ("GNU"), Vdata_directory);
tem1 = Ffile_exists_p (tem);
- if (NILP (tem1))
+ if (!NILP (Fequal (srcdir, Vinvocation_directory)) || NILP (tem1))
{
+ Lisp_Object newdir;
newdir = Fexpand_file_name (build_string ("../etc/"),
build_string (PATH_DUMPLOADSEARCH));
tem = Fexpand_file_name (build_string ("GNU"), newdir);
#endif
{
tempdir = Fdirectory_file_name (Vexec_directory);
- if (access (XSTRING (tempdir)->data, 0) < 0)
+ if (access (SDATA (tempdir), 0) < 0)
dir_warning ("Warning: arch-dependent data dir (%s) does not exist.\n",
Vexec_directory);
}
tempdir = Fdirectory_file_name (Vdata_directory);
- if (access (XSTRING (tempdir)->data, 0) < 0)
+ if (access (SDATA (tempdir), 0) < 0)
dir_warning ("Warning: arch-independent data dir (%s) does not exist.\n",
Vdata_directory);
else
Vtemp_file_name_pattern = build_string ("/tmp/emacsXXXXXX");
#endif
+
+#ifdef DOS_NT
+ Vshared_game_score_directory = Qnil;
+#else
+ Vshared_game_score_directory = build_string (PATH_GAME);
+ if (NILP (Ffile_directory_p (Vshared_game_score_directory)))
+ Vshared_game_score_directory = Qnil;
+#endif
}
void
#ifdef DOS_NT
Qbuffer_file_type = intern ("buffer-file-type");
staticpro (&Qbuffer_file_type);
-
- DEFVAR_LISP ("binary-process-input", &Vbinary_process_input,
- "*If non-nil then new subprocesses are assumed to take binary input.");
- Vbinary_process_input = Qnil;
-
- DEFVAR_LISP ("binary-process-output", &Vbinary_process_output,
- "*If non-nil then new subprocesses are assumed to produce binary output.");
- Vbinary_process_output = Qnil;
#endif /* DOS_NT */
DEFVAR_LISP ("shell-file-name", &Vshell_file_name,
- "*File name to load inferior shells from.\n\
-Initialized from the SHELL environment variable.");
+ doc: /* *File name to load inferior shells from.
+Initialized from the SHELL environment variable. */);
DEFVAR_LISP ("exec-path", &Vexec_path,
- "*List of directories to search programs to run in subprocesses.\n\
-Each element is a string (directory name) or nil (try default directory).");
+ doc: /* *List of directories to search programs to run in subprocesses.
+Each element is a string (directory name) or nil (try default directory). */);
+
+ DEFVAR_LISP ("exec-suffixes", &Vexec_suffixes,
+ doc: /* *List of suffixes to try to find executable file names.
+Each element is a string. */);
+ Vexec_suffixes = Qnil;
DEFVAR_LISP ("exec-directory", &Vexec_directory,
- "Directory for executables for Emacs to invoke.\n\
-More generally, this includes any architecture-dependent files\n\
-that are built and installed from the Emacs distribution.");
+ doc: /* Directory for executables for Emacs to invoke.
+More generally, this includes any architecture-dependent files
+that are built and installed from the Emacs distribution. */);
DEFVAR_LISP ("data-directory", &Vdata_directory,
- "Directory of machine-independent files that come with GNU Emacs.\n\
-These are files intended for Emacs to use while it runs.");
+ doc: /* Directory of machine-independent files that come with GNU Emacs.
+These are files intended for Emacs to use while it runs. */);
DEFVAR_LISP ("doc-directory", &Vdoc_directory,
- "Directory containing the DOC file that comes with GNU Emacs.\n\
-This is usually the same as data-directory.");
+ doc: /* Directory containing the DOC file that comes with GNU Emacs.
+This is usually the same as data-directory. */);
DEFVAR_LISP ("configure-info-directory", &Vconfigure_info_directory,
- "For internal use by the build procedure only.\n\
-This is the name of the directory in which the build procedure installed\n\
-Emacs's info files; the default value for Info-default-directory-list\n\
-includes this.");
+ doc: /* For internal use by the build procedure only.
+This is the name of the directory in which the build procedure installed
+Emacs's info files; the default value for Info-default-directory-list
+includes this. */);
Vconfigure_info_directory = build_string (PATH_INFO);
+ DEFVAR_LISP ("shared-game-score-directory", &Vshared_game_score_directory,
+ doc: /* Directory of score files for games which come with GNU Emacs.
+If this variable is nil, then Emacs is unable to use a shared directory. */);
+#ifdef DOS_NT
+ Vshared_game_score_directory = Qnil;
+#else
+ Vshared_game_score_directory = build_string (PATH_GAME);
+#endif
+
DEFVAR_LISP ("temp-file-name-pattern", &Vtemp_file_name_pattern,
- "Pattern for making names for temporary files.\n\
-This is used by `call-process-region'.");
+ doc: /* Pattern for making names for temporary files.
+This is used by `call-process-region'. */);
/* This variable is initialized in init_callproc. */
DEFVAR_LISP ("process-environment", &Vprocess_environment,
- "List of environment variables for subprocesses to inherit.\n\
-Each element should be a string of the form ENVVARNAME=VALUE.\n\
-The environment which Emacs inherits is placed in this variable\n\
-when Emacs starts.");
+ doc: /* List of environment variables for subprocesses to inherit.
+Each element should be a string of the form ENVVARNAME=VALUE.
+If multiple entries define the same variable, the first one always
+takes precedence.
+The environment which Emacs inherits is placed in this variable
+when Emacs starts.
+Non-ASCII characters are encoded according to the initial value of
+`locale-coding-system', i.e. the elements must normally be decoded for use.
+See `setenv' and `getenv'. */);
#ifndef VMS
defsubr (&Scall_process);
- defsubr (&Sgetenv);
+ defsubr (&Sgetenv_internal);
#endif
defsubr (&Scall_process_region);
}
+
+/* arch-tag: 769b8045-1df7-4d2b-8968-e3fb49017f95
+ (do not change this comment) */