/* Synchronous subprocess invocation for GNU Emacs.
- Copyright (C) 1985,86,87,88,93,94,95,99, 2000, 2001
+ Copyright (C) 1985,86,87,88,93,94,95,99, 2000,01,02,03,04
Free Software Foundation, Inc.
This file is part of GNU Emacs.
#endif
#include <sys/file.h>
-#ifdef USG5
+#ifdef HAVE_FCNTL_H
#define INCLUDED_FCNTL
#include <fcntl.h>
#endif
Lisp_Object Vexec_path, Vexec_directory, Vexec_suffixes;
Lisp_Object Vdata_directory, Vdoc_directory;
-Lisp_Object Vconfigure_info_directory, Vgame_score_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;
register Lisp_Object file;
file = Fcdr (fdpid);
emacs_close (XFASTINT (Fcar (fdpid)));
- if (strcmp (XSTRING (file)-> data, NULL_DEVICE) != 0)
- unlink (XSTRING (file)->data);
+ if (strcmp (SDATA (file), NULL_DEVICE) != 0)
+ unlink (SDATA (file));
#else /* not MSDOS and not MAC_OS8 */
register int pid = XFASTINT (Fcdr (fdpid));
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;
register int pid;
char buf[16384];
char *bufptr = buf;
- int bufsize = 16384;
- int count = specpdl_ptr - specpdl;
+ int bufsize = sizeof buf;
+ int count = SPECPDL_INDEX ();
- register unsigned char **new_argv
- = (unsigned char **) alloca ((max (2, nargs - 2)) * sizeof (char *));
+ 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. */
#ifndef subprocesses
/* Without asynchronous processes we cannot have BUFFER == 0. */
- if (nargs >= 3
+ if (nargs >= 3
&& (INTEGERP (CONSP (args[2]) ? XCAR (args[2]) : args[2])))
error ("Operating system cannot handle asynchronous subprocesses");
#endif /* subprocesses */
CHECK_BUFFER (buffer);
}
}
- else
+ else
buffer = Qnil;
/* Make sure that the child will be able to chdir to the current
display = nargs >= 4 ? args[3] : Qnil;
- filefd = emacs_open (XSTRING (infile)->data, O_RDONLY, 0);
+ filefd = emacs_open (SDATA (infile), O_RDONLY, 0);
if (filefd < 0)
{
report_file_error ("Opening process input file", Fcons (infile, Qnil));
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;
if (argument_coding.type == coding_type_ccl)
setup_ccl_program (&(argument_coding.spec.ccl.encoder), Qnil);
}
- new_argv[i - 3] = XSTRING (args[i])->data;
+ new_argv[i - 3] = SDATA (args[i]);
}
UNGCPRO;
new_argv[nargs - 3] = 0;
*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);
#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 (STRING_BYTES (XSTRING (Vtemp_file_name_pattern)) + 1);
- bcopy (XSTRING (Vtemp_file_name_pattern)->data, tempfile,
- STRING_BYTES (XSTRING (Vtemp_file_name_pattern)) + 1);
+ tempfile = (char *) alloca (SBYTES (Vtemp_file_name_pattern) + 1);
+ bcopy (SDATA (Vtemp_file_name_pattern), tempfile,
+ SBYTES (Vtemp_file_name_pattern) + 1);
mktemp (tempfile);
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 = emacs_open (NULL_DEVICE, O_WRONLY, 0);
else if (STRINGP (error_file))
{
#ifdef DOS_NT
- fd_error = emacs_open (XSTRING (error_file)->data,
+ 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 */
}
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 = XSTRING (infile)->data;
+ infn = SDATA (infile);
outfn = tempfile;
if (NILP (error_file))
errfn = NULL_DEVICE;
else if (EQ (Qt, error_file))
errfn = outfn;
else
- errfn = XSTRING (error_file)->data;
- currdn = XSTRING (current_dir)->data;
+ 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
/* Now NREAD is the total amount of data in the buffer. */
immediate_quit = 0;
-
+
if (!NILP (buffer))
{
if (! CODING_MAY_REQUIRE_DECODING (&process_coding))
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, bufptr, 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,
nread, size);
-
+
if (display_on_the_fly
&& saved_coding.type == coding_type_undecided
&& process_coding.type != coding_type_undecided)
carryover = nread;
continue;
}
-
+
if (process_coding.produced > 0)
insert_1_both (decoding_buf, process_coding.produced_char,
process_coding.produced, 0, 1, 0);
/* 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')
old_pt = PT;
old_pt_byte = PT_BYTE;
nCR = 0;
-
+
for (bytepos = PT_BYTE - 1;
bytepos >= pt_byte_orig;
--bytepos)
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;
}
-
+
nread -= process_coding.consumed;
carryover = nread;
if (carryover > 0)
}
{
- int post_read_count = specpdl_ptr - specpdl;
+ int post_read_count = SPECPDL_INDEX ();
record_unwind_protect (save_excursion_restore, save_excursion_save ());
inserted = PT - pt_orig;
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 code_convert_string_norecord (build_string (synch_process_death),
Vlocale_coding_system, 0);
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 nil, `call-process-region' returns immediately with value nil.
+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.
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;
Lisp_Object val, *args2;
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;
}
{
- int count1 = specpdl_ptr - specpdl;
+ int count1 = SPECPDL_INDEX ();
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);
of environ around the vfork and the call to this function.
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
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
#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;
tem = XCDR (tem))
{
char **ep = env;
- char *string = (char *) XSTRING (XCAR (tem))->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
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;
}
}
int valuelen;
CHECK_STRING (var);
- if (getenv_internal (XSTRING (var)->data, STRING_BYTES (XSTRING (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
init_callproc ()
{
char *data_dir = egetenv ("EMACSDATA");
-
+
register char * sh;
Lisp_Object tempdir;
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 */
#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
includes this. */);
Vconfigure_info_directory = build_string (PATH_INFO);
- DEFVAR_LISP ("game-score-directory", &Vgame_score_directory,
+ 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 HAVE_SHARED_GAME_DIR
- Vgame_score_directory = build_string(HAVE_SHARED_GAME_DIR);
+#ifdef DOS_NT
+ Vshared_game_score_directory = Qnil;
#else
- Vgame_score_directory = build_string("~/.emacs.d/games");
+ Vshared_game_score_directory = build_string (PATH_GAME);
#endif
DEFVAR_LISP ("temp-file-name-pattern", &Vtemp_file_name_pattern,
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. */);
+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);
#endif
defsubr (&Scall_process_region);
}
+
+/* arch-tag: 769b8045-1df7-4d2b-8968-e3fb49017f95
+ (do not change this comment) */