/* Synchronous subprocess invocation for GNU Emacs.
- Copyright (C) 1985, 86,87,88,93,94,95, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1985,86,87,88,93,94,95,99,2000 Free Software Foundation, Inc.
This file is part of GNU Emacs.
#include <errno.h>
#include <stdio.h>
+#ifndef USE_CRT_DLL
extern int errno;
+#endif
/* Define SIGCHLD as an alias for SIGCLD. */
#include "charset.h"
#include "ccl.h"
#include "coding.h"
+#include "composite.h"
#include <epaths.h>
#include "process.h"
#include "syssignal.h"
#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))
if (nargs > 4)
{
register int i;
+ struct gcpro gcpro1, gcpro2, gcpro3;
- if (CODING_REQUIRE_ENCODING (&argument_coding))
+ 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))
{
- args[i] = code_convert_string (args[i], &argument_coding, 1, 0);
- setup_ccl_program (&(argument_coding.spec.ccl.encoder), Qnil);
+ /* 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;
}
- for (i = 4; i < nargs; i++)
- new_argv[i - 3] = XSTRING (args[i])->data;
+ UNGCPRO;
new_argv[nargs - 3] = 0;
}
else
&& !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;
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
if (!NILP (buffer))
{
- if (! CODING_REQUIRE_DECODING (&process_coding))
- 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
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. */
}
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));
+
+ 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));
- /* 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. */
/* 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,
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);
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);
#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 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.")
#ifndef VMS
defsubr (&Scall_process);
- defsubr (&Sgetenv);
+ defsubr (&Sgetenv_internal);
#endif
defsubr (&Scall_process_region);
}
HCoop / bpt / emacs.git / blobdiff