/* 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.
#include "msdos.h"
#endif
-#ifdef VMS
-extern noshare char **environ;
-#else
#ifndef USE_CRT_DLL
extern char **environ;
#endif
-#endif
#ifdef HAVE_SETPGID
#if !defined (USG) || defined (BSD_PGRPS)
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;
EXFUN (Fgetenv_internal, 2);
-#ifndef VMS /* VMS version is in vmsproc.c. */
-
static Lisp_Object
call_process_kill (fdpid)
Lisp_Object fdpid;
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 *));
+ register const unsigned char **new_argv;
struct buffer *old = current_buffer;
/* File to use for stderr in the child.
t means use same as standard output. */
#ifdef MSDOS /* Demacs 1.1.1 91/10/16 HIRANO Satoshi */
char *outf, *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 */
a sensible default. */
current_dir = build_string ("~/");
current_dir = expand_and_dir_to_file (current_dir, Qnil);
+ current_dir = Ffile_name_as_directory (current_dir);
+
if (NILP (Ffile_accessible_directory_p (current_dir)))
report_file_error ("Setting current directory",
Fcons (current_buffer->directory, Qnil));
&& 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;
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")))
emacs_close (filefd);
report_file_error ("Creating process pipe", Qnil);
}
-#endif
-#if 0
- /* Replaced by close_process_descs */
- set_exclusive_use (fd[0]);
#endif
}
Vlocale_coding_system, 0);
return make_number (synch_process_retcode);
}
-#endif
\f
static Lisp_Object
delete_temp_file (name)
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
RETURN_UNGCPRO (unbind_to (count, Fcall_process (nargs, args)));
}
\f
-#ifndef VMS /* VMS version is in vmsproc.c. */
-
static int relocate_fd ();
static char **
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;
{
return 0;
}
-#endif /* not VMS */
\f
/* This is run before init_cmdargs. */
dir_warning ("Warning: arch-independent data dir (%s) does not exist.\n",
Vdata_directory);
-#ifdef VMS
- Vshell_file_name = build_string ("*dcl*");
-#else
sh = (char *) getenv ("SHELL");
Vshell_file_name = build_string (sh ? sh : "/bin/sh");
-#endif
-
-#ifdef VMS
- Vtemp_file_name_pattern = build_string ("tmp:emacsXXXXXX.");
-#else
- 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");
-#endif
#ifdef DOS_NT
Vshared_game_score_directory = Qnil;
register char **envp;
#ifndef CANNOT_DUMP
if (initialized)
-#endif
{
+#else
+ {
+ Vprocess_environment = Qnil;
+#endif
for (envp = environ; *envp; envp++)
Vprocess_environment = Fcons (build_string (*envp),
Vprocess_environment);
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.
See `setenv' and `getenv'. */);
Vprocess_environment = Qnil;
-#ifndef VMS
defsubr (&Scall_process);
defsubr (&Sgetenv_internal);
-#endif
defsubr (&Scall_process_region);
}