xemacs-beta: src/process-unix.c comparison

comparison src/process-unix.c @ 380:8626e4521993 r21-2-5

Import from CVS: tag r21-2-5

author	cvs
date	Mon, 13 Aug 2007 11:07:10 +0200
parents	d883f39b8495
children	4af0ddfb7c5b

comparison

equal deleted inserted replaced

-:76b7d63099ad
+:8626e4521993
-/* Asynchronous subprocess implemenation for UNIX
+/* Asynchronous subprocess implementation for UNIX
 Copyright (C) 1985, 1986, 1987, 1988, 1992, 1993, 1994, 1995
 Free Software Foundation, Inc.
 Copyright (C) 1995 Sun Microsystems, Inc.
 Copyright (C) 1995, 1996 Ben Wing.
 /* The entire file is within this conditional */
 #include "lisp.h"
 #include "buffer.h"
-#include "commands.h"
 #include "events.h"
 #include "frame.h"
 #include "hash.h"
-#include "insdel.h"
 #include "lstream.h"
 #include "opaque.h"
 #include "process.h"
 #include "procimpl.h"
 #include "sysdep.h"
 #include "systty.h"
 #include "syswait.h"
 /*
-* Implemenation-specific data. Pointed to by Lisp_Process->process_data
+* Implementation-specific data. Pointed to by Lisp_Process->process_data
 */
 struct unix_process_data
 {
 /* Non-0 if this is really a ToolTalk channel. */
 #ifdef PTY_OPEN
 	PTY_OPEN;
 #else /* no PTY_OPEN */
 #ifdef IRIS
 	/* Unusual IRIS code */
-	*ptyv = open ("/dev/ptc", O_RDWR | O_NDELAY | OPEN_BINARY, 0);
+	*ptyv = open ("/dev/ptc", O_RDWR | O_NONBLOCK | OPEN_BINARY, 0);
 	if (fd < 0)
 	  return -1;
 	if (fstat (fd, &stb) < 0)
 	  return -1;
 #else /* not IRIS */
 	    if (failed_count >= 3)
 	      return -1;
 	  }
 	else
 	  failed_count = 0;
-#ifdef O_NONBLOCK
 	fd = open (pty_name, O_RDWR | O_NONBLOCK | OPEN_BINARY, 0);
-#else
-	fd = open (pty_name, O_RDWR | O_NDELAY | OPEN_BINARY, 0);
-#endif
 #endif /* not IRIS */
 #endif /* no PTY_OPEN */
 	if (fd >= 0)
 	  {
 static void
 unix_mark_process_data (struct Lisp_Process *proc,
 			void (*markobj) (Lisp_Object))
 {
-((markobj) (UNIX_DATA(proc)->tty_name));
+markobj (UNIX_DATA(proc)->tty_name);
 }
 /*
-* Initialize XEmacs process implemenation once
+* Initialize XEmacs process implementation once
 */
 #ifdef SIGCHLD
 static void
 unix_init_process (void)
 /*
 * Fork off a subprocess. P is a pointer to newly created subprocess
 * object. If this function signals, the caller is responsible for
 * deleting (and finalizing) the process object.
 *
-* The method must return PID of the new proces, a (positive??? ####) number
+* The method must return PID of the new process, a (positive??? ####) number
 * which fits into Lisp_Int. No return value indicates an error, the method
 * must signal an error instead.
 */
 static int
 {
 #if !defined(__CYGWIN32__)
 /* child_setup must clobber environ on systems with true vfork.
 Protect it from permanent change.  */
 char **save_environ = environ;
-#endif
-#ifdef EMACS_BTL
-/* when performance monitoring is on, turn it off before the vfork(),
-as the child has no handler for the signal -- when back in the
-parent process, turn it back on if it was really on when you "turned
-it off" */
-int logging_on = cadillac_stop_logging ();	/* #### rename me */
 #endif
 pid = fork ();
 if (pid == 0)
 {
 	    /* On AIX, we've disabled SIGHUP above once we start a
 	       child on a pty.  Now reenable it in the child, so it
 	       will die when we want it to.
 	       JV: This needs to be done ALWAYS as we might have inherited
 	       a SIG_IGN handling from our parent (nohup) and we are in new
 	       process group.
 	    */
 	    signal (SIGHUP, SIG_DFL);
 	  }
 #endif /* HAVE_PTYS */
 	    child_setup_tty (xforkout);
 	  }
 	child_setup (xforkin, xforkout, xforkout, new_argv, current_dir);
 }
