xemacs-beta: src/process.c comparison

comparison src/process.c @ 16:0293115a14e9 r19-15b91

Import from CVS: tag r19-15b91

author	cvs
date	Mon, 13 Aug 2007 08:49:20 +0200
parents	376386a54a3c
children	859a2309aef8

comparison

equal deleted inserted replaced

-:ad457d5f7d04
+:0293115a14e9
 {
 struct Lisp_Process *proc = XPROCESS (obj);
 if (print_readably)
 error ("printing unreadable object #<process %s>",
-string_data (XSTRING (proc->name)));
+XSTRING_DATA (proc->name));
 if (!escapeflag)
 {
 print_internal (proc->name, printcharfun, 0);
 }
 return proc;
 if (GC_NILP (name))
 error ("Current buffer has no process");
 else
-error ("Process %s does not exist", string_data (XSTRING (name)));
+error ("Process %s does not exist", XSTRING_DATA (name));
 /* NOTREACHED */
 return Qnil; /* warning suppression */
 }
 DEFUN ("process-id", Fprocess_id, Sprocess_id, 1, 1, 0 /*
 {
 /* Figure out the eof character for the outfd of the given process.
 * The following code is similar to that in process_send_signal, and
 * should probably be merged with that code somehow. */
+CONST Bufbyte ctrl_d = (Bufbyte) '\004';
+if (!isatty (p->outfd))
+return ctrl_d;
 #ifdef HAVE_TERMIOS
-struct termios t;
+{
-tcgetattr (p->outfd, &t);
+struct termios t;
-if (strlen ((CONST char *) t.c_cc) < (unsigned int) (VEOF + 1))
+tcgetattr (p->outfd, &t);
-return (Bufbyte) '\004';
+#if 0
-else
+/* What is the following line designed to do??? -mrb */
-return (Bufbyte) t.c_cc[VEOF];
+if (strlen ((CONST char *) t.c_cc) < (unsigned int) (VEOF + 1))
+return ctrl_d;
+else
+return (Bufbyte) t.c_cc[VEOF];
+#endif
+return t.c_cc[VEOF] == CDISABLE ? ctrl_d : (Bufbyte) t.c_cc[VEOF];
+}
 #else /* ! HAVE_TERMIOS */
 /* On Berkeley descendants, the following IOCTL's retrieve the
 current control characters.  */
 #if defined (TIOCGETC)
-struct tchars c;
+{
-ioctl (p->outfd, TIOCGETC, &c);
+struct tchars c;
-return (Bufbyte) c.t_eofc;
+ioctl (p->outfd, TIOCGETC, &c);
+return (Bufbyte) c.t_eofc;
+}
 #else /* ! defined (TIOCGLTC) && defined (TIOCGETC) */
 /* On SYSV descendants, the TCGETA ioctl retrieves the current control
 characters.  */
 #ifdef TCGETA
-struct termio t;
+{
-ioctl (p->outfd, TCGETA, &t);
+struct termio t;
-if (strlen ((CONST char *) t.c_cc) < (unsigned int) (VINTR + 1))
+ioctl (p->outfd, TCGETA, &t);
-return (Bufbyte) '\004';
+if (strlen ((CONST char *) t.c_cc) < (unsigned int) (VINTR + 1))
-else
+return ctrl_d;
-return (Bufbyte) t.c_cc[VINTR];
+else
+return (Bufbyte) t.c_cc[VINTR];
+}
 #else /* ! defined (TCGETA) */
 /* Rather than complain, we'll just guess ^D, which is what
 * earlier emacsen always used. */
-return (Bufbyte) '\004';
+return ctrl_d;
 #endif /* ! defined (TCGETA) */
 #endif /* ! defined (TIOCGETC) */
 #endif /* ! defined (HAVE_TERMIOS) */
 }
 program = args[2];
 #ifdef VMS
 /* Make a one member argv with all args concatenated
 together separated by a blank.  */
