[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/process.c
|
From: |
Ken Raeburn |
|
Subject: |
[Emacs-diffs] Changes to emacs/src/process.c |
|
Date: |
Sun, 14 Jul 2002 20:00:56 -0400 |
Index: emacs/src/process.c
diff -c emacs/src/process.c:1.375 emacs/src/process.c:1.376
*** emacs/src/process.c:1.375 Fri Jul 12 07:13:47 2002
--- emacs/src/process.c Sun Jul 14 20:00:37 2002
***************
*** 419,425 ****
signame = "unknown";
string = build_string (signame);
string2 = build_string (coredump ? " (core dumped)\n" : "\n");
! XSTRING (string)->data[0] = DOWNCASE (XSTRING (string)->data[0]);
return concat2 (string, string2);
}
else if (EQ (symbol, Qexit))
--- 419,425 ----
signame = "unknown";
string = build_string (signame);
string2 = build_string (coredump ? " (core dumped)\n" : "\n");
! SREF (string, 0) = DOWNCASE (SREF (string, 0));
return concat2 (string, string2);
}
else if (EQ (symbol, Qexit))
***************
*** 637,643 ****
if (NILP (obj))
obj = Fget_buffer (name);
if (NILP (obj))
! error ("Process %s does not exist", XSTRING (name)->data);
}
else if (NILP (name))
obj = Fcurrent_buffer ();
--- 637,643 ----
if (NILP (obj))
obj = Fget_buffer (name);
if (NILP (obj))
! error ("Process %s does not exist", SDATA (name));
}
else if (NILP (name))
obj = Fcurrent_buffer ();
***************
*** 650,656 ****
{
proc = Fget_buffer_process (obj);
if (NILP (proc))
! error ("Buffer %s has no process", XSTRING (XBUFFER (obj)->name)->data);
}
else
{
--- 650,656 ----
{
proc = Fget_buffer_process (obj);
if (NILP (proc))
! error ("Buffer %s has no process", SDATA (XBUFFER (obj)->name));
}
else
{
***************
*** 1070,1086 ****
if (!NILP (query_only) && !NILP (p->kill_without_query))
continue;
if (STRINGP (p->name)
! && ( i = XSTRING (p->name)->size, (i > w_proc)))
w_proc = i;
if (!NILP (p->buffer))
{
if (NILP (XBUFFER (p->buffer)->name) && w_buffer < 8)
w_buffer = 8; /* (Killed) */
! else if ((i = XSTRING (XBUFFER (p->buffer)->name)->size, (i >
w_buffer)))
w_buffer = i;
}
if (STRINGP (p->tty_name)
! && (i = XSTRING (p->tty_name)->size, (i > w_tty)))
w_tty = i;
}
--- 1070,1086 ----
if (!NILP (query_only) && !NILP (p->kill_without_query))
continue;
if (STRINGP (p->name)
! && ( i = SCHARS (p->name), (i > w_proc)))
w_proc = i;
if (!NILP (p->buffer))
{
if (NILP (XBUFFER (p->buffer)->name) && w_buffer < 8)
w_buffer = 8; /* (Killed) */
! else if ((i = SCHARS (XBUFFER (p->buffer)->name), (i > w_buffer)))
w_buffer = i;
}
if (STRINGP (p->tty_name)
! && (i = SCHARS (p->tty_name), (i > w_tty)))
w_tty = i;
}
***************
*** 1206,1212 ****
port = Fnumber_to_string (port);
sprintf (tembuf, "(network %s server on %s)\n",
(DATAGRAM_CHAN_P (XINT (p->infd)) ? "datagram" : "stream"),
! XSTRING (port)->data);
insert_string (tembuf);
}
else if (NETCONN1_P (p))
--- 1206,1212 ----
port = Fnumber_to_string (port);
sprintf (tembuf, "(network %s server on %s)\n",
(DATAGRAM_CHAN_P (XINT (p->infd)) ? "datagram" : "stream"),
! SDATA (port));
insert_string (tembuf);
}
else if (NETCONN1_P (p))
***************
*** 1222,1228 ****
}
sprintf (tembuf, "(network %s connection to %s)\n",
(DATAGRAM_CHAN_P (XINT (p->infd)) ? "datagram" : "stream"),
! XSTRING (host)->data);
insert_string (tembuf);
}
else
--- 1222,1228 ----
}
sprintf (tembuf, "(network %s connection to %s)\n",
(DATAGRAM_CHAN_P (XINT (p->infd)) ? "datagram" : "stream"),
! SDATA (host));
insert_string (tembuf);
}
else
***************
*** 1400,1420 ****
#ifdef VMS
/* Make a one member argv with all args concatenated
together separated by a blank. */
! len = STRING_BYTES (XSTRING (program)) + 2;
for (i = 3; i < nargs; i++)
{
tem = args[i];
CHECK_STRING (tem);
! len += STRING_BYTES (XSTRING (tem)) + 1; /* count the blank */
}
new_argv = (unsigned char *) alloca (len);
! strcpy (new_argv, XSTRING (program)->data);
for (i = 3; i < nargs; i++)
{
tem = args[i];
CHECK_STRING (tem);
strcat (new_argv, " ");
! strcat (new_argv, XSTRING (tem)->data);
}
/* Need to add code here to check for program existence on VMS */
--- 1400,1420 ----
#ifdef VMS
/* Make a one member argv with all args concatenated
together separated by a blank. */
! len = SBYTES (program) + 2;
for (i = 3; i < nargs; i++)
{
tem = args[i];
CHECK_STRING (tem);
! len += SBYTES (tem) + 1; /* count the blank */
}
new_argv = (unsigned char *) alloca (len);
! strcpy (new_argv, SDATA (program));
for (i = 3; i < nargs; i++)
{
tem = args[i];
CHECK_STRING (tem);
strcat (new_argv, " ");
! strcat (new_argv, SDATA (tem));
}
/* Need to add code here to check for program existence on VMS */
***************
*** 1422,1430 ****
new_argv = (unsigned char **) alloca ((nargs - 1) * sizeof (char *));
/* If program file name is not absolute, search our path for it */
! if (!IS_DIRECTORY_SEP (XSTRING (program)->data[0])
! && !(XSTRING (program)->size > 1
! && IS_DEVICE_SEP (XSTRING (program)->data[1])))
{
struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
--- 1422,1430 ----
new_argv = (unsigned char **) alloca ((nargs - 1) * sizeof (char *));
/* If program file name is not absolute, search our path for it */
! if (!IS_DIRECTORY_SEP (SREF (program, 0))
! && !(SCHARS (program) > 1
! && IS_DEVICE_SEP (SREF (program, 1))))
{
struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
***************
*** 1436,1442 ****
report_file_error ("Searching for program", Fcons (program, Qnil));
tem = Fexpand_file_name (tem, Qnil);
tem = ENCODE_FILE (tem);
! new_argv[0] = XSTRING (tem)->data;
}
else
{
--- 1436,1442 ----
report_file_error ("Searching for program", Fcons (program, Qnil));
tem = Fexpand_file_name (tem, Qnil);
tem = ENCODE_FILE (tem);
! new_argv[0] = SDATA (tem);
}
else
{
***************
*** 1444,1450 ****
error ("Specified program for new process is a directory");
tem = ENCODE_FILE (program);
! new_argv[0] = XSTRING (tem)->data;
}
/* Here we encode arguments by the coding system used for sending
--- 1444,1450 ----
error ("Specified program for new process is a directory");
tem = ENCODE_FILE (program);
! new_argv[0] = SDATA (tem);
}
/* Here we encode arguments by the coding system used for sending
***************
*** 1459,1465 ****
if (STRING_MULTIBYTE (tem))
tem = (code_convert_string_norecord
(tem, XPROCESS (proc)->encode_coding_system, 1));
! new_argv[i - 2] = XSTRING (tem)->data;
}
new_argv[i - 2] = 0;
#endif /* not VMS */
--- 1459,1465 ----
if (STRING_MULTIBYTE (tem))
tem = (code_convert_string_norecord
(tem, XPROCESS (proc)->encode_coding_system, 1));
! new_argv[i - 2] = SDATA (tem);
}
new_argv[i - 2] = 0;
#endif /* not VMS */
***************
*** 2092,2098 ****
if (family == AF_LOCAL)
{
struct sockaddr_un *sockun = (struct sockaddr_un *) sa;
! cp = XSTRING (address)->data;
for (i = 0; i < sizeof (sockun->sun_path) && *cp; i++)
sockun->sun_path[i] = *cp++;
}
--- 2092,2098 ----
if (family == AF_LOCAL)
{
struct sockaddr_un *sockun = (struct sockaddr_un *) sa;
! cp = SDATA (address);
for (i = 0; i < sizeof (sockun->sun_path) && *cp; i++)
sockun->sun_path[i] = *cp++;
}
***************
*** 2232,2240 ****
opt = XCAR (opt);
}
if (STRINGP (opt))
! name = (char *) XSTRING (opt)->data;
else if (SYMBOLP (opt))
! name = (char *) XSTRING (SYMBOL_NAME (opt))->data;
else {
error ("Mal-formed option list");
return 0;
--- 2232,2240 ----
opt = XCAR (opt);
}
if (STRINGP (opt))
! name = (char *) SDATA (opt);
else if (SYMBOLP (opt))
! name = (char *) SDATA (SYMBOL_NAME (opt));
else {
error ("Mal-formed option list");
return 0;
***************
*** 2300,2308 ****
if (NILP (val))
arg = "";
else if (STRINGP (val))
! arg = (char *) XSTRING (val)->data;
else if (XSYMBOL (val))
! arg = (char *) XSTRING (SYMBOL_NAME (val))->data;
else
error ("Invalid argument to %s option", name);
}
--- 2300,2308 ----
if (NILP (val))
arg = "";
else if (STRINGP (val))
! arg = (char *) SDATA (val);
else if (XSYMBOL (val))
! arg = (char *) SDATA (SYMBOL_NAME (val));
else
error ("Invalid argument to %s option", name);
}
***************
*** 2632,2647 ****
{
struct servent *svc_info;
CHECK_STRING (service);
! svc_info = getservbyname (XSTRING (service)->data, "tcp");
if (svc_info == 0)
! error ("Unknown service: %s", XSTRING (service)->data);
port = svc_info->s_port;
}
s = connect_server (0);
if (s < 0)
report_file_error ("error creating socket", Fcons (name, Qnil));
! send_command (s, C_PORT, 0, "%s:%d", XSTRING (host)->data, ntohs (port));
send_command (s, C_DUMB, 1, 0);
#else /* not TERM */
--- 2632,2647 ----
{
struct servent *svc_info;
CHECK_STRING (service);
! svc_info = getservbyname (SDATA (service), "tcp");
if (svc_info == 0)
! error ("Unknown service: %s", SDATA (service));
port = svc_info->s_port;
}
s = connect_server (0);
if (s < 0)
report_file_error ("error creating socket", Fcons (name, Qnil));
! send_command (s, C_PORT, 0, "%s:%d", SDATA (host), ntohs (port));
send_command (s, C_DUMB, 1, 0);
#else /* not TERM */
***************
*** 2694,2700 ****
CHECK_STRING (service);
bzero (&address_un, sizeof address_un);
address_un.sun_family = AF_LOCAL;
! strncpy (address_un.sun_path, XSTRING (service)->data, sizeof
address_un.sun_path);
ai.ai_addr = (struct sockaddr *) &address_un;
ai.ai_addrlen = sizeof address_un;
goto open_socket;
--- 2694,2700 ----
CHECK_STRING (service);
bzero (&address_un, sizeof address_un);
address_un.sun_family = AF_LOCAL;
! strncpy (address_un.sun_path, SDATA (service), sizeof
address_un.sun_path);
ai.ai_addr = (struct sockaddr *) &address_un;
ai.ai_addrlen = sizeof address_un;
goto open_socket;
***************
*** 2739,2745 ****
else
{
CHECK_STRING (service);
! portstring = XSTRING (service)->data;
}
immediate_quit = 1;
--- 2739,2745 ----
else
{
CHECK_STRING (service);
! portstring = SDATA (service);
}
immediate_quit = 1;
***************
*** 2749,2760 ****
hints.ai_family = NILP (Fplist_member (contact, QCfamily)) ? AF_UNSPEC
: family;
hints.ai_socktype = socktype;
hints.ai_protocol = 0;
! ret = getaddrinfo (XSTRING (host)->data, portstring, &hints, &res);
if (ret)
#ifdef HAVE_GAI_STRERROR
! error ("%s/%s %s", XSTRING (host)->data, portstring, gai_strerror(ret));
#else
! error ("%s/%s getaddrinfo error %d", XSTRING (host)->data,
portstring, ret);
#endif
immediate_quit = 0;
--- 2749,2760 ----
hints.ai_family = NILP (Fplist_member (contact, QCfamily)) ? AF_UNSPEC
: family;
hints.ai_socktype = socktype;
hints.ai_protocol = 0;
! ret = getaddrinfo (SDATA (host), portstring, &hints, &res);
if (ret)
#ifdef HAVE_GAI_STRERROR
! error ("%s/%s %s", SDATA (host), portstring, gai_strerror(ret));
#else
! error ("%s/%s getaddrinfo error %d", SDATA (host), portstring, ret);
#endif
immediate_quit = 0;
***************
*** 2773,2782 ****
{
struct servent *svc_info;
CHECK_STRING (service);
! svc_info = getservbyname (XSTRING (service)->data,
(socktype == SOCK_DGRAM ? "udp" : "tcp"));
if (svc_info == 0)
! error ("Unknown service: %s", XSTRING (service)->data);
port = svc_info->s_port;
}
--- 2773,2782 ----
{
struct servent *svc_info;
CHECK_STRING (service);
! svc_info = getservbyname (SDATA (service),
(socktype == SOCK_DGRAM ? "udp" : "tcp"));
if (svc_info == 0)
! error ("Unknown service: %s", SDATA (service));
port = svc_info->s_port;
}
***************
*** 2794,2800 ****
as it may `hang' emacs for a very long time. */
immediate_quit = 1;
QUIT;
! host_info_ptr = gethostbyname (XSTRING (host)->data);
immediate_quit = 0;
if (host_info_ptr)
--- 2794,2800 ----
as it may `hang' emacs for a very long time. */
immediate_quit = 1;
QUIT;
! host_info_ptr = gethostbyname (SDATA (host));
immediate_quit = 0;
if (host_info_ptr)
***************
*** 2808,2816 ****
/* Attempt to interpret host as numeric inet address */
{
IN_ADDR numeric_addr;
! numeric_addr = inet_addr ((char *) XSTRING (host)->data);
if (NUMERIC_ADDR_ERROR)
! error ("Unknown host \"%s\"", XSTRING (host)->data);
bcopy ((char *)&numeric_addr, (char *) &address_in.sin_addr,
sizeof (address_in.sin_addr));
--- 2808,2816 ----
/* Attempt to interpret host as numeric inet address */
{
IN_ADDR numeric_addr;
! numeric_addr = inet_addr ((char *) SDATA (host));
if (NUMERIC_ADDR_ERROR)
! error ("Unknown host \"%s\"", SDATA (host));
bcopy ((char *)&numeric_addr, (char *) &address_in.sin_addr,
sizeof (address_in.sin_addr));
***************
*** 4283,4289 ****
the tail of decoding buffer) should be prepended to the new
data read to decode all together. */
chars = (char *) alloca (nbytes + carryover);
! bcopy (XSTRING (p->decoding_buf)->data, buf, carryover);
bcopy (vs->inputBuffer, chars + carryover, nbytes);
}
#else /* not VMS */
--- 4283,4289 ----
the tail of decoding buffer) should be prepended to the new
data read to decode all together. */
chars = (char *) alloca (nbytes + carryover);
! bcopy (SDATA (p->decoding_buf), buf, carryover);
bcopy (vs->inputBuffer, chars + carryover, nbytes);
}
#else /* not VMS */
***************
*** 4301,4307 ****
chars = (char *) alloca (carryover + readmax);
if (carryover)
/* See the comment above. */
! bcopy (XSTRING (p->decoding_buf)->data, chars, carryover);
#ifdef DATAGRAM_SOCKETS
/* We have a working select, so proc_buffered_char is always -1. */
--- 4301,4307 ----
chars = (char *) alloca (carryover + readmax);
if (carryover)
/* See the comment above. */
! bcopy (SDATA (p->decoding_buf), chars, carryover);
#ifdef DATAGRAM_SOCKETS
/* We have a working select, so proc_buffered_char is always -1. */
***************
*** 4414,4424 ****
}
carryover = nbytes - coding->consumed;
! bcopy (chars + coding->consumed, XSTRING (p->decoding_buf)->data,
carryover);
XSETINT (p->decoding_carryover, carryover);
! nbytes = STRING_BYTES (XSTRING (text));
! nchars = XSTRING (text)->size;
if (nbytes > 0)
internal_condition_case_1 (read_process_output_call,
Fcons (outstream,
--- 4414,4424 ----
}
carryover = nbytes - coding->consumed;
! bcopy (chars + coding->consumed, SDATA (p->decoding_buf),
carryover);
XSETINT (p->decoding_carryover, carryover);
! nbytes = SBYTES (text);
! nchars = SCHARS (text);
if (nbytes > 0)
internal_condition_case_1 (read_process_output_call,
Fcons (outstream,
***************
*** 4515,4521 ****
}
}
carryover = nbytes - coding->consumed;
! bcopy (chars + coding->consumed, XSTRING (p->decoding_buf)->data,
carryover);
XSETINT (p->decoding_carryover, carryover);
/* Adjust the multibyteness of TEXT to that of the buffer. */
--- 4515,4521 ----
}
}
carryover = nbytes - coding->consumed;
! bcopy (chars + coding->consumed, SDATA (p->decoding_buf),
carryover);
XSETINT (p->decoding_carryover, carryover);
/* Adjust the multibyteness of TEXT to that of the buffer. */
***************
*** 4524,4531 ****
text = (STRING_MULTIBYTE (text)
? Fstring_as_unibyte (text)
: Fstring_as_multibyte (text));
! nbytes = STRING_BYTES (XSTRING (text));
! nchars = XSTRING (text)->size;
/* Insert before markers in case we are inserting where
the buffer's mark is, and the user's next command is Meta-y. */
insert_from_string_before_markers (text, 0, 0, nchars, nbytes, 0);
--- 4524,4531 ----
text = (STRING_MULTIBYTE (text)
? Fstring_as_unibyte (text)
: Fstring_as_multibyte (text));
! nbytes = SBYTES (text);
! nchars = SCHARS (text);
/* Insert before markers in case we are inserting where
the buffer's mark is, and the user's next command is Meta-y. */
insert_from_string_before_markers (text, 0, 0, nchars, nbytes, 0);
***************
*** 4633,4642 ****
update_status (XPROCESS (proc));
if (! EQ (XPROCESS (proc)->status, Qrun))
error ("Process %s not running",
! XSTRING (XPROCESS (proc)->name)->data);
if (XINT (XPROCESS (proc)->outfd) < 0)
error ("Output file descriptor of %s is closed",
! XSTRING (XPROCESS (proc)->name)->data);
coding = proc_encode_coding_system[XINT (XPROCESS (proc)->outfd)];
Vlast_coding_system_used = coding->symbol;
--- 4633,4642 ----
update_status (XPROCESS (proc));
if (! EQ (XPROCESS (proc)->status, Qrun))
error ("Process %s not running",
! SDATA (XPROCESS (proc)->name));
if (XINT (XPROCESS (proc)->outfd) < 0)
error ("Output file descriptor of %s is closed",
! SDATA (XPROCESS (proc)->name));
coding = proc_encode_coding_system[XINT (XPROCESS (proc)->outfd)];
Vlast_coding_system_used = coding->symbol;
***************
*** 4691,4697 ****
}
else if (STRINGP (object))
{
! from_byte = buf - XSTRING (object)->data;
from = string_byte_to_char (object, from_byte);
to = string_byte_to_char (object, from_byte + len);
}
--- 4691,4697 ----
}
else if (STRINGP (object))
{
! from_byte = buf - SDATA (object);
from = string_byte_to_char (object, from_byte);
to = string_byte_to_char (object, from_byte + len);
}
***************
*** 4704,4722 ****
coding->composing = COMPOSITION_DISABLED;
}
! if (STRING_BYTES (XSTRING (XPROCESS (proc)->encoding_buf)) < require)
XPROCESS (proc)->encoding_buf = make_uninit_string (require);
if (from_byte >= 0)
buf = (BUFFERP (object)
? BUF_BYTE_ADDRESS (XBUFFER (object), from_byte)
! : XSTRING (object)->data + from_byte);
object = XPROCESS (proc)->encoding_buf;
! encode_coding (coding, (char *) buf, XSTRING (object)->data,
! len, STRING_BYTES (XSTRING (object)));
len = coding->produced;
! buf = XSTRING (object)->data;
if (temp_buf)
xfree (temp_buf);
}
--- 4704,4722 ----
coding->composing = COMPOSITION_DISABLED;
}
! if (SBYTES (XPROCESS (proc)->encoding_buf) < require)
XPROCESS (proc)->encoding_buf = make_uninit_string (require);
if (from_byte >= 0)
buf = (BUFFERP (object)
? BUF_BYTE_ADDRESS (XBUFFER (object), from_byte)
! : SDATA (object) + from_byte);
object = XPROCESS (proc)->encoding_buf;
! encode_coding (coding, (char *) buf, SDATA (object),
! len, SBYTES (object));
len = coding->produced;
! buf = SDATA (object);
if (temp_buf)
xfree (temp_buf);
}
***************
*** 4849,4855 ****
if (BUFFERP (object))
offset = BUF_PTR_BYTE_POS (XBUFFER (object), buf);
else if (STRINGP (object))
! offset = buf - XSTRING (object)->data;
XSETFASTINT (zero, 0);
#ifdef EMACS_HAS_USECS
--- 4849,4855 ----
if (BUFFERP (object))
offset = BUF_PTR_BYTE_POS (XBUFFER (object), buf);
else if (STRINGP (object))
! offset = buf - SDATA (object);
XSETFASTINT (zero, 0);
#ifdef EMACS_HAS_USECS
***************
*** 4861,4867 ****
if (BUFFERP (object))
buf = BUF_BYTE_ADDRESS (XBUFFER (object), offset);
else if (STRINGP (object))
! buf = offset + XSTRING (object)->data;
rv = 0;
}
--- 4861,4867 ----
if (BUFFERP (object))
buf = BUF_BYTE_ADDRESS (XBUFFER (object), offset);
else if (STRINGP (object))
! buf = offset + SDATA (object);
rv = 0;
}
***************
*** 4893,4902 ****
deactivate_process (proc);
#ifdef VMS
error ("Error writing to process %s; closed it",
! XSTRING (XPROCESS (proc)->name)->data);
#else
error ("SIGPIPE raised on process %s; closed it",
! XSTRING (XPROCESS (proc)->name)->data);
#endif
}
--- 4893,4902 ----
deactivate_process (proc);
#ifdef VMS
error ("Error writing to process %s; closed it",
! SDATA (XPROCESS (proc)->name));
#else
error ("SIGPIPE raised on process %s; closed it",
! SDATA (XPROCESS (proc)->name));
#endif
}
***************
*** 4946,4953 ****
Lisp_Object proc;
CHECK_STRING (string);
proc = get_process (process);
! send_process (proc, XSTRING (string)->data,
! STRING_BYTES (XSTRING (string)), string);
return Qnil;
}
--- 4946,4953 ----
Lisp_Object proc;
CHECK_STRING (string);
proc = get_process (process);
! send_process (proc, SDATA (string),
! SBYTES (string), string);
return Qnil;
}
***************
*** 4970,4979 ****
if (!EQ (p->childp, Qt))
error ("Process %s is not a subprocess",
! XSTRING (p->name)->data);
if (XINT (p->infd) < 0)
error ("Process %s is not active",
! XSTRING (p->name)->data);
#ifdef TIOCGPGRP
if (!NILP (p->subtty))
--- 4970,4979 ----
if (!EQ (p->childp, Qt))
error ("Process %s is not a subprocess",
! SDATA (p->name));
if (XINT (p->infd) < 0)
error ("Process %s is not active",
! SDATA (p->name));
#ifdef TIOCGPGRP
if (!NILP (p->subtty))
***************
*** 5018,5027 ****
if (!EQ (p->childp, Qt))
error ("Process %s is not a subprocess",
! XSTRING (p->name)->data);
if (XINT (p->infd) < 0)
error ("Process %s is not active",
! XSTRING (p->name)->data);
if (NILP (p->pty_flag))
current_group = Qnil;
--- 5018,5027 ----
if (!EQ (p->childp, Qt))
error ("Process %s is not a subprocess",
! SDATA (p->name));
if (XINT (p->infd) < 0)
error ("Process %s is not active",
! SDATA (p->name));
if (NILP (p->pty_flag))
current_group = Qnil;
***************
*** 5337,5343 ****
unsigned char *name;
CHECK_SYMBOL (sigcode);
! name = XSTRING (SYMBOL_NAME (sigcode))->data;
if (0)
;
--- 5337,5343 ----
unsigned char *name;
CHECK_SYMBOL (sigcode);
! name = SDATA (SYMBOL_NAME (sigcode));
if (0)
;
***************
*** 5464,5470 ****
if (! NILP (XPROCESS (proc)->raw_status_low))
update_status (XPROCESS (proc));
if (! EQ (XPROCESS (proc)->status, Qrun))
! error ("Process %s not running", XSTRING (XPROCESS (proc)->name)->data);
if (CODING_REQUIRE_FLUSHING (coding))
{
--- 5464,5470 ----
if (! NILP (XPROCESS (proc)->raw_status_low))
update_status (XPROCESS (proc));
if (! EQ (XPROCESS (proc)->status, Qrun))
! error ("Process %s not running", SDATA (XPROCESS (proc)->name));
if (CODING_REQUIRE_FLUSHING (coding))
{
***************
*** 5946,5954 ****
CHECK_PROCESS (proc);
p = XPROCESS (proc);
if (XINT (p->infd) < 0)
! error ("Input file descriptor of %s closed", XSTRING (p->name)->data);
if (XINT (p->outfd) < 0)
! error ("Output file descriptor of %s closed", XSTRING (p->name)->data);
p->decode_coding_system = Fcheck_coding_system (decoding);
p->encode_coding_system = Fcheck_coding_system (encoding);
--- 5946,5954 ----
CHECK_PROCESS (proc);
p = XPROCESS (proc);
if (XINT (p->infd) < 0)
! error ("Input file descriptor of %s closed", SDATA (p->name));
if (XINT (p->outfd) < 0)
! error ("Output file descriptor of %s closed", SDATA (p->name));
p->decode_coding_system = Fcheck_coding_system (decoding);
p->encode_coding_system = Fcheck_coding_system (encoding);