aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2016-06-09 23:11:40 -0700
committerPaul Eggert2016-06-09 23:12:07 -0700
commit07b77b8ee02192a6d60c87002bb89a1eaee1aecc (patch)
treef7a981aa0e8bbe825d7c748bc08880db9d7817ee /src
parent560202f67513327f5b262e01ebc709ab6855d6f6 (diff)
downloademacs-07b77b8ee02192a6d60c87002bb89a1eaee1aecc.tar.gz
emacs-07b77b8ee02192a6d60c87002bb89a1eaee1aecc.zip
Prefer getsockopt to getpeername on non-MS-Windows
* admin/CPP-DEFINES: Remove HAVE_GETPEERNAME. * configure.ac: Don’t check for getpeername. * src/process.c (wait_reading_process_output) [!WINDOWSNT]: Use getsockopt even if not GNU/Linux, as the platforms where getsockopt used to hang are no doubt long dead.
Diffstat (limited to 'src')
-rw-r--r--src/process.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/process.c b/src/process.c
index 5e06ccccac8..4d287d8cc51 100644
--- a/src/process.c
+++ b/src/process.c
@@ -5492,15 +5492,16 @@ wait_reading_process_output (intmax_t time_limit, int nsecs, int read_kbd,
5492 5492
5493 p = XPROCESS (proc); 5493 p = XPROCESS (proc);
5494 5494
5495#ifdef GNU_LINUX 5495#ifndef WINDOWSNT
5496 /* getsockopt(,,SO_ERROR,,) is said to hang on some systems.
5497 So only use it on systems where it is known to work. */
5498 { 5496 {
5499 socklen_t xlen = sizeof (xerrno); 5497 socklen_t xlen = sizeof (xerrno);
5500 if (getsockopt (channel, SOL_SOCKET, SO_ERROR, &xerrno, &xlen)) 5498 if (getsockopt (channel, SOL_SOCKET, SO_ERROR, &xerrno, &xlen))
5501 xerrno = errno; 5499 xerrno = errno;
5502 } 5500 }
5503#else 5501#else
5502 /* On MS-Windows, getsockopt clears the error for the
5503 entire process, which may not be the right thing; see
5504 w32.c. Use getpeername instead. */
5504 { 5505 {
5505 struct sockaddr pname; 5506 struct sockaddr pname;
5506 socklen_t pnamelen = sizeof (pname); 5507 socklen_t pnamelen = sizeof (pname);