-len = string_length (XSTRING (program)) + 2;
+len = XSTRING_LENGTH (program) + 2;
 for (i = 3; i < nargs; i++)
 {
 tem = args[i];
 CHECK_STRING (tem);
-len += string_length (XSTRING (tem)) + 1;	/* count the blank */
+len += XSTRING_LENGTH (tem) + 1;	/* count the blank */
 }
 new_argv = (char *) alloca (len);
-strcpy (new_argv, string_data (XSTRING (program)));
+strcpy (new_argv, XSTRING_DATA (program));
 for (i = 3; i < nargs; i++)
 {
 tem = args[i];
 CHECK_STRING (tem);
 strcat (new_argv, " ");
-strcat (new_argv, string_data (XSTRING (tem)));
+strcat (new_argv, XSTRING_DATA (tem));
 }
 /* Need to add code here to check for program existence on VMS */
 #else /* not VMS */
 new_argv = (char **)
 alloca ((nargs - 1) * sizeof (char *));
-new_argv[0] = (char *) string_data (XSTRING (program));
+new_argv[0] = (char *) XSTRING_DATA (program);
 /* If program file name is not absolute, search our path for it */
-if (!IS_DIRECTORY_SEP (string_byte (XSTRING (program), 0))
+if (!IS_DIRECTORY_SEP (XSTRING_BYTE (program, 0))
-&& !(string_length (XSTRING (program)) > 1
+&& !(XSTRING_LENGTH (program) > 1
-	   && IS_DEVICE_SEP (string_byte (XSTRING (program), 1))))
+	  && IS_DEVICE_SEP (XSTRING_BYTE (program, 1))))
 {
 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; /* Caller protects args[] */
 GCPRO4 (buffer, current_dir, name, program);
 tem = Qnil;
 		   X_OK);
 UNGCPRO;
 if (NILP (tem))
 	report_file_error ("Searching for program", list1 (program));
 tem = Fexpand_file_name (tem, Qnil);
-new_argv[0] = (char *) string_data (XSTRING (tem));
+new_argv[0] = (char *) XSTRING_DATA (tem);
 }
 else
 {
 if (!NILP (Ffile_directory_p (program)))
 	error ("Specified program for new process is a directory");
 for (i = 3; i < nargs; i++)
 {
 tem = args[i];
 CHECK_STRING (tem);
-new_argv[i - 2] =
+new_argv[i - 2] = (char *) XSTRING_DATA (tem);
-	(char *) string_data (XSTRING (tem));
 }
 new_argv[i - 2] = 0;
 #endif /* not VMS */
 remove it from the process list.  This means that each error
 check in create_process doesn't need to call remove_process
 itself; it's all taken care of here.  */
 record_unwind_protect (start_process_unwind, proc);
-create_process (proc, new_argv,
+create_process (proc, new_argv, (char *) XSTRING_DATA (current_dir));
-		  (char *) string_data (XSTRING (current_dir)));
 return unbind_to (speccount, proc);
 }
 #ifdef TRY_AGAIN
 h_errno = 0;
 #endif
 /* Some systems can't handle SIGIO/SIGALARM in gethostbyname. */
 slow_down_interrupts ();
