Port to Ubuntu 10.

Problem reported by T.V. Raman.
* configure.ac (accept4): New function to check for.
* src/process.c (close_on_exec, accept4, process_socket):
Define these if !HAVE_ACCEPT4, not if !SOCK_CLOEXEC.

Fixes: debbugs:14803

diff --git a/ChangeLog b/ChangeLog
index 33e739c917337477f8d3829c7eb87a135573b8e4..b7b386405f212b516b014faa2b1fd5b18f7ce4d1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,12 @@
 2013-07-07  Paul Eggert  <eggert@cs.ucla.edu>
 
+       Port to Ubuntu 10 (Bug#14803).
+       * configure.ac (accept4): New function to check for.
+
        Make file descriptors close-on-exec when possible (Bug#14803).
        * configure.ac (mkostemp): New function to check for.
        (PTY_OPEN): Pass O_CLOEXEC to posix_openpt.
+
        * lib/fcntl.c, lib/getdtablesize.c, lib/pipe2.c, m4/fcntl.m4:
        * m4/getdtablesize.m4, m4/pipe2.m4: New files, taken from gnulib.
        * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.

diff --git a/configure.ac b/configure.ac
index bbaa02820ab1170c6ebc2e51d6ea101c9f204543..0a775efa5845dcdca64890dcc52e422210d2451e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3237,7 +3237,7 @@ esac
 AC_SUBST(BLESSMAIL_TARGET)
 
 
-AC_CHECK_FUNCS(gethostname \
+AC_CHECK_FUNCS(accept4 gethostname \
 getrusage get_current_dir_name \
 lrand48 \
 select getpagesize setlocale \

diff --git a/src/ChangeLog b/src/ChangeLog
index f73c94f0752b39bb87413362a8941cea210c0260..462a246f2201aeb41d232328dc0f54305d1abfe2 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2013-07-07  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Port to Ubuntu 10 (Bug#14803).
+       Problem reported by T.V. Raman.
+       * process.c (close_on_exec, accept4, process_socket):
+       Define these if !HAVE_ACCEPT4, not if !SOCK_CLOEXEC.
+
 2013-07-07  Eli Zaretskii  <eliz@gnu.org>
 
        * w32.c (sys_dup): Declare prototype.

diff --git a/src/process.c b/src/process.c
index cad42470bc1bc3fb8110948e40024350ae2c72d0..1c210649024cad861ccf0e1d059f7871e8f3cc9d 100644 (file)
--- a/src/process.c
+++ b/src/process.c
@@ -137,6 +137,9 @@ extern int sys_select (int, SELECT_TYPE *, SELECT_TYPE *, SELECT_TYPE *,
 
 #ifndef SOCK_CLOEXEC
 # define SOCK_CLOEXEC 0
+#endif
+
+#ifndef HAVE_ACCEPT4
 
 /* Emulate GNU/Linux accept4 and socket well enough for this module.  */