X-Git-Url: http://git.hcoop.net/bpt/emacs.git/blobdiff_plain/3b440bb5918d54d503a7059fb3e2b1ee860ac4b7..8d5b986d0f880ddbd887865ae12b403df0464168:/src/callproc.c diff --git a/src/callproc.c b/src/callproc.c index 0c9ce9a3a1..9101f264cc 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -1,5 +1,6 @@ /* Synchronous subprocess invocation for GNU Emacs. - Copyright (C) 1985, 86, 87, 88, 93, 94, 95 Free Software Foundation, Inc. + Copyright (C) 1985,86,87,88,93,94,95,99, 2000, 2001 + Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -19,14 +20,14 @@ the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include #include #include - -#include #include +#ifndef USE_CRT_DLL extern int errno; -extern char *strerror (); +#endif /* Define SIGCHLD as an alias for SIGCLD. */ @@ -36,6 +37,10 @@ extern char *strerror (); #include +#ifdef HAVE_UNISTD_H +#include +#endif + #include #ifdef USG5 #define INCLUDED_FCNTL @@ -52,7 +57,6 @@ extern char *strerror (); #endif #ifdef MSDOS /* Demacs 1.1.1 91/10/16 HIRANO Satoshi */ -#include "msdos.h" #define INCLUDED_FCNTL #include #include @@ -72,17 +76,32 @@ extern char *strerror (); #include "commands.h" #include "buffer.h" #include "charset.h" +#include "ccl.h" #include "coding.h" -#include +#include "composite.h" +#include #include "process.h" #include "syssignal.h" #include "systty.h" +#ifdef MSDOS +#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) +#undef setpgrp +#define setpgrp setpgid +#endif +#endif #define max(a, b) ((a) > (b) ? (a) : (b)) @@ -126,7 +145,7 @@ static Lisp_Object 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; @@ -136,20 +155,19 @@ Lisp_Object call_process_cleanup (fdpid) Lisp_Object fdpid; { -#ifdef MSDOS +#if defined (MSDOS) || defined (macintosh) /* for MSDOS fdpid is really (fd . tempfile) */ register Lisp_Object file; file = Fcdr (fdpid); - close (XFASTINT (Fcar (fdpid))); + emacs_close (XFASTINT (Fcar (fdpid))); if (strcmp (XSTRING (file)-> data, NULL_DEVICE) != 0) unlink (XSTRING (file)->data); -#else /* not MSDOS */ +#else /* not MSDOS and not macintosh */ register int pid = XFASTINT (Fcdr (fdpid)); - if (call_process_exited) { - close (XFASTINT (Fcar (fdpid))); + emacs_close (XFASTINT (Fcar (fdpid))); return Qnil; } @@ -166,13 +184,14 @@ call_process_cleanup (fdpid) 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 remaining arguments are optional.\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\ @@ -212,11 +231,20 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.") char *outf, *tempfile; int outfilefd; #endif +#ifdef macintosh + 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; + + /* Qt denotes that Ffind_operation_coding_system is not yet called. */ + coding_systems = Qt; CHECK_STRING (args[0], 0); @@ -224,16 +252,14 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.") #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. */ @@ -241,6 +267,9 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.") { int must_encode = 0; + for (i = 4; i < nargs; i++) + CHECK_STRING (args[i], i); + for (i = 4; i < nargs; i++) if (STRING_MULTIBYTE (args[i])) must_encode = 1; @@ -256,46 +285,14 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.") 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); - } } if (nargs >= 2 && ! NILP (args[1])) @@ -314,10 +311,10 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.") (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; @@ -325,12 +322,12 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.") 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; @@ -373,7 +370,7 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.") display = nargs >= 4 ? args[3] : Qnil; - filefd = open (XSTRING (infile)->data, O_RDONLY, 0); + filefd = emacs_open (XSTRING (infile)->data, O_RDONLY, 0); if (filefd < 0) { report_file_error ("Opening process input file", Fcons (infile, Qnil)); @@ -388,52 +385,37 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.") } 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 (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] = XSTRING (args[i])->data; } + 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 { @@ -449,7 +431,7 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.") 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)); } @@ -457,13 +439,35 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.") fd[1] = outfilefd; #endif /* MSDOS */ +#ifdef macintosh + /* 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); + + 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 /* macintosh */ + 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 +#ifndef macintosh pipe (fd); #endif +#endif #if 0 /* Replaced by close_process_descs */ set_exclusive_use (fd[0]); @@ -491,13 +495,13 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.") synch_process_retcode = 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 (XSTRING (error_file)->data, + O_WRONLY | O_TRUNC | O_CREAT | O_TEXT, + S_IREAD | S_IWRITE); #else /* not DOS_NT */ fd_error = creat (XSTRING (error_file)->data, 0666); #endif /* not DOS_NT */ @@ -505,11 +509,11 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.") 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 @@ -521,34 +525,80 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.") current_dir = ENCODE_FILE (current_dir); -#ifdef MSDOS /* MW, July 1993 */ - /* ??? Someone who knows MSDOG needs to check whether this properly - closes all descriptors that it opens. +#ifdef macintosh + { + /* 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 = XSTRING (infile)->data; + 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; + 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); + } - Note that run_msdos_command() actually returns the child process + /* 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 macintosh */ +#ifdef MSDOS /* MW, July 1993 */ + /* 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 */ @@ -561,7 +611,7 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.") if (pid == 0) { if (fd[0] >= 0) - close (fd[0]); + emacs_close (fd[0]); #ifdef HAVE_SETSID setsid (); #endif @@ -577,29 +627,30 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.") /* The MSDOS case did this already. */ if (fd_error >= 0) - close (fd_error); + emacs_close (fd_error); #endif /* not MSDOS */ +#endif /* not macintosh */ 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 @@ -612,19 +663,65 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.") /* Enable sending signal if user quits below. */ call_process_exited = 0; -#ifdef MSDOS +#if defined(MSDOS) || defined(macintosh) /* 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 macintosh */ 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; @@ -633,70 +730,162 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.") int first = 1; int total_read = 0; int carryover = 0; - + int display_on_the_fly = !NILP (display) && INTERACTIVE; + 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], bufptr + 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 (bufptr, 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); + + 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) + { + /* We have detected some coding system. But, + there's a possibility that the detection was + done by insufficient data. So, we give up + displaying on the fly. */ + xfree (decoding_buf); + display_on_the_fly = 0; + process_coding = saved_coding; + carryover = nread; + continue; + } + if (process_coding.produced > 0) - insert (decoding_buf, process_coding.produced); - carryover = nread - process_coding.consumed; + 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) + { + 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; + } + + 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 (bufptr + process_coding.consumed, bufptr, + carryover); + if (process_coding.result == CODING_FINISH_INSUFFICIENT_CMP) { - /* 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; - - while (p < pend) *dst++ = *p++; + /* 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; /* Make the buffer bigger as we continue to read more data, but not past 64k. */ @@ -711,20 +900,40 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.") if (first) prepare_menu_bars (); first = 0; - redisplay_preserve_echo_area (); + redisplay_preserve_echo_area (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_ptr - specpdl; + + 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)); - /* 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)); + 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. */ @@ -741,7 +950,8 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.") unbind_to (count, Qnil); 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 @@ -753,11 +963,13 @@ delete_temp_file (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. */ internal_delete_file (name); + 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\ +The remaining arguments are optional.\n\ Delete the text if fourth arg DELETE is non-nil.\n\ \n\ Insert output in BUFFER before point; t means current buffer;\n\ @@ -784,14 +996,16 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.") register Lisp_Object start, end; int count = specpdl_ptr - specpdl; /* 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 { @@ -815,7 +1029,20 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.") STRING_BYTES (XSTRING (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); @@ -833,27 +1060,43 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.") 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; } - specbind (intern ("coding-system-for-write"), val); - Fwrite_region (start, end, filename_string, Qnil, Qlambda, Qnil, Qnil); + { + int count1 = specpdl_ptr - specpdl; + + 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 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))); } #ifndef VMS /* VMS version is in vmsproc.c. */ @@ -870,8 +1113,6 @@ static int relocate_fd (); 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. @@ -887,10 +1128,6 @@ child_setup (in, out, err, new_argv, set_pgrp, current_dir) 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 @@ -913,7 +1150,11 @@ child_setup (in, out, err, new_argv, set_pgrp, current_dir) /* 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. @@ -925,14 +1166,21 @@ child_setup (in, out, err, new_argv, set_pgrp, current_dir) register int i; i = STRING_BYTES (XSTRING (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); 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 @@ -942,6 +1190,15 @@ child_setup (in, out, err, new_argv, set_pgrp, current_dir) _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; @@ -955,8 +1212,8 @@ child_setup (in, out, err, new_argv, set_pgrp, current_dir) 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. */ @@ -969,11 +1226,11 @@ child_setup (in, out, err, new_argv, set_pgrp, current_dir) /* 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 *) XSTRING (XCAR (tem))->data; /* 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, @@ -1026,16 +1283,18 @@ child_setup (in, out, err, new_argv, set_pgrp, current_dir) 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) @@ -1052,6 +1311,14 @@ child_setup (in, out, err, new_argv, set_pgrp, current_dir) 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); @@ -1067,9 +1334,9 @@ child_setup (in, out, err, new_argv, set_pgrp, current_dir) 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 */ @@ -1091,15 +1358,15 @@ relocate_fd (fd, minfd) 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; } } @@ -1113,11 +1380,11 @@ getenv_internal (var, varlen, value, valuelen) { 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] == '=' @@ -1138,7 +1405,7 @@ getenv_internal (var, varlen, value, valuelen) return 0; } -DEFUN ("getenv", Fgetenv, Sgetenv, 1, 1, 0, +DEFUN ("getenv-internal", Fgetenv_internal, Sgetenv_internal, 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.") @@ -1189,7 +1456,7 @@ init_callproc_1 () : 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); @@ -1205,20 +1472,19 @@ init_callproc () 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); + if (NILP (Fmember (tem, Vexec_path))) + Vexec_path = nconc2 (Vexec_path, Fcons (tem, Qnil)); + + Vexec_directory = Ffile_name_as_directory (tem); #endif /* not DOS_NT */ - } /* Maybe use ../etc as well as ../lib-src. */ if (data_dir == 0) @@ -1353,7 +1619,7 @@ when Emacs starts."); #ifndef VMS defsubr (&Scall_process); - defsubr (&Sgetenv); + defsubr (&Sgetenv_internal); #endif defsubr (&Scall_process_region); }