diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | lib/getdtablesize.c | 7 | ||||
| -rw-r--r-- | m4/dup2.m4 | 12 | ||||
| -rw-r--r-- | m4/fcntl.m4 | 8 |
4 files changed, 33 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 41bff0ef30a..47ef578fb7c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2015-02-25 Paul Eggert <eggert@cs.ucla.edu> + + Merge from gnulib + * lib/getdtablesize.c, m4/dup2.m4, m4/fcntl.m4: + Update from gnulib, incorporating: + 2015-02-23 dup2: doc and test for Android bug + 2015-02-23 Replace dup2() on Android + 2015-02-22 Android doesn't define RLIM_SAVED_* + 2015-02-21 Paul Eggert <eggert@cs.ucla.edu> Merge from gnulib diff --git a/lib/getdtablesize.c b/lib/getdtablesize.c index bad45f7e32f..03eb7ef1bff 100644 --- a/lib/getdtablesize.c +++ b/lib/getdtablesize.c @@ -89,6 +89,13 @@ getdtablesize (void) # include <limits.h> # include <sys/resource.h> +# ifndef RLIM_SAVED_CUR +# define RLIM_SAVED_CUR RLIM_INFINITY +# endif +# ifndef RLIM_SAVED_MAX +# define RLIM_SAVED_MAX RLIM_INFINITY +# endif + # ifdef __CYGWIN__ /* Cygwin 1.7.25 auto-increases the RLIMIT_NOFILE soft limit until it hits the compile-time constant hard limit of 3200. We might as diff --git a/m4/dup2.m4 b/m4/dup2.m4 index 9aa2ea85ebd..59028e0982c 100644 --- a/m4/dup2.m4 +++ b/m4/dup2.m4 @@ -1,4 +1,4 @@ -#serial 22 +#serial 24 dnl Copyright (C) 2002, 2005, 2007, 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -25,6 +25,12 @@ AC_DEFUN([gl_FUNC_DUP2], #include <limits.h> #include <sys/resource.h> #include <unistd.h> + #ifndef RLIM_SAVED_CUR + # define RLIM_SAVED_CUR RLIM_INFINITY + #endif + #ifndef RLIM_SAVED_MAX + # define RLIM_SAVED_MAX RLIM_INFINITY + #endif ]], [[int result = 0; int bad_fd = INT_MAX; @@ -39,7 +45,7 @@ AC_DEFUN([gl_FUNC_DUP2], if (fcntl (1, F_SETFD, FD_CLOEXEC) == -1) result |= 1; #endif - if (dup2 (1, 1) == 0) + if (dup2 (1, 1) != 1) result |= 2; #ifdef FD_CLOEXEC if (fcntl (1, F_GETFD) != FD_CLOEXEC) @@ -70,6 +76,8 @@ AC_DEFUN([gl_FUNC_DUP2], gl_cv_func_dup2_works="guessing no" ;; haiku*) # on Haiku alpha 2, dup2(1, 1) resets FD_CLOEXEC. gl_cv_func_dup2_works="guessing no" ;; + *-android*) # implemented using dup3(), which fails if oldfd == newfd + gl_cv_func_dup2_works="guessing no" ;; *) gl_cv_func_dup2_works="guessing yes" ;; esac]) ]) diff --git a/m4/fcntl.m4 b/m4/fcntl.m4 index 218e78628ba..76dd86711b2 100644 --- a/m4/fcntl.m4 +++ b/m4/fcntl.m4 @@ -1,4 +1,4 @@ -# fcntl.m4 serial 7 +# fcntl.m4 serial 8 dnl Copyright (C) 2009-2015 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -34,6 +34,12 @@ AC_DEFUN([gl_FUNC_FCNTL], #include <limits.h> #include <sys/resource.h> #include <unistd.h> + #ifndef RLIM_SAVED_CUR + # define RLIM_SAVED_CUR RLIM_INFINITY + #endif + #ifndef RLIM_SAVED_MAX + # define RLIM_SAVED_MAX RLIM_INFINITY + #endif ]], [[int result = 0; int bad_fd = INT_MAX; |