X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/ca9c056758a507f1508933de24d2410188b978fb..ecfb39ee8e14337d40328c8248c6d27793798025:/src/callproc.c diff --git a/src/callproc.c b/src/callproc.c index e1d40b3505..103ece304b 100644 --- a/src/callproc.c +++ b/src/callproc.c @@ -75,6 +75,7 @@ extern int errno; #include "charset.h" #include "ccl.h" #include "coding.h" +#include "composite.h" #include #include "process.h" #include "syssignal.h" @@ -90,6 +91,13 @@ extern noshare char **environ; extern char **environ; #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)) Lisp_Object Vexec_path, Vexec_directory, Vdata_directory, Vdoc_directory; @@ -379,39 +387,23 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.") if (nargs > 4) { register int i; + struct gcpro gcpro1, gcpro2, gcpro3; - 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); - - /* The Irix 4.0 compiler barfs if we eliminate dummy. */ - new_argv[i - 3] = dummy1; - argument_coding.mode |= CODING_MODE_LAST_BLOCK; - 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 have to initialize CCL program status again. */ + /* 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 @@ -719,6 +711,11 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.") && !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; @@ -730,9 +727,12 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.") 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 @@ -765,13 +765,18 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.") 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 = (char *) xmalloc (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 @@ -789,27 +794,30 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.") continue; } if (process_coding.produced > 0) - insert (decoding_buf, process_coding.produced); + insert_1_both (decoding_buf, process_coding.produced_char, + process_coding.produced, 0, 1, 0); xfree (decoding_buf); - carryover = nread - process_coding.consumed; + 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. */ @@ -831,13 +839,27 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.") } 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); + } + + 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)); } /* Wait for it to terminate, unless it already has. */ @@ -867,6 +889,7 @@ 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, @@ -1058,7 +1081,14 @@ 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); @@ -1198,6 +1228,7 @@ child_setup (in, out, err, new_argv, set_pgrp, current_dir) #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); @@ -1289,7 +1320,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.") @@ -1503,7 +1534,7 @@ when Emacs starts."); #ifndef VMS defsubr (&Scall_process); - defsubr (&Sgetenv); + defsubr (&Sgetenv_internal); #endif defsubr (&Scall_process_region); }