-#ifdef EMACS_BTL
-else if (logging_on)
-cadillac_start_logging ();	/* #### rename me */
-#endif
 #if !defined(__CYGWIN32__)
 environ = save_environ;
 #endif
 }
 }
 RETURN_NOT_REACHED (0);
 }
-/*
+/* Return nonzero if this process is a ToolTalk connection. */
-* Return nonzero if this process is a ToolTalk connection.
-*/
 static int
 unix_tooltalk_connection_p (struct Lisp_Process *p)
 {
 return UNIX_DATA(p)->connected_via_filedesc_p;
 }
-/*
+/* This is called to set process' virtual terminal size */
-* This is called to set process' virtual terminal size
-*/
 static int
 unix_set_window_size (struct Lisp_Process* p, int cols, int rows)
 {
 return set_window_size (UNIX_DATA(p)->infd, cols, rows);
 EMACS_UNBLOCK_SIGNAL (SIGCHLD);
 }
 #endif /* SIGCHLD */
 /*
-* Stuff the entire contents of LSTREAM to the process ouptut pipe
+* Stuff the entire contents of LSTREAM to the process output pipe
 */
 static JMP_BUF send_process_frame;
 static SIGTYPE
 				    chunklen);
 	  signal (SIGPIPE, old_sigpipe);
 	  if (writeret < 0)
 	    /* This is a real error.  Blocking errors are handled
 	       specially inside of the filedesc stream. */
-	    report_file_error ("writing to process",
+	    report_file_error ("writing to process", list1 (proc));
-			       list1 (vol_proc));
 	  while (Lstream_was_blocked_p (XLSTREAM (p->pipe_outstream)))
 	    {
 	      /* Buffer is full.  Wait, accepting input;
 		 that may allow the program
 		 to finish doing output and read more.  */
 p->status_symbol = Qexit;
 p->exit_code = 256; /* #### SIGPIPE ??? */
 p->core_dumped = 0;
 p->tick++;
 process_tick++;
-deactivate_process (vol_proc);
+deactivate_process (*((Lisp_Object *) (&vol_proc)));
 error ("SIGPIPE raised on process %s; closed it",
 	     XSTRING_DATA (p->name));
 }
 old_sigpipe = (SIGTYPE (*) (int)) signal (SIGPIPE, send_process_trap);
 * event_stream_delete_stream_pair
 *
 * In the lack of this method, only event_stream_delete_stream_pair
 * is called on both I/O streams of the process.
 *
-* The UNIX version quards this by ignoring possible SIGPIPE.
+* The UNIX version guards this by ignoring possible SIGPIPE.
 */
 static USID
 unix_deactivate_process (struct Lisp_Process *p)
 {
 }
 /*
 * Canonicalize host name HOST, and return its canonical form
 *
-* The default implemenation just takes HOST for a canonical name.
+* The default implementation just takes HOST for a canonical name.
 */
 #ifdef HAVE_SOCKETS
 static Lisp_Object
 unix_canonicalize_host_name (Lisp_Object host)
 This function is similar to open-network-stream-internal, but provides a
 mean to open an UDP multicast connection instead of a TCP one. Like in the
 TCP case, the multicast connection will be seen as a sub-process,
 Some notes:
-- Normaly, we should use sendto and recvfrom with non connected
+- Normally, we should use sendto and recvfrom with non connected
 sockets. The current code doesn't allow us to do this. In the future, it
 would be a good idea to extend the process data structure in order to deal
 properly with the different types network connections.
 - For the same reason, when leaving a multicast group, it is better to make
 a setsockopt - IP_DROP_MEMBERSHIP before closing the descriptors.
 report_file_error ("error adding membership", list2(name, dest));
 }
 /* Socket configuration for writing ----------------------- */
-/* Normaly, there's no 'connect' in multicast, since we use preferentialy
+/* Normally, there's no 'connect' in multicast, since we prefer to use
 'sendto' and 'recvfrom'. However, in order to handle this connection in
 the process-like way it is done for TCP, we must be able to use 'write'
 instead of 'sendto'. Consequently, we 'connect' this socket. */
 /* See open-network-stream-internal for comments on this part of the code */

Mercurial > hg > xemacs-beta

comparison src/process-unix.c @ 380:8626e4521993 r21-2-5