| Andrew Geissler | 5f35090 | 2021-07-23 13:09:54 -0400 | [diff] [blame] | 1 | From adb1d4e5498a19e9d591ac8f42f9ddfdb23a1354 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Thu, 15 Jul 2021 12:33:13 -0700 |
| 4 | Subject: [PATCH] use closefrom() on linux and glibc 2.34+ |
| 5 | |
| 6 | Upstream-Status: Pending |
| 7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame^] | 8 | |
| 9 | Rebase to 1.17.0 |
| 10 | Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> |
| Andrew Geissler | 5f35090 | 2021-07-23 13:09:54 -0400 | [diff] [blame] | 11 | --- |
| 12 | src/posix-io.c | 2 +- |
| 13 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 14 | |
| 15 | diff --git a/src/posix-io.c b/src/posix-io.c |
| Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame^] | 16 | index 5c6cf1d..52e513a 100644 |
| Andrew Geissler | 5f35090 | 2021-07-23 13:09:54 -0400 | [diff] [blame] | 17 | --- a/src/posix-io.c |
| 18 | +++ b/src/posix-io.c |
| 19 | @@ -570,7 +570,7 @@ _gpgme_io_spawn (const char *path, char *const argv[], unsigned int flags, |
| 20 | if (fd_list[i].fd > fd) |
| 21 | fd = fd_list[i].fd; |
| 22 | fd++; |
| Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame^] | 23 | -#if defined(__sun) || defined(__FreeBSD__) || defined(__GLIBC__) |
| Andrew Geissler | 5f35090 | 2021-07-23 13:09:54 -0400 | [diff] [blame] | 24 | +#if defined(__sun) || defined(__FreeBSD__) || (defined(__GLIBC__) && __GNUC_PREREQ(2, 34)) |
| 25 | closefrom (fd); |
| 26 | max_fds = fd; |
| 27 | #else /*!__sun */ |
| Andrew Geissler | 7e0e3c0 | 2022-02-25 20:34:39 +0000 | [diff] [blame^] | 28 | -- |
| 29 | 2.25.1 |
| 30 | |