-host_info_ptr = gethostbyname ((char *) string_data (XSTRING (host)));
+host_info_ptr = gethostbyname ((char *) XSTRING_DATA (host));
 speed_up_interrupts ();
 #ifdef TRY_AGAIN
 if (! (host_info_ptr == 0 && h_errno == TRY_AGAIN))
 #endif
 	break;
 }
 else
 {
 IN_ADDR numeric_addr;
 /* Attempt to interpret host as numeric inet address */
-numeric_addr = inet_addr ((char *) string_data (XSTRING (host)));
+numeric_addr = inet_addr ((char *) XSTRING_DATA (host));
 if (NUMERIC_ADDR_ERROR)
 	{
 	  maybe_error (Qprocess, errb,
-		       "Unknown host \"%s\"", string_data (XSTRING (host)));
+		       "Unknown host \"%s\"", XSTRING_DATA (host));
 	  return 0;
 	}
 /* There was some broken code here that called strlen() here
 	 on (char *) &numeric_addr and even sometimes accessed
 Lisp_Object proc;
 struct sockaddr_in address;
 int s, outch, inch;
 int port;
 struct gcpro gcpro1, gcpro2, gcpro3, gcpro4;
-int retry = 0;
+volatile int retry = 0;
 int retval;
 GCPRO4 (name, buffer, host, service);
 CHECK_STRING (name);
 CHECK_STRING (host);
 port = htons ((unsigned short) XINT (service));
 else
 {
 struct servent *svc_info;
 CHECK_STRING (service);
-svc_info = getservbyname ((char *) string_data (XSTRING (service)),
+svc_info = getservbyname ((char *) XSTRING_DATA (service), "tcp");
-				"tcp");
 if (svc_info == 0)
 #ifdef WIN32
 	error ("Unknown service \"%s\" (%d)",
-	       string_data (XSTRING (service)), WSAGetLastError ());
+	       XSTRING_DATA (service), WSAGetLastError ());
 #else
-	error ("Unknown service \"%s\"", string_data (XSTRING (service)));
+	error ("Unknown service \"%s\"", XSTRING_DATA (service));
 #endif
 port = svc_info->s_port;
 }
 get_internet_address (host, &address, ERROR_ME);
 #else /* HAVE_TERM */
 s = connect_server (0);
 if (s < 0)
 report_file_error ("error creating socket", Fcons (name, Qnil));
-send_command (s, C_PORT, 0, "%s:%d", string_data (XSTRING (host)), ntohs (port));
+send_command (s, C_PORT, 0, "%s:%d", XSTRING_DATA (host), ntohs (port));
 send_command (s, C_DUMB, 1, 0);
 #endif /* HAVE_TERM */
 inch = s;
 outch = dup (s);
 int start, int len)
 {
 /* This function can GC */
 /* Use volatile to protect variables from being clobbered by longjmp.  */
 struct gcpro gcpro1, gcpro2;
-SIGTYPE (*old_sigpipe) (int) = 0;
+SIGTYPE (*volatile old_sigpipe) (int) = 0;
 Lisp_Object lstream = Qnil;
 volatile struct Lisp_Process *p = XPROCESS (proc);
 #if defined (NO_UNION_TYPE) /* || !defined (__GNUC__) GCC bug only??? */
 /* #### ugh! There must be a better solution. */
 Lisp_Object defeat_volatile_kludge = (Lisp_Object) proc;
 p->tick++;
 process_tick++;
 deactivate_process (proc);
 #ifdef VMS
 error ("Error writing to process %s; closed it",
-	     string_data (XSTRING (p->name)));
+	    XSTRING_DATA (p->name));
 #else
 error ("SIGPIPE raised on process %s; closed it",
-	     string_data (XSTRING (p->name)));
+	    XSTRING_DATA (p->name));
 #endif
 }
 Lstream_flush (XLSTREAM (p->outstream));
 UNGCPRO;
 }
 int gid;
 int no_pgrp = 0;
 if (network_connection_p (proc))
 error ("Network connection %s is not a subprocess",
-	   string_data (XSTRING (p->name)));
+	  XSTRING_DATA (p->name));
 if (p->infd < 0)
 error ("Process %s is not active",
-	   string_data (XSTRING (p->name)));
+	  XSTRING_DATA (p->name));
 if (!p->pty_flag)
 current_group = 0;
 /* If we are using pgrps, get a pgrp number and make it negative.  */
 proc = get_process (process);
 /* Make sure the process is really alive.  */
 if (! EQ (XPROCESS (proc)->status_symbol, Qrun))
-error ("Process %s not running",
+error ("Process %s not running", XSTRING_DATA (XPROCESS (proc)->name));
-	   string_data (XSTRING (XPROCESS (proc)->name)));
 #ifdef VMS
 send_process (proc, Qnil, (Bufbyte *) "\032", 0, 1);   /* ^Z */
 #else
 if (XPROCESS (proc)->pty_flag)

Mercurial > hg > xemacs-beta

comparison src/process.c @ 16:0293115a14e9 r19-15b91