emacs: src/process.c comparison

comparison src/process.c @ 96732:1e0b67e40d48

* systty.h: Remove code for Aix on 386, unsupported platform. * s/ms-w32.h: Remove boilerplate comments. (fcloseall, fgetchar, flushall, fputchar, getw, putw): Remove, unused. * s/gnu-linux.h (TERM): Remove support. (HAVE_SYSVIPC): Remove, unused. (A_TEXT_OFFSET, A_TEXT_SEEK, ADJUST_EXEC_HEADER): Remove, not used for this system. * process.c: Remove support for IRIS, unused. Remove support for TERM, not relevant anymore. * unexalpha.c (DEFAULT_ENTRY_ADDRESS): Remove, replace the only used with the definition. * s/aix4-2.h (static): Do not undef. * m/ibmrs6000.h: Remove code depending on USG5_4, this file is only used on Aix. (HAVE_SYSVIPC): Remove, unused. * m/hp800.h (CANNOT_DUMP): Do not undef. * m/alpha.h: Fix comment. * s/usg5-4.h (HAVE_SYSVIPC): Remove, unused. (USG_SHARED_LIBRARIES): Remove, only used in unexec.c which is not used by this configuration. * emacs.c: Remove code depending on USG_SHARED_LIBRARIES. * unexec.c: Remove code depending on HPUX and USG_SHARED_LIBRARIES, not used with this file. Remove code depending on IRIS, unused. Remove if 0-ed code.

author	Dan Nicolaescu <dann@ics.uci.edu>
date	Wed, 16 Jul 2008 08:06:18 +0000
parents	d45acf0c8d23
children	3760da9fe15e

comparison

equal deleted inserted replaced

-:79339db0a32f
+:1e0b67e40d48
 #include <sys/un.h>
 #endif
 #endif
 #endif /* HAVE_SOCKETS */
-/* TERM is a poor-man's SLIP, used on GNU/Linux.  */
-#ifdef TERM
-#include <client.h>
-#endif
 #if defined(BSD_SYSTEM)
 #include <sys/ioctl.h>
 #if !defined (O_NDELAY) && defined (HAVE_PTYS) && !defined(USG5)
 #include <fcntl.h>
 #endif /* HAVE_PTYS and no O_NDELAY */
 #include <sys/ioctl.h>
 #endif
 #include <net/if.h>
 #endif
 #endif
-#ifdef IRIS
-#include <sys/sysmacros.h>	/* for "minor" */
-#endif /* not IRIS */
 #ifdef HAVE_SYS_WAIT
 #include <sys/wait.h>
 #endif
 #endif /* HAVE_SELECT || FIONREAD */
 #endif /* HAVE_SOCKETS */
 #endif /* DATAGRAM_SOCKETS */
 #endif /* BROKEN_DATAGRAM_SOCKETS */
-#ifdef TERM
-#undef NON_BLOCKING_CONNECT
-#undef DATAGRAM_SOCKETS
-#endif
 #if !defined (ADAPTIVE_READ_BUFFERING) && !defined (NO_ADAPTIVE_READ_BUFFERING)
 #ifdef EMACS_HAS_USECS
 #define ADAPTIVE_READ_BUFFERING
 #endif
 #endif
 #ifdef PTY_OPEN
 	PTY_OPEN;
 #else /* no PTY_OPEN */
 	{
-# ifdef IRIS
-	  /* Unusual IRIS code */
-	  *ptyv = emacs_open ("/dev/ptc", O_RDWR | O_NDELAY, 0);
-	  if (fd < 0)
-	    return -1;
-	  if (fstat (fd, &stb) < 0)
-	    return -1;
-# else /* not IRIS */
 	  { /* Some systems name their pseudoterminals so that there are gaps in
 	       the usual sequence - for example, on HP9000/S700 systems, there
 	       are no pseudoterminals with names ending in 'f'.  So we wait for
 	       three failures in a row before deciding that we've reached the
 	       end of the ptys.  */
 #  ifdef O_NONBLOCK
 	  fd = emacs_open (pty_name, O_RDWR | O_NONBLOCK, 0);
 #  else
 	  fd = emacs_open (pty_name, O_RDWR | O_NDELAY, 0);
 #  endif
-# endif /* not IRIS */
 	}
 #endif /* no PTY_OPEN */
 	if (fd >= 0)
 	  {
 sprintf (pty_name, "/dev/tty%c%x", c, i);
 #endif /* no PTY_TTY_NAME_SPRINTF */
 	    if (access (pty_name, 6) != 0)
 	      {
 		emacs_close (fd);
-# if !defined(IRIS) && !defined(__sgi)
+# ifndef __sgi
 		continue;
 # else
 		return -1;
-# endif /* IRIS */
+# endif /* __sgi */
 	      }
 	    setup_pty (fd);
 	    return fd;
 	  }
 }
 tem = Fplist_get (contact, QCserver);
 if (!NILP (tem))
 {
 /* Don't support network sockets when non-blocking mode is
 	 not available, since a blocked Emacs is not useful.  */
-#if defined(TERM) || (!defined(O_NONBLOCK) && !defined(O_NDELAY))
+#if !defined(O_NONBLOCK) && !defined(O_NDELAY)
 error ("Network servers not supported");
 #else
 is_server = 1;
 if (INTEGERP (tem))
 	backlog = XINT (tem);
 buffer = Fplist_get (contact, QCbuffer);
 filter = Fplist_get (contact, QCfilter);
 sentinel = Fplist_get (contact, QCsentinel);
 CHECK_STRING (name);
-#ifdef TERM
-/* Let's handle TERM before things get complicated ...   */
-host = Fplist_get (contact, QChost);
-CHECK_STRING (host);
-service = Fplist_get (contact, QCservice);
-if (INTEGERP (service))
-port = htons ((unsigned short) XINT (service));
-else
-{
-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 */
 /* Initialize addrinfo structure in case we don't use getaddrinfo.  */
 ai.ai_socktype = socktype;
 ai.ai_protocol = 0;
 ai.ai_next = NULL;
 if (is_server)
 	report_file_error ("make server process failed", contact);
 else
 	report_file_error ("make client process failed", contact);
 }
-#endif /* not TERM */
 inch = s;
 outch = s;
 if (!NILP (buffer))
 ADD_SUBFEATURE (QCfamily, Qipv6);
 #endif
 #ifdef HAVE_GETSOCKNAME
 ADD_SUBFEATURE (QCservice, Qt);
 #endif
-#if !defined(TERM) && (defined(O_NONBLOCK) || defined(O_NDELAY))
+#if defined(O_NONBLOCK) || defined(O_NDELAY)
 ADD_SUBFEATURE (QCserver, Qt);
 #endif
 for (sopt = socket_options; sopt->name; sopt++)
 subfeatures = Fcons (intern (sopt->name), subfeatures);

Mercurial > emacs

comparison src/process.c @ 96732:1e0b67e40d48