/* Synchronous subprocess invocation for GNU Emacs.
Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001,
- 2002, 2003, 2004, 2005, 2006, 2007, 2008
+ 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009
Free Software Foundation, Inc.
This file is part of GNU Emacs.
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;
+
+/* Pattern used by call-process-region to make temp files. */
+static Lisp_Object Vtemp_file_name_pattern;
+
+extern Lisp_Object Vtemporary_file_directory;
Lisp_Object Vshell_file_name;
}
Lisp_Object
-call_process_cleanup (fdpid)
- Lisp_Object fdpid;
+call_process_cleanup (arg)
+ Lisp_Object arg;
{
+ Lisp_Object fdpid = Fcdr (arg);
+#if defined (MSDOS)
+ Lisp_Object file;
+#else
+ int pid;
+#endif
+
+ Fset_buffer (Fcar (arg));
+
#if defined (MSDOS)
/* for MSDOS fdpid is really (fd . tempfile) */
- register Lisp_Object file;
file = Fcdr (fdpid);
emacs_close (XFASTINT (Fcar (fdpid)));
if (strcmp (SDATA (file), NULL_DEVICE) != 0)
unlink (SDATA (file));
#else /* not MSDOS */
- register int pid = XFASTINT (Fcdr (fdpid));
+ pid = XFASTINT (Fcdr (fdpid));
if (call_process_exited)
{
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;
+ register const unsigned char **new_argv;
/* File to use for stderr in the child.
t means use same as standard output. */
Lisp_Object error_file;
}
/* Search for program; barf if not found. */
{
- struct gcpro gcpro1;
+ struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
- GCPRO1 (current_dir);
+ GCPRO4 (infile, buffer, current_dir, error_file);
openp (Vexec_path, args[0], Vexec_suffixes, &path, make_number (X_OK));
UNGCPRO;
}
&& SREF (path, 1) == ':')
path = Fsubstring (path, make_number (2), Qnil);
- new_argv[0] = SDATA (path);
+ new_argv = (const unsigned char **)
+ alloca (max (2, nargs - 2) * sizeof (char *));
if (nargs > 4)
{
register int i;
- struct gcpro gcpro1, gcpro2, gcpro3;
+ struct gcpro gcpro1, gcpro2, gcpro3, gcpro4, gcpro5;
- GCPRO3 (infile, buffer, current_dir);
+ GCPRO5 (infile, buffer, current_dir, path, error_file);
argument_coding.dst_multibyte = 0;
for (i = 4; i < nargs; i++)
{
if (CODING_REQUIRE_ENCODING (&argument_coding))
/* We must encode this argument. */
args[i] = encode_coding_string (&argument_coding, args[i], 1);
- new_argv[i - 3] = SDATA (args[i]);
}
UNGCPRO;
- new_argv[nargs - 3] = 0;
+ for (i = 4; i < nargs; i++)
+ new_argv[i - 3] = SDATA (args[i]);
+ new_argv[i - 3] = 0;
}
else
new_argv[1] = 0;
+ new_argv[0] = SDATA (path);
#ifdef MSDOS /* MW, July 1993 */
if ((outf = egetenv ("TMPDIR")))
#if defined(MSDOS)
/* MSDOS needs different cleanup information. */
record_unwind_protect (call_process_cleanup,
- Fcons (make_number (fd[0]), build_string (tempfile)));
+ Fcons (Fcurrent_buffer (),
+ Fcons (make_number (fd[0]),
+ build_string (tempfile))));
#else
record_unwind_protect (call_process_cleanup,
- Fcons (make_number (fd[0]), make_number (pid)));
+ Fcons (Fcurrent_buffer (),
+ Fcons (make_number (fd[0]), make_number (pid))));
#endif /* not MSDOS */
else
{ /* We have to decode the input. */
Lisp_Object curbuf;
+ int count1 = SPECPDL_INDEX ();
XSETBUFFER (curbuf, current_buffer);
+ /* We cannot allow after-change-functions be run
+ during decoding, because that might modify the
+ buffer, while we rely on process_coding.produced to
+ faithfully reflect inserted text until we
+ TEMP_SET_PT_BOTH below. */
+ specbind (Qinhibit_modification_hooks, Qt);
decode_coding_c_string (&process_coding, buf, nread,
curbuf);
+ unbind_to (count1, Qnil);
if (display_on_the_fly
&& CODING_REQUIRE_DETECTION (&saved_coding)
&& ! CODING_REQUIRE_DETECTION (&process_coding))
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));
+ make_number (total_read));
}
/* Wait for it to terminate, unless it already has. */
immediate_quit = 0;
- set_buffer_internal (old);
-
/* Don't kill any children that the subprocess may have left behind
when exiting. */
call_process_exited = 1;
Lisp_Object coding_systems;
Lisp_Object val, *args2;
int i;
-#ifdef DOS_NT
char *tempfile;
- char *outf = '\0';
+ Lisp_Object tmpdir, pattern;
- if ((outf = egetenv ("TMPDIR"))
- || (outf = egetenv ("TMP"))
- || (outf = egetenv ("TEMP")))
- strcpy (tempfile = alloca (strlen (outf) + 20), outf);
+ if (STRINGP (Vtemporary_file_directory))
+ tmpdir = Vtemporary_file_directory;
else
{
- tempfile = alloca (20);
- *tempfile = '\0';
- }
- if (!IS_DIRECTORY_SEP (tempfile[strlen (tempfile) - 1]))
- strcat (tempfile, "/");
- if ('/' == DIRECTORY_SEP)
- dostounix_filename (tempfile);
- else
- unixtodos_filename (tempfile);
-#ifdef WINDOWSNT
- strcat (tempfile, "emXXXXXX");
-#else
- strcat (tempfile, "detmp.XXX");
+#ifndef DOS_NT
+ if (getenv ("TMPDIR"))
+ tmpdir = build_string (getenv ("TMPDIR"));
+ else
+ tmpdir = build_string ("/tmp/");
+#else /* DOS_NT */
+ char *outf;
+ if ((outf = egetenv ("TMPDIR"))
+ || (outf = egetenv ("TMP"))
+ || (outf = egetenv ("TEMP")))
+ tmpdir = build_string (outf);
+ else
+ tmpdir = Ffile_name_as_directory (build_string ("c:/temp"));
#endif
-#else /* not DOS_NT */
- 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 */
+ }
+ pattern = Fexpand_file_name (Vtemp_file_name_pattern, tmpdir);
+ tempfile = (char *) alloca (SBYTES (pattern) + 1);
+ bcopy (SDATA (pattern), tempfile, SBYTES (pattern) + 1);
coding_systems = Qt;
#ifdef HAVE_MKSTEMP
VARIABLE should be a string. Value is nil if VARIABLE is undefined in
the environment. Otherwise, value is a string.
-This function searches `process-environment' for VARIABLE. If it is
-not found there, then it continues the search in the environment list
-of the selected frame.
+This function searches `process-environment' for VARIABLE.
If optional parameter ENV is a list, then search this list instead of
-`process-environment', and return t when encountering a negative entry.
-
-If it is a frame, then this function will ignore `process-environment' and
-will simply look up the variable in that frame's environment. */)
+`process-environment', and return t when encountering a negative entry
+\(an entry for a variable with no value). */)
(variable, env)
Lisp_Object variable, env;
{
sh = (char *) getenv ("SHELL");
Vshell_file_name = build_string (sh ? sh : "/bin/sh");
- if (getenv ("TMPDIR"))
- {
- char *dir = getenv ("TMPDIR");
- Vtemp_file_name_pattern
- = Fexpand_file_name (build_string ("emacsXXXXXX"),
- build_string (dir));
- }
- else
- Vtemp_file_name_pattern = build_string ("/tmp/emacsXXXXXX");
-
#ifdef DOS_NT
Vshared_game_score_directory = Qnil;
#else
staticpro (&Qbuffer_file_type);
#endif /* DOS_NT */
+#ifndef DOS_NT
+ Vtemp_file_name_pattern = build_string ("emacsXXXXXX");
+#elif defined (WINDOWSNT)
+ Vtemp_file_name_pattern = build_string ("emXXXXXX");
+#else
+ Vtemp_file_name_pattern = build_string ("detmp.XXX");
+#endif
+ staticpro (&Vtemp_file_name_pattern);
+
DEFVAR_LISP ("shell-file-name", &Vshell_file_name,
doc: /* *File name to load inferior shells from.
Initialized from the SHELL environment variable, or to a system-dependent
Vshared_game_score_directory = build_string (PATH_GAME);
#endif
- DEFVAR_LISP ("temp-file-name-pattern", &Vtemp_file_name_pattern,
- doc: /* Pattern for making names for temporary files.
-This is used by `call-process-region'. */);
- /* This variable is initialized in init_callproc. */
-
DEFVAR_LISP ("initial-environment", &Vinitial_environment,
doc: /* List of environment variables inherited from the parent process.
Each element should be a string of the form ENVVARNAME=VALUE.
HCoop / bpt / emacs.git / blobdiff