aboutsummaryrefslogtreecommitdiffstats
path: root/src/process.c
diff options
context:
space:
mode:
authorDan Nicolaescu2008-01-13 00:43:55 +0000
committerDan Nicolaescu2008-01-13 00:43:55 +0000
commite39a993cce3b5d82cb997e34200a5395c315e3a6 (patch)
treebef5f75e893c2c4e958764fb9f7b359c27aa3847 /src/process.c
parent8d8ccf3636b6ae7f296ac4613b2dc87c7b159599 (diff)
downloademacs-e39a993cce3b5d82cb997e34200a5395c315e3a6.tar.gz
emacs-e39a993cce3b5d82cb997e34200a5395c315e3a6.zip
* movemail.c:
* make-docfile.c: Remove reference to symbols defined by systems not supported anymore: MAC_OS8, XENIX and STRIDE. * (src/m/mips.h): * (src/m/intel386.h): * callproc.c: * config.in: * ecrt0.c: * emacs.c: * fileio.c: * frame.c: * getpagesize.h: * keyboard.c: * lread.c: * process.c: * puresize.h: * sysdep.c: * systty.h: * syswait.h: * unexec.c: * xdisp.c: * alloc.c: Remove code containing references to symbols defined by unsupported systems.
Diffstat (limited to 'src/process.c')
-rw-r--r--src/process.c41
1 files changed, 12 insertions, 29 deletions
diff --git a/src/process.c b/src/process.c
index a48e5435837..8e932be7b0c 100644
--- a/src/process.c
+++ b/src/process.c
@@ -78,7 +78,7 @@ Boston, MA 02110-1301, USA. */
78#include <client.h> 78#include <client.h>
79#endif 79#endif
80 80
81/* On some systems, e.g. DGUX, inet_addr returns a 'struct in_addr'. */ 81/* On some systems, inet_addr returns a 'struct in_addr'. */
82#ifdef HAVE_BROKEN_INET_ADDR 82#ifdef HAVE_BROKEN_INET_ADDR
83#define IN_ADDR struct in_addr 83#define IN_ADDR struct in_addr
84#define NUMERIC_ADDR_ERROR (numeric_addr.s_addr == -1) 84#define NUMERIC_ADDR_ERROR (numeric_addr.s_addr == -1)
@@ -87,12 +87,12 @@ Boston, MA 02110-1301, USA. */
87#define NUMERIC_ADDR_ERROR (numeric_addr == -1) 87#define NUMERIC_ADDR_ERROR (numeric_addr == -1)
88#endif 88#endif
89 89
90#if defined(BSD_SYSTEM) || defined(STRIDE) 90#if defined(BSD_SYSTEM)
91#include <sys/ioctl.h> 91#include <sys/ioctl.h>
92#if !defined (O_NDELAY) && defined (HAVE_PTYS) && !defined(USG5) 92#if !defined (O_NDELAY) && defined (HAVE_PTYS) && !defined(USG5)
93#include <fcntl.h> 93#include <fcntl.h>
94#endif /* HAVE_PTYS and no O_NDELAY */ 94#endif /* HAVE_PTYS and no O_NDELAY */
95#endif /* BSD_SYSTEM || STRIDE */ 95#endif /* BSD_SYSTEM */
96 96
97#ifdef BROKEN_O_NONBLOCK 97#ifdef BROKEN_O_NONBLOCK
98#undef O_NONBLOCK 98#undef O_NONBLOCK
@@ -596,7 +596,6 @@ allocate_pty ()
596#else 596#else
597 sprintf (pty_name, "/dev/tty%c%x", c, i); 597 sprintf (pty_name, "/dev/tty%c%x", c, i);
598#endif /* no PTY_TTY_NAME_SPRINTF */ 598#endif /* no PTY_TTY_NAME_SPRINTF */
599#ifndef UNIPLUS
600 if (access (pty_name, 6) != 0) 599 if (access (pty_name, 6) != 0)
601 { 600 {
602 emacs_close (fd); 601 emacs_close (fd);
@@ -606,7 +605,6 @@ allocate_pty ()
606 return -1; 605 return -1;
607# endif /* IRIS */ 606# endif /* IRIS */
608 } 607 }
609#endif /* not UNIPLUS */
610 setup_pty (fd); 608 setup_pty (fd);
611 return fd; 609 return fd;
612 } 610 }
@@ -1889,12 +1887,12 @@ create_process (process, new_argv, current_dir)
1889#endif 1887#endif
1890 if (forkin < 0) 1888 if (forkin < 0)
1891 report_file_error ("Opening pty", Qnil); 1889 report_file_error ("Opening pty", Qnil);
1892#if defined (RTU) || defined (UNIPLUS) || defined (DONT_REOPEN_PTY) 1890#if defined (DONT_REOPEN_PTY)
1893 /* In the case that vfork is defined as fork, the parent process 1891 /* In the case that vfork is defined as fork, the parent process
1894 (Emacs) may send some data before the child process completes 1892 (Emacs) may send some data before the child process completes
1895 tty options setup. So we setup tty before forking. */ 1893 tty options setup. So we setup tty before forking. */
1896 child_setup_tty (forkout); 1894 child_setup_tty (forkout);
1897#endif /* RTU or UNIPLUS or DONT_REOPEN_PTY */ 1895#endif /* DONT_REOPEN_PTY */
1898#else 1896#else
1899 forkin = forkout = -1; 1897 forkin = forkout = -1;
1900#endif /* not USG, or USG_SUBTTY_WORKS */ 1898#endif /* not USG, or USG_SUBTTY_WORKS */
@@ -1935,15 +1933,6 @@ create_process (process, new_argv, current_dir)
1935 set_exclusive_use (outchannel); 1933 set_exclusive_use (outchannel);
1936#endif 1934#endif
1937 1935
1938/* Stride people say it's a mystery why this is needed
1939 as well as the O_NDELAY, but that it fails without this. */
1940#if defined (STRIDE) || (defined (pfa) && defined (HAVE_PTYS))
1941 {
1942 int one = 1;
1943 ioctl (inchannel, FIONBIO, &one);
1944 }
1945#endif
1946
1947#ifdef O_NONBLOCK 1936#ifdef O_NONBLOCK
1948 fcntl (inchannel, F_SETFL, O_NONBLOCK); 1937 fcntl (inchannel, F_SETFL, O_NONBLOCK);
1949 fcntl (outchannel, F_SETFL, O_NONBLOCK); 1938 fcntl (outchannel, F_SETFL, O_NONBLOCK);
@@ -1993,7 +1982,7 @@ create_process (process, new_argv, current_dir)
1993#ifdef BSD4_1 1982#ifdef BSD4_1
1994 sighold (SIGCHLD); 1983 sighold (SIGCHLD);
1995#else /* not BSD4_1 */ 1984#else /* not BSD4_1 */
1996#if defined (BSD_SYSTEM) || defined (UNIPLUS) || defined (HPUX) 1985#if defined (BSD_SYSTEM) || defined (HPUX)
1997 sigsetmask (sigmask (SIGCHLD)); 1986 sigsetmask (sigmask (SIGCHLD));
1998#else /* ordinary USG */ 1987#else /* ordinary USG */
1999#if 0 1988#if 0
@@ -2107,7 +2096,7 @@ create_process (process, new_argv, current_dir)
2107 } 2096 }
2108#endif /* TIOCNOTTY */ 2097#endif /* TIOCNOTTY */
2109 2098
2110#if !defined (RTU) && !defined (UNIPLUS) && !defined (DONT_REOPEN_PTY) 2099#if !defined (DONT_REOPEN_PTY)
2111/*** There is a suggestion that this ought to be a 2100/*** There is a suggestion that this ought to be a
2112 conditional on TIOCSPGRP, 2101 conditional on TIOCSPGRP,
2113 or !(defined (HAVE_SETSID) && defined (TIOCSCTTY)). 2102 or !(defined (HAVE_SETSID) && defined (TIOCSCTTY)).
@@ -2141,7 +2130,7 @@ create_process (process, new_argv, current_dir)
2141 ioctl (xforkout, TIOCSPGRP, &pgrp); 2130 ioctl (xforkout, TIOCSPGRP, &pgrp);
2142#endif 2131#endif
2143 } 2132 }
2144#endif /* not UNIPLUS and not RTU and not DONT_REOPEN_PTY */ 2133#endif /* not DONT_REOPEN_PTY */
2145 2134
2146#ifdef SETUP_SLAVE_PTY 2135#ifdef SETUP_SLAVE_PTY
2147 if (pty_flag) 2136 if (pty_flag)
@@ -2168,7 +2157,7 @@ create_process (process, new_argv, current_dir)
2168#ifdef BSD4_1 2157#ifdef BSD4_1
2169 sigrelse (SIGCHLD); 2158 sigrelse (SIGCHLD);
2170#else /* not BSD4_1 */ 2159#else /* not BSD4_1 */
2171#if defined (BSD_SYSTEM) || defined (UNIPLUS) || defined (HPUX) 2160#if defined (BSD_SYSTEM) || defined (HPUX)
2172 sigsetmask (SIGEMPTYMASK); 2161 sigsetmask (SIGEMPTYMASK);
2173#else /* ordinary USG */ 2162#else /* ordinary USG */
2174#if 0 2163#if 0
@@ -2179,10 +2168,10 @@ create_process (process, new_argv, current_dir)
2179#endif /* SIGCHLD */ 2168#endif /* SIGCHLD */
2180#endif /* !POSIX_SIGNALS */ 2169#endif /* !POSIX_SIGNALS */
2181 2170
2182#if !defined (RTU) && !defined (UNIPLUS) && !defined (DONT_REOPEN_PTY) 2171#if !defined (DONT_REOPEN_PTY)
2183 if (pty_flag) 2172 if (pty_flag)
2184 child_setup_tty (xforkout); 2173 child_setup_tty (xforkout);
2185#endif /* not RTU and not UNIPLUS and not DONT_REOPEN_PTY */ 2174#endif /* not DONT_REOPEN_PTY */
2186#ifdef WINDOWSNT 2175#ifdef WINDOWSNT
2187 pid = child_setup (xforkin, xforkout, xforkout, 2176 pid = child_setup (xforkin, xforkout, xforkout,
2188 new_argv, 1, current_dir); 2177 new_argv, 1, current_dir);
@@ -2260,7 +2249,7 @@ create_process (process, new_argv, current_dir)
2260#ifdef BSD4_1 2249#ifdef BSD4_1
2261 sigrelse (SIGCHLD); 2250 sigrelse (SIGCHLD);
2262#else /* not BSD4_1 */ 2251#else /* not BSD4_1 */
2263#if defined (BSD_SYSTEM) || defined (UNIPLUS) || defined (HPUX) 2252#if defined (BSD_SYSTEM) || defined (HPUX)
2264 sigsetmask (SIGEMPTYMASK); 2253 sigsetmask (SIGEMPTYMASK);
2265#else /* ordinary USG */ 2254#else /* ordinary USG */
2266#if 0 2255#if 0
@@ -4651,12 +4640,6 @@ wait_reading_process_output (time_limit, microsecs, read_kbd, do_display,
4651 else if (xerrno == ENOMEM) 4640 else if (xerrno == ENOMEM)
4652 no_avail = 1; 4641 no_avail = 1;
4653#endif 4642#endif
4654#ifdef ALLIANT
4655 /* This happens for no known reason on ALLIANT.
4656 I am guessing that this is the right response. -- RMS. */
4657 else if (xerrno == EFAULT)
4658 no_avail = 1;
4659#endif
4660 else if (xerrno == EBADF) 4643 else if (xerrno == EBADF)
4661 { 4644 {
4662#ifdef AIX 4645#ifdef AIX